diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o index 4ff09fe1b..3ffc3dc6e 100644 Binary files a/ASM/build/bundle.o and b/ASM/build/bundle.o differ diff --git a/ASM/c/get_items.c b/ASM/c/get_items.c index c8d427fa3..297b7fd72 100644 --- a/ASM/c/get_items.c +++ b/ASM/c/get_items.c @@ -604,7 +604,7 @@ uint8_t item_give_collectible(uint8_t item, z64_link_t *link, z64_actor_t *from_ PLAYER_NAME_ID = player; // If it's a junk item (aka a regular collectible) don't do the fanfare music/message box. - if (item_row->collectible > 0) { // Item is one of our base collectibles + if (item_row->collectible >= 0) { // Item is one of our base collectibles collectible_mutex = NULL; pItem->actor.health = 1; z64_GiveItem(&z64_game, item_row->action_id); diff --git a/ASM/c/item_table.c b/ASM/c/item_table.c index 9afc6a504..40ee2e760 100644 --- a/ASM/c/item_table.c +++ b/ASM/c/item_table.c @@ -25,75 +25,75 @@ item_row_t item_table[] = { [0x01] = ITEM_ROW(0x4D, BROWN_CHEST, 0x8E, 11, 0x0032, 0x00CE, 0x20, bombs_to_rupee, no_effect, -1, -1), // Bombs (5) [0x02] = ITEM_ROW(0x4D, BROWN_CHEST, 0x8C, 12, 0x0034, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1), // Deku Nuts (5) - [0x03] = ITEM_ROW(0x4D, BROWN_CHEST, 0x09, 0, 0x0033, 0x00D9, 0x28, no_upgrade, no_effect, -1, -1), // Bombchu (10) - [0x04] = ITEM_ROW(0x53, GILDED_CHEST, 0x03, 0, 0x0031, 0x00E9, 0x35, no_upgrade, no_effect, -1, -1), // Fairy Bow - [0x05] = ITEM_ROW(0x53, GILDED_CHEST, 0x06, 0, 0x0030, 0x00E7, 0x33, no_upgrade, no_effect, -1, -1), // Fairy Slingshot - [0x06] = ITEM_ROW(0x53, GILDED_CHEST, 0x0E, 0, 0x0035, 0x00E8, 0x34, no_upgrade, no_effect, -1, -1), // Boomerang + [0x03] = ITEM_ROW(0x4D, BROWN_CHEST, 0x09, -1, 0x0033, 0x00D9, 0x28, no_upgrade, no_effect, -1, -1), // Bombchu (10) + [0x04] = ITEM_ROW(0x53, GILDED_CHEST, 0x03, -1, 0x0031, 0x00E9, 0x35, no_upgrade, no_effect, -1, -1), // Fairy Bow + [0x05] = ITEM_ROW(0x53, GILDED_CHEST, 0x06, -1, 0x0030, 0x00E7, 0x33, no_upgrade, no_effect, -1, -1), // Fairy Slingshot + [0x06] = ITEM_ROW(0x53, GILDED_CHEST, 0x0E, -1, 0x0035, 0x00E8, 0x34, no_upgrade, no_effect, -1, -1), // Boomerang [0x07] = ITEM_ROW(0x4D, BROWN_CHEST, 0x00, 13, 0x0037, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1), // Deku Stick - [0x08] = ITEM_ROW(0x53, GILDED_CHEST, 0x0A, 0, 0x0036, 0x00DD, 0x2D, no_upgrade, no_effect, -1, -1), // Hookshot - [0x09] = ITEM_ROW(0x53, GILDED_CHEST, 0x0B, 0, 0x004F, 0x00DD, 0x2E, no_upgrade, no_effect, -1, -1), // Longshot - [0x0A] = ITEM_ROW(0x53, GILDED_CHEST, 0x0F, 0, 0x0039, 0x00EA, 0x36, no_upgrade, no_effect, -1, -1), // Lens of Truth - [0x0B] = ITEM_ROW(0x53, GILDED_CHEST, 0x23, 0, 0x0069, 0x00EF, 0x3B, no_upgrade, open_mask_shop, -1, -1), // Zelda's Letter - [0x0C] = ITEM_ROW(0x53, GILDED_CHEST, 0x08, 0, 0x003A, 0x00DE, 0x2F, no_upgrade, no_effect, -1, -1), // Ocarina of Time - [0x0D] = ITEM_ROW(0x53, GILDED_CHEST, 0x11, 0, 0x0038, 0x00F6, 0x41, no_upgrade, no_effect, -1, -1), // Megaton Hammer - [0x0E] = ITEM_ROW(0x53, GILDED_CHEST, 0x2F, 0, 0x0002, 0x0109, 0x5E, no_upgrade, no_effect, -1, -1), // Cojiro - [0x0F] = ITEM_ROW(0x53, GILDED_CHEST, 0x14, 0, 0x0042, 0x00C6, 0x01, no_upgrade, no_effect, -1, -1), // Empty Bottle - [0x10] = ITEM_ROW(0x53, GILDED_CHEST, 0x15, 0, 0x0043, 0x00EB, 0x38, no_upgrade, no_effect, -1, -1), // Red Potion - [0x11] = ITEM_ROW(0x53, GILDED_CHEST, 0x16, 0, 0x0044, 0x00EB, 0x37, no_upgrade, no_effect, -1, -1), // Green Potion - [0x12] = ITEM_ROW(0x53, GILDED_CHEST, 0x17, 0, 0x0045, 0x00EB, 0x39, no_upgrade, no_effect, -1, -1), // Blue Potion - [0x13] = ITEM_ROW(0x53, GILDED_CHEST, 0x18, 0, 0x0046, 0x00C6, 0x01, no_upgrade, no_effect, -1, -1), // Bottled Fairy - [0x14] = ITEM_ROW(0x53, GILDED_CHEST, 0x1A, 0, 0x0098, 0x00DF, 0x30, no_upgrade, no_effect, -1, -1), // Bottled Lon Lon Milk - [0x15] = ITEM_ROW(0x53, GILDED_CHEST, 0x1B, 0, 0x0099, 0x010B, 0x45, letter_to_bottle, no_effect, -1, -1), // Bottled Ruto's Letter - [0x16] = ITEM_ROW(0x53, BROWN_CHEST, 0x10, 0, 0x0048, 0x00F3, 0x3E, no_upgrade, no_effect, -1, -1), // Magic Bean - [0x17] = ITEM_ROW(0x53, GILDED_CHEST, 0x25, 0, 0x0010, 0x0136, 0x4F, no_upgrade, no_effect, -1, -1), // Skull Mask - [0x18] = ITEM_ROW(0x53, GILDED_CHEST, 0x26, 0, 0x0011, 0x0135, 0x32, no_upgrade, no_effect, -1, -1), // Spooky Mask - [0x19] = ITEM_ROW(0x53, GILDED_CHEST, 0x22, 0, 0x000B, 0x0109, 0x44, no_upgrade, no_effect, -1, -1), // Chicken - [0x1A] = ITEM_ROW(0x53, GILDED_CHEST, 0x24, 0, 0x0012, 0x0134, 0x31, no_upgrade, no_effect, -1, -1), // Keaton Mask - [0x1B] = ITEM_ROW(0x53, GILDED_CHEST, 0x27, 0, 0x0013, 0x0137, 0x50, no_upgrade, no_effect, -1, -1), // Bunny Hood - [0x1C] = ITEM_ROW(0x53, GILDED_CHEST, 0x2B, 0, 0x0017, 0x0138, 0x51, no_upgrade, no_effect, -1, -1), // Mask of Truth - [0x1D] = ITEM_ROW(0x53, GILDED_CHEST, 0x2D, 0, 0x9001, 0x00DA, 0x29, no_upgrade, no_effect, -1, -1), // Pocket Egg - [0x1E] = ITEM_ROW(0x53, GILDED_CHEST, 0x2E, 0, 0x000B, 0x0109, 0x44, no_upgrade, no_effect, -1, -1), // Pocket Cucco - [0x1F] = ITEM_ROW(0x53, GILDED_CHEST, 0x30, 0, 0x0003, 0x0141, 0x54, no_upgrade, no_effect, -1, -1), // Odd Mushroom - [0x20] = ITEM_ROW(0x53, GILDED_CHEST, 0x31, 0, 0x0004, 0x0140, 0x53, no_upgrade, no_effect, -1, -1), // Odd Potion - [0x21] = ITEM_ROW(0x53, GILDED_CHEST, 0x32, 0, 0x0005, 0x00F5, 0x40, no_upgrade, no_effect, -1, -1), // Poacher's Saw - [0x22] = ITEM_ROW(0x53, GILDED_CHEST, 0x33, 0, 0x0008, 0x0143, 0x56, no_upgrade, no_effect, -1, -1), // Goron's Sword (Broken) - [0x23] = ITEM_ROW(0x53, GILDED_CHEST, 0x34, 0, 0x0009, 0x0146, 0x57, no_upgrade, no_effect, -1, -1), // Prescription - [0x24] = ITEM_ROW(0x53, GILDED_CHEST, 0x35, 0, 0x000D, 0x0149, 0x5A, no_upgrade, no_effect, -1, -1), // Eyeball Frog - [0x25] = ITEM_ROW(0x53, GILDED_CHEST, 0x36, 0, 0x000E, 0x013F, 0x52, no_upgrade, no_effect, -1, -1), // Eye Drops - [0x26] = ITEM_ROW(0x53, GILDED_CHEST, 0x37, 0, 0x000A, 0x0142, 0x55, no_upgrade, no_effect, -1, -1), // Claim Check - [0x27] = ITEM_ROW(0x53, GILDED_CHEST, 0x3B, 0, 0x00A4, 0x018D, 0x74, no_upgrade, no_effect, -1, -1), // Kokiri Sword - [0x28] = ITEM_ROW(0x53, GILDED_CHEST, 0x3D, 0, 0x004B, 0x00F8, 0x43, no_upgrade, no_effect, -1, -1), // Giant's Knife - [0x29] = ITEM_ROW(0x53, BROWN_CHEST, 0x3E, 0, 0x004C, 0x00CB, 0x1D, no_upgrade, no_effect, -1, -1), // Deku Shield - [0x2A] = ITEM_ROW(0x53, BROWN_CHEST, 0x3F, 0, 0x004D, 0x00DC, 0x2C, no_upgrade, no_effect, -1, -1), // Hylian Shield - [0x2B] = ITEM_ROW(0x53, GILDED_CHEST, 0x40, 0, 0x004E, 0x00EE, 0x3A, no_upgrade, no_effect, -1, -1), // Mirror Shield - [0x2C] = ITEM_ROW(0x53, GILDED_CHEST, 0x42, 0, 0x0050, 0x00F2, 0x3C, no_upgrade, no_effect, -1, -1), // Goron Tunic - [0x2D] = ITEM_ROW(0x53, GILDED_CHEST, 0x43, 0, 0x0051, 0x00F2, 0x3D, no_upgrade, no_effect, -1, -1), // Zora Tunic - [0x2E] = ITEM_ROW(0x53, GILDED_CHEST, 0x45, 0, 0x0053, 0x0118, 0x47, no_upgrade, no_effect, -1, -1), // Iron Boots - [0x2F] = ITEM_ROW(0x53, GILDED_CHEST, 0x46, 0, 0x0054, 0x0157, 0x5F, no_upgrade, no_effect, -1, -1), // Hover Boots - [0x30] = ITEM_ROW(0x53, GILDED_CHEST, 0x4B, 0, 0x0056, 0x00BE, 0x16, no_upgrade, no_effect, -1, -1), // Big Quiver - [0x31] = ITEM_ROW(0x53, GILDED_CHEST, 0x4C, 0, 0x0057, 0x00BE, 0x17, no_upgrade, no_effect, -1, -1), // Biggest Quiver - [0x32] = ITEM_ROW(0x53, GILDED_CHEST, 0x4D, 0, 0x0058, 0x00BF, 0x18, no_upgrade, no_effect, -1, -1), // Bomb Bag - [0x33] = ITEM_ROW(0x53, GILDED_CHEST, 0x4E, 0, 0x0059, 0x00BF, 0x19, no_upgrade, no_effect, -1, -1), // Big Bomb Bag - [0x34] = ITEM_ROW(0x53, GILDED_CHEST, 0x4F, 0, 0x005A, 0x00BF, 0x1A, no_upgrade, no_effect, -1, -1), // Biggest Bomb Bag - [0x35] = ITEM_ROW(0x53, GILDED_CHEST, 0x51, 0, 0x005B, 0x012D, 0x49, no_upgrade, no_effect, -1, -1), // Silver Gauntlets - [0x36] = ITEM_ROW(0x53, GILDED_CHEST, 0x52, 0, 0x005C, 0x012D, 0x4A, no_upgrade, no_effect, -1, -1), // Golden Gauntlets - [0x37] = ITEM_ROW(0x53, GILDED_CHEST, 0x53, 0, 0x00CD, 0x00DB, 0x2A, no_upgrade, no_effect, -1, -1), // Silver Scale - [0x38] = ITEM_ROW(0x53, GILDED_CHEST, 0x54, 0, 0x00CE, 0x00DB, 0x2B, no_upgrade, no_effect, -1, -1), // Golden Scale - [0x39] = ITEM_ROW(0x53, GILDED_CHEST, 0x6F, 0, 0x0068, 0x00C8, 0x21, no_upgrade, no_effect, -1, -1), // Stone of Agony - [0x3A] = ITEM_ROW(0x53, GILDED_CHEST, 0x70, 0, 0x007B, 0x00D7, 0x24, no_upgrade, no_effect, -1, -1), // Gerudo Membership Card - [0x3B] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x004A, 0x010E, 0x46, no_upgrade, give_fairy_ocarina, -1, -1), // Fairy Ocarina + [0x08] = ITEM_ROW(0x53, GILDED_CHEST, 0x0A, -1, 0x0036, 0x00DD, 0x2D, no_upgrade, no_effect, -1, -1), // Hookshot + [0x09] = ITEM_ROW(0x53, GILDED_CHEST, 0x0B, -1, 0x004F, 0x00DD, 0x2E, no_upgrade, no_effect, -1, -1), // Longshot + [0x0A] = ITEM_ROW(0x53, GILDED_CHEST, 0x0F, -1, 0x0039, 0x00EA, 0x36, no_upgrade, no_effect, -1, -1), // Lens of Truth + [0x0B] = ITEM_ROW(0x53, GILDED_CHEST, 0x23, -1, 0x0069, 0x00EF, 0x3B, no_upgrade, open_mask_shop, -1, -1), // Zelda's Letter + [0x0C] = ITEM_ROW(0x53, GILDED_CHEST, 0x08, -1, 0x003A, 0x00DE, 0x2F, no_upgrade, no_effect, -1, -1), // Ocarina of Time + [0x0D] = ITEM_ROW(0x53, GILDED_CHEST, 0x11, -1, 0x0038, 0x00F6, 0x41, no_upgrade, no_effect, -1, -1), // Megaton Hammer + [0x0E] = ITEM_ROW(0x53, GILDED_CHEST, 0x2F, -1, 0x0002, 0x0109, 0x5E, no_upgrade, no_effect, -1, -1), // Cojiro + [0x0F] = ITEM_ROW(0x53, GILDED_CHEST, 0x14, -1, 0x0042, 0x00C6, 0x01, no_upgrade, no_effect, -1, -1), // Empty Bottle + [0x10] = ITEM_ROW(0x53, GILDED_CHEST, 0x15, -1, 0x0043, 0x00EB, 0x38, no_upgrade, no_effect, -1, -1), // Red Potion + [0x11] = ITEM_ROW(0x53, GILDED_CHEST, 0x16, -1, 0x0044, 0x00EB, 0x37, no_upgrade, no_effect, -1, -1), // Green Potion + [0x12] = ITEM_ROW(0x53, GILDED_CHEST, 0x17, -1, 0x0045, 0x00EB, 0x39, no_upgrade, no_effect, -1, -1), // Blue Potion + [0x13] = ITEM_ROW(0x53, GILDED_CHEST, 0x18, -1, 0x0046, 0x00C6, 0x01, no_upgrade, no_effect, -1, -1), // Bottled Fairy + [0x14] = ITEM_ROW(0x53, GILDED_CHEST, 0x1A, -1, 0x0098, 0x00DF, 0x30, no_upgrade, no_effect, -1, -1), // Bottled Lon Lon Milk + [0x15] = ITEM_ROW(0x53, GILDED_CHEST, 0x1B, -1, 0x0099, 0x010B, 0x45, letter_to_bottle, no_effect, -1, -1), // Bottled Ruto's Letter + [0x16] = ITEM_ROW(0x53, BROWN_CHEST, 0x10, -1, 0x0048, 0x00F3, 0x3E, no_upgrade, no_effect, -1, -1), // Magic Bean + [0x17] = ITEM_ROW(0x53, GILDED_CHEST, 0x25, -1, 0x0010, 0x0136, 0x4F, no_upgrade, no_effect, -1, -1), // Skull Mask + [0x18] = ITEM_ROW(0x53, GILDED_CHEST, 0x26, -1, 0x0011, 0x0135, 0x32, no_upgrade, no_effect, -1, -1), // Spooky Mask + [0x19] = ITEM_ROW(0x53, GILDED_CHEST, 0x22, -1, 0x000B, 0x0109, 0x44, no_upgrade, no_effect, -1, -1), // Chicken + [0x1A] = ITEM_ROW(0x53, GILDED_CHEST, 0x24, -1, 0x0012, 0x0134, 0x31, no_upgrade, no_effect, -1, -1), // Keaton Mask + [0x1B] = ITEM_ROW(0x53, GILDED_CHEST, 0x27, -1, 0x0013, 0x0137, 0x50, no_upgrade, no_effect, -1, -1), // Bunny Hood + [0x1C] = ITEM_ROW(0x53, GILDED_CHEST, 0x2B, -1, 0x0017, 0x0138, 0x51, no_upgrade, no_effect, -1, -1), // Mask of Truth + [0x1D] = ITEM_ROW(0x53, GILDED_CHEST, 0x2D, -1, 0x9001, 0x00DA, 0x29, no_upgrade, no_effect, -1, -1), // Pocket Egg + [0x1E] = ITEM_ROW(0x53, GILDED_CHEST, 0x2E, -1, 0x000B, 0x0109, 0x44, no_upgrade, no_effect, -1, -1), // Pocket Cucco + [0x1F] = ITEM_ROW(0x53, GILDED_CHEST, 0x30, -1, 0x0003, 0x0141, 0x54, no_upgrade, no_effect, -1, -1), // Odd Mushroom + [0x20] = ITEM_ROW(0x53, GILDED_CHEST, 0x31, -1, 0x0004, 0x0140, 0x53, no_upgrade, no_effect, -1, -1), // Odd Potion + [0x21] = ITEM_ROW(0x53, GILDED_CHEST, 0x32, -1, 0x0005, 0x00F5, 0x40, no_upgrade, no_effect, -1, -1), // Poacher's Saw + [0x22] = ITEM_ROW(0x53, GILDED_CHEST, 0x33, -1, 0x0008, 0x0143, 0x56, no_upgrade, no_effect, -1, -1), // Goron's Sword (Broken) + [0x23] = ITEM_ROW(0x53, GILDED_CHEST, 0x34, -1, 0x0009, 0x0146, 0x57, no_upgrade, no_effect, -1, -1), // Prescription + [0x24] = ITEM_ROW(0x53, GILDED_CHEST, 0x35, -1, 0x000D, 0x0149, 0x5A, no_upgrade, no_effect, -1, -1), // Eyeball Frog + [0x25] = ITEM_ROW(0x53, GILDED_CHEST, 0x36, -1, 0x000E, 0x013F, 0x52, no_upgrade, no_effect, -1, -1), // Eye Drops + [0x26] = ITEM_ROW(0x53, GILDED_CHEST, 0x37, -1, 0x000A, 0x0142, 0x55, no_upgrade, no_effect, -1, -1), // Claim Check + [0x27] = ITEM_ROW(0x53, GILDED_CHEST, 0x3B, -1, 0x00A4, 0x018D, 0x74, no_upgrade, no_effect, -1, -1), // Kokiri Sword + [0x28] = ITEM_ROW(0x53, GILDED_CHEST, 0x3D, -1, 0x004B, 0x00F8, 0x43, no_upgrade, no_effect, -1, -1), // Giant's Knife + [0x29] = ITEM_ROW(0x53, BROWN_CHEST, 0x3E, -1, 0x004C, 0x00CB, 0x1D, no_upgrade, no_effect, -1, -1), // Deku Shield + [0x2A] = ITEM_ROW(0x53, BROWN_CHEST, 0x3F, -1, 0x004D, 0x00DC, 0x2C, no_upgrade, no_effect, -1, -1), // Hylian Shield + [0x2B] = ITEM_ROW(0x53, GILDED_CHEST, 0x40, -1, 0x004E, 0x00EE, 0x3A, no_upgrade, no_effect, -1, -1), // Mirror Shield + [0x2C] = ITEM_ROW(0x53, GILDED_CHEST, 0x42, -1, 0x0050, 0x00F2, 0x3C, no_upgrade, no_effect, -1, -1), // Goron Tunic + [0x2D] = ITEM_ROW(0x53, GILDED_CHEST, 0x43, -1, 0x0051, 0x00F2, 0x3D, no_upgrade, no_effect, -1, -1), // Zora Tunic + [0x2E] = ITEM_ROW(0x53, GILDED_CHEST, 0x45, -1, 0x0053, 0x0118, 0x47, no_upgrade, no_effect, -1, -1), // Iron Boots + [0x2F] = ITEM_ROW(0x53, GILDED_CHEST, 0x46, -1, 0x0054, 0x0157, 0x5F, no_upgrade, no_effect, -1, -1), // Hover Boots + [0x30] = ITEM_ROW(0x53, GILDED_CHEST, 0x4B, -1, 0x0056, 0x00BE, 0x16, no_upgrade, no_effect, -1, -1), // Big Quiver + [0x31] = ITEM_ROW(0x53, GILDED_CHEST, 0x4C, -1, 0x0057, 0x00BE, 0x17, no_upgrade, no_effect, -1, -1), // Biggest Quiver + [0x32] = ITEM_ROW(0x53, GILDED_CHEST, 0x4D, -1, 0x0058, 0x00BF, 0x18, no_upgrade, no_effect, -1, -1), // Bomb Bag + [0x33] = ITEM_ROW(0x53, GILDED_CHEST, 0x4E, -1, 0x0059, 0x00BF, 0x19, no_upgrade, no_effect, -1, -1), // Big Bomb Bag + [0x34] = ITEM_ROW(0x53, GILDED_CHEST, 0x4F, -1, 0x005A, 0x00BF, 0x1A, no_upgrade, no_effect, -1, -1), // Biggest Bomb Bag + [0x35] = ITEM_ROW(0x53, GILDED_CHEST, 0x51, -1, 0x005B, 0x012D, 0x49, no_upgrade, no_effect, -1, -1), // Silver Gauntlets + [0x36] = ITEM_ROW(0x53, GILDED_CHEST, 0x52, -1, 0x005C, 0x012D, 0x4A, no_upgrade, no_effect, -1, -1), // Golden Gauntlets + [0x37] = ITEM_ROW(0x53, GILDED_CHEST, 0x53, -1, 0x00CD, 0x00DB, 0x2A, no_upgrade, no_effect, -1, -1), // Silver Scale + [0x38] = ITEM_ROW(0x53, GILDED_CHEST, 0x54, -1, 0x00CE, 0x00DB, 0x2B, no_upgrade, no_effect, -1, -1), // Golden Scale + [0x39] = ITEM_ROW(0x53, GILDED_CHEST, 0x6F, -1, 0x0068, 0x00C8, 0x21, no_upgrade, no_effect, -1, -1), // Stone of Agony + [0x3A] = ITEM_ROW(0x53, GILDED_CHEST, 0x70, -1, 0x007B, 0x00D7, 0x24, no_upgrade, no_effect, -1, -1), // Gerudo Membership Card + [0x3B] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x004A, 0x010E, 0x46, no_upgrade, give_fairy_ocarina, -1, -1), // Fairy Ocarina [0x3C] = ITEM_ROW(0x4D, BROWN_CHEST, 0x58, 16, 0x00DC, 0x0119, 0x48, seeds_to_rupee, no_effect, -1, -1), // Deku Seeds (5) - [0x3D] = ITEM_ROW(0x3D, BROWN_CHEST, 0x72, 0, 0x00C6, 0x00BD, 0x13, health_upgrade_cap, clear_excess_hearts, -1, -1), // Heart Container - [0x3E] = ITEM_ROW(0x3E, BROWN_CHEST, 0x7A, 0, 0x00C2, 0x00BD, 0x14, health_upgrade_cap, full_heal, -1, -1), // Piece of Heart - [0x3F] = ITEM_ROW(0x53, GOLD_CHEST, 0x74, 0, 0x00C7, 0x00B9, 0x0A, no_upgrade, no_effect, -1, -1), // Boss Key - [0x40] = ITEM_ROW(0x53, BROWN_CHEST, 0x75, 0, 0x0067, 0x00B8, 0x0B, no_upgrade, no_effect, -1, -1), // Compass - [0x41] = ITEM_ROW(0x53, BROWN_CHEST, 0x76, 0, 0x0066, 0x00C8, 0x1C, no_upgrade, no_effect, -1, -1), // Map - [0x42] = ITEM_ROW(0x53, SILVER_CHEST, 0x77, 0, 0x0060, 0x00AA, 0x02, no_upgrade, no_effect, -1, -1), // Small Key - [0x43] = ITEM_ROW(0x53, BROWN_CHEST, 0x78, 0, 0x0052, 0x00CD, 0x1E, no_upgrade, no_effect, -1, -1), // Small Magic Jar - [0x44] = ITEM_ROW(0x53, BROWN_CHEST, 0x79, 0, 0x0052, 0x00CD, 0x1F, no_upgrade, no_effect, -1, -1), // Large Magic Jar - [0x45] = ITEM_ROW(0x53, GILDED_CHEST, 0x56, 0, 0x005E, 0x00D1, 0x22, no_upgrade, fill_wallet_upgrade, 1, -1), // Adult's Wallet - [0x46] = ITEM_ROW(0x53, GILDED_CHEST, 0x57, 0, 0x005F, 0x00D1, 0x23, no_upgrade, fill_wallet_upgrade, 2, -1), // Giant's Wallet - [0x47] = ITEM_ROW(0x53, GILDED_CHEST, 0x21, 0, 0x009A, 0x00DA, 0x29, no_upgrade, no_effect, -1, -1), // Weird Egg + [0x3D] = ITEM_ROW(0x3D, BROWN_CHEST, 0x72, -1, 0x00C6, 0x00BD, 0x13, health_upgrade_cap, clear_excess_hearts, -1, -1), // Heart Container + [0x3E] = ITEM_ROW(0x3E, BROWN_CHEST, 0x7A, -1, 0x00C2, 0x00BD, 0x14, health_upgrade_cap, full_heal, -1, -1), // Piece of Heart + [0x3F] = ITEM_ROW(0x53, GOLD_CHEST, 0x74, -1, 0x00C7, 0x00B9, 0x0A, no_upgrade, no_effect, -1, -1), // Boss Key + [0x40] = ITEM_ROW(0x53, BROWN_CHEST, 0x75, -1, 0x0067, 0x00B8, 0x0B, no_upgrade, no_effect, -1, -1), // Compass + [0x41] = ITEM_ROW(0x53, BROWN_CHEST, 0x76, -1, 0x0066, 0x00C8, 0x1C, no_upgrade, no_effect, -1, -1), // Map + [0x42] = ITEM_ROW(0x53, SILVER_CHEST, 0x77, -1, 0x0060, 0x00AA, 0x02, no_upgrade, no_effect, -1, -1), // Small Key + [0x43] = ITEM_ROW(0x53, BROWN_CHEST, 0x78, -1, 0x0052, 0x00CD, 0x1E, no_upgrade, no_effect, -1, -1), // Small Magic Jar + [0x44] = ITEM_ROW(0x53, BROWN_CHEST, 0x79, -1, 0x0052, 0x00CD, 0x1F, no_upgrade, no_effect, -1, -1), // Large Magic Jar + [0x45] = ITEM_ROW(0x53, GILDED_CHEST, 0x56, -1, 0x005E, 0x00D1, 0x22, no_upgrade, fill_wallet_upgrade, 1, -1), // Adult's Wallet + [0x46] = ITEM_ROW(0x53, GILDED_CHEST, 0x57, -1, 0x005F, 0x00D1, 0x23, no_upgrade, fill_wallet_upgrade, 2, -1), // Giant's Wallet + [0x47] = ITEM_ROW(0x53, GILDED_CHEST, 0x21, -1, 0x009A, 0x00DA, 0x29, no_upgrade, no_effect, -1, -1), // Weird Egg [0x48] = ITEM_ROW(0x4D, BROWN_CHEST, 0x83, 3, 0x0055, 0x00B7, 0x09, no_upgrade, no_effect, -1, -1), // Recovery Heart [0x49] = ITEM_ROW(0x4D, BROWN_CHEST, 0x92, 8, 0x00E6, 0x00D8, 0x25, arrows_to_rupee, no_effect, -1, -1), // Arrows (5) [0x4A] = ITEM_ROW(0x4D, BROWN_CHEST, 0x93, 9, 0x00E6, 0x00D8, 0x26, arrows_to_rupee, no_effect, -1, -1), // Arrows (10) @@ -101,24 +101,24 @@ item_row_t item_table[] = { [0x4C] = ITEM_ROW(0x4D, BROWN_CHEST, 0x84, 0, 0x006F, 0x017F, 0x6D, no_upgrade, no_effect, -1, -1), // Green Rupee [0x4D] = ITEM_ROW(0x4D, BROWN_CHEST, 0x85, 1, 0x00CC, 0x017F, 0x6E, no_upgrade, no_effect, -1, -1), // Blue Rupee [0x4E] = ITEM_ROW(0x4D, BROWN_CHEST, 0x86, 2, 0x00F0, 0x017F, 0x6F, no_upgrade, no_effect, -1, -1), // Red Rupee - [0x4F] = ITEM_ROW(0x3D, BROWN_CHEST, 0x72, 0, 0x00C6, 0x00BD, 0x13, no_upgrade, full_heal, -1, -1), // Heart Container - [0x50] = ITEM_ROW(0x53, GILDED_CHEST, 0x82, 0, 0x0098, 0x00DF, 0x30, no_upgrade, no_effect, -1, -1), // Lon Lon Milk (Refill) - [0x51] = ITEM_ROW(0x53, GILDED_CHEST, 0x28, 0, 0x0014, 0x0150, 0x5B, no_upgrade, no_effect, -1, -1), // Goron Mask - [0x52] = ITEM_ROW(0x53, GILDED_CHEST, 0x29, 0, 0x0015, 0x0151, 0x5C, no_upgrade, no_effect, -1, -1), // Zora Mask - [0x53] = ITEM_ROW(0x53, GILDED_CHEST, 0x2A, 0, 0x0016, 0x0152, 0x5D, no_upgrade, no_effect, -1, -1), // Gerudo Mask - [0x54] = ITEM_ROW(0x53, GILDED_CHEST, 0x50, 0, 0x0079, 0x0147, 0x58, no_upgrade, no_effect, -1, -1), // Goron's Bracelet + [0x4F] = ITEM_ROW(0x3D, BROWN_CHEST, 0x72, -1, 0x00C6, 0x00BD, 0x13, no_upgrade, full_heal, -1, -1), // Heart Container + [0x50] = ITEM_ROW(0x53, GILDED_CHEST, 0x82, -1, 0x0098, 0x00DF, 0x30, no_upgrade, no_effect, -1, -1), // Lon Lon Milk (Refill) + [0x51] = ITEM_ROW(0x53, GILDED_CHEST, 0x28, -1, 0x0014, 0x0150, 0x5B, no_upgrade, no_effect, -1, -1), // Goron Mask + [0x52] = ITEM_ROW(0x53, GILDED_CHEST, 0x29, -1, 0x0015, 0x0151, 0x5C, no_upgrade, no_effect, -1, -1), // Zora Mask + [0x53] = ITEM_ROW(0x53, GILDED_CHEST, 0x2A, -1, 0x0016, 0x0152, 0x5D, no_upgrade, no_effect, -1, -1), // Gerudo Mask + [0x54] = ITEM_ROW(0x53, GILDED_CHEST, 0x50, -1, 0x0079, 0x0147, 0x58, no_upgrade, no_effect, -1, -1), // Goron's Bracelet [0x55] = ITEM_ROW(0x4D, BROWN_CHEST, 0x87, 19, 0x00F1, 0x017F, 0x71, no_upgrade, no_effect, -1, -1), // Purple Rupee [0x56] = ITEM_ROW(0x4D, BROWN_CHEST, 0x88, 20, 0x00F2, 0x017F, 0x72, no_upgrade, no_effect, -1, -1), // Huge Rupee - [0x57] = ITEM_ROW(0x53, GILDED_CHEST, 0x3D, 0, 0x000C, 0x00F8, 0x43, no_upgrade, give_biggoron_sword, -1, -1), // Biggoron's Sword - [0x58] = ITEM_ROW(0x53, GILDED_CHEST, 0x04, 0, 0x0070, 0x0158, 0x60, no_upgrade, no_effect, -1, -1), // Fire Arrow - [0x59] = ITEM_ROW(0x53, GILDED_CHEST, 0x0C, 0, 0x0071, 0x0158, 0x61, no_upgrade, no_effect, -1, -1), // Ice Arrow - [0x5A] = ITEM_ROW(0x53, GILDED_CHEST, 0x12, 0, 0x0072, 0x0158, 0x62, no_upgrade, no_effect, -1, -1), // Light Arrow - [0x5B] = ITEM_ROW(0x5B, SKULL_CHEST_SMALL, 0x71, 0, 0x00B4, 0x015C, 0x63, no_upgrade, no_effect, -1, -1), // Gold Skulltula Token - [0x5C] = ITEM_ROW(0x53, GILDED_CHEST, 0x05, 0, 0x00AD, 0x015D, 0x64, no_upgrade, no_effect, -1, -1), // Din's Fire - [0x5D] = ITEM_ROW(0x53, GILDED_CHEST, 0x0D, 0, 0x00AE, 0x015D, 0x65, no_upgrade, no_effect, -1, -1), // Farore's Wind - [0x5E] = ITEM_ROW(0x53, GILDED_CHEST, 0x13, 0, 0x00AF, 0x015D, 0x66, no_upgrade, no_effect, -1, -1), // Nayru's Love - [0x5F] = ITEM_ROW(0x53, GILDED_CHEST, 0x47, 0, 0x0007, 0x017B, 0x6C, no_upgrade, no_effect, -1, -1), // Bullet Bag (30) - [0x60] = ITEM_ROW(0x53, GILDED_CHEST, 0x48, 0, 0x0007, 0x017B, 0x6C, no_upgrade, no_effect, -1, -1), // Bullet Bag (40) + [0x57] = ITEM_ROW(0x53, GILDED_CHEST, 0x3D, -1, 0x000C, 0x00F8, 0x43, no_upgrade, give_biggoron_sword, -1, -1), // Biggoron's Sword + [0x58] = ITEM_ROW(0x53, GILDED_CHEST, 0x04, -1, 0x0070, 0x0158, 0x60, no_upgrade, no_effect, -1, -1), // Fire Arrow + [0x59] = ITEM_ROW(0x53, GILDED_CHEST, 0x0C, -1, 0x0071, 0x0158, 0x61, no_upgrade, no_effect, -1, -1), // Ice Arrow + [0x5A] = ITEM_ROW(0x53, GILDED_CHEST, 0x12, -1, 0x0072, 0x0158, 0x62, no_upgrade, no_effect, -1, -1), // Light Arrow + [0x5B] = ITEM_ROW(0x5B, SKULL_CHEST_SMALL, 0x71, -1, 0x00B4, 0x015C, 0x63, no_upgrade, no_effect, -1, -1), // Gold Skulltula Token + [0x5C] = ITEM_ROW(0x53, GILDED_CHEST, 0x05, -1, 0x00AD, 0x015D, 0x64, no_upgrade, no_effect, -1, -1), // Din's Fire + [0x5D] = ITEM_ROW(0x53, GILDED_CHEST, 0x0D, -1, 0x00AE, 0x015D, 0x65, no_upgrade, no_effect, -1, -1), // Farore's Wind + [0x5E] = ITEM_ROW(0x53, GILDED_CHEST, 0x13, -1, 0x00AF, 0x015D, 0x66, no_upgrade, no_effect, -1, -1), // Nayru's Love + [0x5F] = ITEM_ROW(0x53, GILDED_CHEST, 0x47, -1, 0x0007, 0x017B, 0x6C, no_upgrade, no_effect, -1, -1), // Bullet Bag (30) + [0x60] = ITEM_ROW(0x53, GILDED_CHEST, 0x48, -1, 0x0007, 0x017B, 0x6C, no_upgrade, no_effect, -1, -1), // Bullet Bag (40) [0x61] = ITEM_ROW(0x4D, BROWN_CHEST, 0x8A, 13, 0x0037, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1), // Deku Sticks (5) [0x62] = ITEM_ROW(0x4D, BROWN_CHEST, 0x8B, 13, 0x0037, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1), // Deku Sticks (10) [0x63] = ITEM_ROW(0x4D, BROWN_CHEST, 0x8C, 12, 0x0034, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1), // Deku Nuts (5) @@ -128,123 +128,123 @@ item_row_t item_table[] = { [0x67] = ITEM_ROW(0x4D, BROWN_CHEST, 0x90, 11, 0x0032, 0x00CE, 0x20, bombs_to_rupee, no_effect, -1, -1), // Bombs (20) [0x68] = ITEM_ROW(0x4D, BROWN_CHEST, 0x91, 11, 0x0032, 0x00CE, 0x20, bombs_to_rupee, no_effect, -1, -1), // Bombs (30) [0x69] = ITEM_ROW(0x4D, BROWN_CHEST, 0x95, 16, 0x00DC, 0x0119, 0x48, seeds_to_rupee, no_effect, -1, -1), // Deku Seeds (30) - [0x6A] = ITEM_ROW(0x4D, BROWN_CHEST, 0x96, 0, 0x0033, 0x00D9, 0x28, no_upgrade, no_effect, -1, -1), // Bombchu (5) - [0x6B] = ITEM_ROW(0x4D, BROWN_CHEST, 0x97, 0, 0x0033, 0x00D9, 0x28, no_upgrade, no_effect, -1, -1), // Bombchu (20) - [0x6C] = ITEM_ROW(0x53, GILDED_CHEST, 0x19, 0, 0x0047, 0x00F4, 0x3F, no_upgrade, no_effect, -1, -1), // Fish (Refill) - [0x6D] = ITEM_ROW(0x53, GILDED_CHEST, 0x1D, 0, 0x007A, 0x0174, 0x68, no_upgrade, no_effect, -1, -1), // Bugs (Refill) - [0x6E] = ITEM_ROW(0x53, GILDED_CHEST, 0x1C, 0, 0x005D, 0x0173, 0x67, no_upgrade, no_effect, -1, -1), // Blue Fire (Refill) - [0x6F] = ITEM_ROW(0x53, GILDED_CHEST, 0x20, 0, 0x0097, 0x0176, 0x6A, no_upgrade, no_effect, -1, -1), // Poe (Refill) - [0x70] = ITEM_ROW(0x53, GILDED_CHEST, 0x1E, 0, 0x00F9, 0x0176, 0x70, no_upgrade, no_effect, -1, -1), // Big Poe (Refill) - [0x71] = ITEM_ROW(0x53, BROWN_CHEST, 0x77, 0, 0x00F3, 0x00AA, 0x02, no_upgrade, no_effect, -1, -1), // Small Key (Chest Game) - [0x72] = ITEM_ROW(0x4D, BROWN_CHEST, 0x84, 0, 0x00F4, 0x017F, 0x6D, no_upgrade, no_effect, -1, -1), // Green Rupee (Chest Game) - [0x73] = ITEM_ROW(0x4D, BROWN_CHEST, 0x85, 0, 0x00F5, 0x017F, 0x6E, no_upgrade, no_effect, -1, -1), // Blue Rupee (Chest Game) - [0x74] = ITEM_ROW(0x4D, BROWN_CHEST, 0x86, 0, 0x00F6, 0x017F, 0x6F, no_upgrade, no_effect, -1, -1), // Red Rupee (Chest Game) - [0x75] = ITEM_ROW(0x4D, BROWN_CHEST, 0x87, 0, 0x00F7, 0x017F, 0x71, no_upgrade, no_effect, -1, -1), // Purple Rupee (Chest Game) - [0x76] = ITEM_ROW(0x53, BROWN_CHEST, 0x7A, 0, 0x00FA, 0x00BD, 0x14, health_upgrade_cap, full_heal, -1, -1), // Piece of Heart (Chest Game) - [0x77] = ITEM_ROW(0x53, BROWN_CHEST, 0x98, 0, 0x0090, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1), // Deku Stick Upgrade (20) - [0x78] = ITEM_ROW(0x53, BROWN_CHEST, 0x99, 0, 0x0091, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1), // Deku Stick Upgrade (30) - [0x79] = ITEM_ROW(0x53, BROWN_CHEST, 0x9A, 0, 0x00A7, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1), // Deku Nut Upgrade (30) - [0x7A] = ITEM_ROW(0x53, BROWN_CHEST, 0x9B, 0, 0x00A8, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1), // Deku Nut Upgrade (40) - [0x7B] = ITEM_ROW(0x53, GILDED_CHEST, 0x49, 0, 0x006C, 0x017B, 0x73, no_upgrade, no_effect, -1, -1), // Bullet Bag (50) - [0x7C] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x9002, 0x0000, 0x00, no_upgrade, ice_trap_effect, -1, -1), // Ice Trap - [0x7D] = ITEM_ROW(0x3E, BROWN_CHEST, 0x41, 0, 0x90C2, 0x00BD, 0x14, no_upgrade, full_heal, -1, -1), // Capped Piece of Heart - [0x7E] = ITEM_ROW(0x3E, BROWN_CHEST, 0x41, 0, 0x90C6, 0x00BD, 0x13, no_upgrade, full_heal, -1, -1), // Capped Heart Container - [0x7F] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x90FA, 0x00BD, 0x14, no_upgrade, full_heal, -1, -1), // Capped Piece of Heart (Chest Game) + [0x6A] = ITEM_ROW(0x4D, BROWN_CHEST, 0x96, -1, 0x0033, 0x00D9, 0x28, no_upgrade, no_effect, -1, -1), // Bombchu (5) + [0x6B] = ITEM_ROW(0x4D, BROWN_CHEST, 0x97, -1, 0x0033, 0x00D9, 0x28, no_upgrade, no_effect, -1, -1), // Bombchu (20) + [0x6C] = ITEM_ROW(0x53, GILDED_CHEST, 0x19, -1, 0x0047, 0x00F4, 0x3F, no_upgrade, no_effect, -1, -1), // Fish (Refill) + [0x6D] = ITEM_ROW(0x53, GILDED_CHEST, 0x1D, -1, 0x007A, 0x0174, 0x68, no_upgrade, no_effect, -1, -1), // Bugs (Refill) + [0x6E] = ITEM_ROW(0x53, GILDED_CHEST, 0x1C, -1, 0x005D, 0x0173, 0x67, no_upgrade, no_effect, -1, -1), // Blue Fire (Refill) + [0x6F] = ITEM_ROW(0x53, GILDED_CHEST, 0x20, -1, 0x0097, 0x0176, 0x6A, no_upgrade, no_effect, -1, -1), // Poe (Refill) + [0x70] = ITEM_ROW(0x53, GILDED_CHEST, 0x1E, -1, 0x00F9, 0x0176, 0x70, no_upgrade, no_effect, -1, -1), // Big Poe (Refill) + [0x71] = ITEM_ROW(0x53, BROWN_CHEST, 0x77, -1, 0x00F3, 0x00AA, 0x02, no_upgrade, no_effect, -1, -1), // Small Key (Chest Game) + [0x72] = ITEM_ROW(0x4D, BROWN_CHEST, 0x84, -1, 0x00F4, 0x017F, 0x6D, no_upgrade, no_effect, -1, -1), // Green Rupee (Chest Game) + [0x73] = ITEM_ROW(0x4D, BROWN_CHEST, 0x85, -1, 0x00F5, 0x017F, 0x6E, no_upgrade, no_effect, -1, -1), // Blue Rupee (Chest Game) + [0x74] = ITEM_ROW(0x4D, BROWN_CHEST, 0x86, -1, 0x00F6, 0x017F, 0x6F, no_upgrade, no_effect, -1, -1), // Red Rupee (Chest Game) + [0x75] = ITEM_ROW(0x4D, BROWN_CHEST, 0x87, -1, 0x00F7, 0x017F, 0x71, no_upgrade, no_effect, -1, -1), // Purple Rupee (Chest Game) + [0x76] = ITEM_ROW(0x53, BROWN_CHEST, 0x7A, -1, 0x00FA, 0x00BD, 0x14, health_upgrade_cap, full_heal, -1, -1), // Piece of Heart (Chest Game) + [0x77] = ITEM_ROW(0x53, BROWN_CHEST, 0x98, -1, 0x0090, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1), // Deku Stick Upgrade (20) + [0x78] = ITEM_ROW(0x53, BROWN_CHEST, 0x99, -1, 0x0091, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1), // Deku Stick Upgrade (30) + [0x79] = ITEM_ROW(0x53, BROWN_CHEST, 0x9A, -1, 0x00A7, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1), // Deku Nut Upgrade (30) + [0x7A] = ITEM_ROW(0x53, BROWN_CHEST, 0x9B, -1, 0x00A8, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1), // Deku Nut Upgrade (40) + [0x7B] = ITEM_ROW(0x53, GILDED_CHEST, 0x49, -1, 0x006C, 0x017B, 0x73, no_upgrade, no_effect, -1, -1), // Bullet Bag (50) + [0x7C] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x9002, 0x0000, 0x00, no_upgrade, ice_trap_effect, -1, -1), // Ice Trap + [0x7D] = ITEM_ROW(0x3E, BROWN_CHEST, 0x41, -1, 0x90C2, 0x00BD, 0x14, no_upgrade, full_heal, -1, -1), // Capped Piece of Heart + [0x7E] = ITEM_ROW(0x3E, BROWN_CHEST, 0x41, -1, 0x90C6, 0x00BD, 0x13, no_upgrade, full_heal, -1, -1), // Capped Heart Container + [0x7F] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x90FA, 0x00BD, 0x14, no_upgrade, full_heal, -1, -1), // Capped Piece of Heart (Chest Game) - [0x80] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x00DD, 0x2D, hookshot_upgrade, no_effect, -1, -1), // Progressive Hookshot - [0x81] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x0147, 0x58, strength_upgrade, no_effect, -1, -1), // Progressive Strength - [0x82] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x00BF, 0x18, bomb_bag_upgrade, no_effect, -1, -1), // Progressive Bomb Bag - [0x83] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x00E9, 0x35, bow_upgrade, no_effect, -1, -1), // Progressive Bow - [0x84] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x00E7, 0x33, slingshot_upgrade, no_effect, -1, -1), // Progressive Slingshot - [0x85] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x00D1, 0x22, wallet_upgrade, no_effect, -1, -1), // Progressive Wallet - [0x86] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x00DB, 0x2A, scale_upgrade, no_effect, -1, -1), // Progressive Scale - [0x87] = ITEM_ROW( -1, BROWN_CHEST, -1, 0, -1, 0x00BB, 0x12, nut_upgrade, no_effect, -1, -1), // Progressive Nut Capacity - [0x88] = ITEM_ROW( -1, BROWN_CHEST, -1, 0, -1, 0x00C7, 0x1B, stick_upgrade, no_effect, -1, -1), // Progressive Stick Capacity - [0x89] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x00D9, 0x28, bombchu_upgrade, no_effect, -1, -1), // Progressive Bombchus - [0x8A] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x00CD, 0x1E, magic_upgrade, no_effect, -1, -1), // Progressive Magic Meter - [0x8B] = ITEM_ROW( -1, GILDED_CHEST, -1, 0, -1, 0x010E, 0x46, ocarina_upgrade, no_effect, -1, -1), // Progressive Ocarina + [0x80] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00DD, 0x2D, hookshot_upgrade, no_effect, -1, -1), // Progressive Hookshot + [0x81] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x0147, 0x58, strength_upgrade, no_effect, -1, -1), // Progressive Strength + [0x82] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00BF, 0x18, bomb_bag_upgrade, no_effect, -1, -1), // Progressive Bomb Bag + [0x83] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00E9, 0x35, bow_upgrade, no_effect, -1, -1), // Progressive Bow + [0x84] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00E7, 0x33, slingshot_upgrade, no_effect, -1, -1), // Progressive Slingshot + [0x85] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00D1, 0x22, wallet_upgrade, no_effect, -1, -1), // Progressive Wallet + [0x86] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00DB, 0x2A, scale_upgrade, no_effect, -1, -1), // Progressive Scale + [0x87] = ITEM_ROW( -1, BROWN_CHEST, -1, -1, -1, 0x00BB, 0x12, nut_upgrade, no_effect, -1, -1), // Progressive Nut Capacity + [0x88] = ITEM_ROW( -1, BROWN_CHEST, -1, -1, -1, 0x00C7, 0x1B, stick_upgrade, no_effect, -1, -1), // Progressive Stick Capacity + [0x89] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00D9, 0x28, bombchu_upgrade, no_effect, -1, -1), // Progressive Bombchus + [0x8A] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00CD, 0x1E, magic_upgrade, no_effect, -1, -1), // Progressive Magic Meter + [0x8B] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x010E, 0x46, ocarina_upgrade, no_effect, -1, -1), // Progressive Ocarina - [0x8C] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0043, 0x00C6, 0x01, no_upgrade, give_bottle, 0x15, -1), // Bottle with Red Potion - [0x8D] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0044, 0x00C6, 0x01, no_upgrade, give_bottle, 0x16, -1), // Bottle with Green Potion - [0x8E] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0045, 0x00C6, 0x01, no_upgrade, give_bottle, 0x17, -1), // Bottle with Blue Potion - [0x8F] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0046, 0x0177, 0x6B, no_upgrade, give_bottle, 0x18, -1), // Bottle with Fairy - [0x90] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0047, 0x00F4, 0x3F, no_upgrade, give_bottle, 0x19, -1), // Bottle with Fish - [0x91] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x005D, 0x0173, 0x67, no_upgrade, give_bottle, 0x1C, -1), // Bottle with Blue Fire - [0x92] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x007A, 0x0174, 0x68, no_upgrade, give_bottle, 0x1D, -1), // Bottle with Bugs - [0x93] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00F9, 0x0176, 0x70, no_upgrade, give_bottle, 0x1E, -1), // Bottle with Big Poe - [0x94] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0097, 0x0176, 0x6A, no_upgrade, give_bottle, 0x20, -1), // Bottle with Poe + [0x8C] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0043, 0x00C6, 0x01, no_upgrade, give_bottle, 0x15, -1), // Bottle with Red Potion + [0x8D] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0044, 0x00C6, 0x01, no_upgrade, give_bottle, 0x16, -1), // Bottle with Green Potion + [0x8E] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0045, 0x00C6, 0x01, no_upgrade, give_bottle, 0x17, -1), // Bottle with Blue Potion + [0x8F] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0046, 0x0177, 0x6B, no_upgrade, give_bottle, 0x18, -1), // Bottle with Fairy + [0x90] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0047, 0x00F4, 0x3F, no_upgrade, give_bottle, 0x19, -1), // Bottle with Fish + [0x91] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x005D, 0x0173, 0x67, no_upgrade, give_bottle, 0x1C, -1), // Bottle with Blue Fire + [0x92] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x007A, 0x0174, 0x68, no_upgrade, give_bottle, 0x1D, -1), // Bottle with Bugs + [0x93] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00F9, 0x0176, 0x70, no_upgrade, give_bottle, 0x1E, -1), // Bottle with Big Poe + [0x94] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0097, 0x0176, 0x6A, no_upgrade, give_bottle, 0x20, -1), // Bottle with Poe - [0x95] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, 0, 0x0006, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, FOREST_ID ), // Forest Temple Boss Key - [0x96] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, 0, 0x001C, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, FIRE_ID ), // Fire Temple Boss Key - [0x97] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, 0, 0x001D, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, WATER_ID ), // Water Temple Boss Key - [0x98] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, 0, 0x001E, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, SPIRIT_ID ), // Spirit Temple Boss Key - [0x99] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, 0, 0x002A, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, SHADOW_ID ), // Shadow Temple Boss Key - [0x9A] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, 0, 0x0061, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, TOWER_ID ), // Ganon's Castle Boss Key + [0x95] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, -1, 0x0006, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, FOREST_ID ), // Forest Temple Boss Key + [0x96] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, -1, 0x001C, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, FIRE_ID ), // Fire Temple Boss Key + [0x97] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, -1, 0x001D, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, WATER_ID ), // Water Temple Boss Key + [0x98] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, -1, 0x001E, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, SPIRIT_ID ), // Spirit Temple Boss Key + [0x99] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, -1, 0x002A, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, SHADOW_ID ), // Shadow Temple Boss Key + [0x9A] = ITEM_ROW(0x53, GOLD_CHEST, 0x41, -1, 0x0061, 0x00B9, 0x0A, no_upgrade, give_dungeon_item, 0x01, TOWER_ID ), // Ganon's Castle Boss Key - [0x9B] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x0062, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, DEKU_ID ), // Deku Tree Compass - [0x9C] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x0063, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, DODONGO_ID), // Dodongo's Cavern Compass - [0x9D] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x0064, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, JABU_ID ), // Jabu Jabu Compass - [0x9E] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x0065, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, FOREST_ID ), // Forest Temple Compass - [0x9F] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x007C, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, FIRE_ID ), // Fire Temple Compass - [0xA0] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x007D, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, WATER_ID ), // Water Temple Compass - [0xA1] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x007E, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, SPIRIT_ID ), // Spirit Temple Compass - [0xA2] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x007F, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, SHADOW_ID ), // Shadow Temple Compass - [0xA3] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x00A2, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, BOTW_ID ), // Bottom of the Well Compass - [0xA4] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x0087, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, ICE_ID ), // Ice Cavern Compass + [0x9B] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x0062, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, DEKU_ID ), // Deku Tree Compass + [0x9C] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x0063, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, DODONGO_ID), // Dodongo's Cavern Compass + [0x9D] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x0064, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, JABU_ID ), // Jabu Jabu Compass + [0x9E] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x0065, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, FOREST_ID ), // Forest Temple Compass + [0x9F] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x007C, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, FIRE_ID ), // Fire Temple Compass + [0xA0] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x007D, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, WATER_ID ), // Water Temple Compass + [0xA1] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x007E, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, SPIRIT_ID ), // Spirit Temple Compass + [0xA2] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x007F, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, SHADOW_ID ), // Shadow Temple Compass + [0xA3] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x00A2, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, BOTW_ID ), // Bottom of the Well Compass + [0xA4] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x0087, 0x00B8, 0x0B, no_upgrade, give_dungeon_item, 0x02, ICE_ID ), // Ice Cavern Compass - [0xA5] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x0088, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, DEKU_ID ), // Deku Tree Map - [0xA6] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x0089, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, DODONGO_ID), // Dodongo's Cavern Map - [0xA7] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x008A, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, JABU_ID ), // Jabu Jabu Map - [0xA8] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x008B, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, FOREST_ID ), // Forest Temple Map - [0xA9] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x008C, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, FIRE_ID ), // Fire Temple Map - [0xAA] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x008E, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, WATER_ID ), // Water Temple Map - [0xAB] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x008F, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, SPIRIT_ID ), // Spirit Temple Map - [0xAC] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x00A3, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, SHADOW_ID ), // Shadow Temple Map - [0xAD] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x00A5, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, BOTW_ID ), // Bottom of the Well Map - [0xAE] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, 0, 0x0092, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, ICE_ID ), // Ice Cavern Map + [0xA5] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x0088, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, DEKU_ID ), // Deku Tree Map + [0xA6] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x0089, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, DODONGO_ID), // Dodongo's Cavern Map + [0xA7] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x008A, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, JABU_ID ), // Jabu Jabu Map + [0xA8] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x008B, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, FOREST_ID ), // Forest Temple Map + [0xA9] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x008C, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, FIRE_ID ), // Fire Temple Map + [0xAA] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x008E, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, WATER_ID ), // Water Temple Map + [0xAB] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x008F, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, SPIRIT_ID ), // Spirit Temple Map + [0xAC] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x00A3, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, SHADOW_ID ), // Shadow Temple Map + [0xAD] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x00A5, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, BOTW_ID ), // Bottom of the Well Map + [0xAE] = ITEM_ROW(0x53, BROWN_CHEST, 0x41, -1, 0x0092, 0x00C8, 0x1C, no_upgrade, give_dungeon_item, 0x04, ICE_ID ), // Ice Cavern Map - [0xAF] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x0093, 0x00AA, 0x02, no_upgrade, give_small_key, FOREST_ID, -1), // Forest Temple Small Key - [0xB0] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x0094, 0x00AA, 0x02, no_upgrade, give_small_key, FIRE_ID, -1), // Fire Temple Small Key - [0xB1] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x0095, 0x00AA, 0x02, no_upgrade, give_small_key, WATER_ID, -1), // Water Temple Small Key - [0xB2] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x00A6, 0x00AA, 0x02, no_upgrade, give_small_key, SPIRIT_ID, -1), // Spirit Temple Small Key - [0xB3] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x00A9, 0x00AA, 0x02, no_upgrade, give_small_key, SHADOW_ID, -1), // Shadow Temple Small Key - [0xB4] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x009B, 0x00AA, 0x02, no_upgrade, give_small_key, BOTW_ID, -1), // Bottom of the Well Small Key - [0xB5] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x009F, 0x00AA, 0x02, no_upgrade, give_small_key, GTG_ID, -1), // Gerudo Training Small Key - [0xB6] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x00A0, 0x00AA, 0x02, no_upgrade, give_small_key, FORT_ID, -1), // Gerudo Fortress Small Key - [0xB7] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x00A1, 0x00AA, 0x02, no_upgrade, give_small_key, CASTLE_ID, -1), // Ganon's Castle Small Key + [0xAF] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x0093, 0x00AA, 0x02, no_upgrade, give_small_key, FOREST_ID, -1), // Forest Temple Small Key + [0xB0] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x0094, 0x00AA, 0x02, no_upgrade, give_small_key, FIRE_ID, -1), // Fire Temple Small Key + [0xB1] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x0095, 0x00AA, 0x02, no_upgrade, give_small_key, WATER_ID, -1), // Water Temple Small Key + [0xB2] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x00A6, 0x00AA, 0x02, no_upgrade, give_small_key, SPIRIT_ID, -1), // Spirit Temple Small Key + [0xB3] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x00A9, 0x00AA, 0x02, no_upgrade, give_small_key, SHADOW_ID, -1), // Shadow Temple Small Key + [0xB4] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x009B, 0x00AA, 0x02, no_upgrade, give_small_key, BOTW_ID, -1), // Bottom of the Well Small Key + [0xB5] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x009F, 0x00AA, 0x02, no_upgrade, give_small_key, GTG_ID, -1), // Gerudo Training Small Key + [0xB6] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x00A0, 0x00AA, 0x02, no_upgrade, give_small_key, FORT_ID, -1), // Gerudo Fortress Small Key + [0xB7] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x00A1, 0x00AA, 0x02, no_upgrade, give_small_key, CASTLE_ID, -1), // Ganon's Castle Small Key - [0xB8] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00E9, 0x0194, 0x13, no_upgrade, give_defense, -1, -1), // Double Defense - [0xB9] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00E4, 0x00CD, 0x1E, no_upgrade, give_magic, -1, -1), // Magic Meter - [0xBA] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00E8, 0x00CD, 0x1F, no_upgrade, give_double_magic, -1, -1), // Double Magic + [0xB8] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00E9, 0x0194, 0x13, no_upgrade, give_defense, -1, -1), // Double Defense + [0xB9] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00E4, 0x00CD, 0x1E, no_upgrade, give_magic, -1, -1), // Magic Meter + [0xBA] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00E8, 0x00CD, 0x1F, no_upgrade, give_double_magic, -1, -1), // Double Magic - [0xBB] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0073, 0x00B6, 0x03, no_upgrade, give_song, 6, -1 ), // Minuet of Forest - [0xBC] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0074, 0x00B6, 0x04, no_upgrade, give_song, 7, -1 ), // Bolero of Fire - [0xBD] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0075, 0x00B6, 0x05, no_upgrade, give_song, 8, -1 ), // Serenade of Water - [0xBE] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0076, 0x00B6, 0x06, no_upgrade, give_song, 9, -1 ), // Requiem of Spirit - [0xBF] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0077, 0x00B6, 0x07, no_upgrade, give_song, 10, -1), // Nocturn of Shadow - [0xC0] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x0078, 0x00B6, 0x08, no_upgrade, give_song, 11, -1), // Prelude of Light + [0xBB] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0073, 0x00B6, 0x03, no_upgrade, give_song, 6, -1 ), // Minuet of Forest + [0xBC] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0074, 0x00B6, 0x04, no_upgrade, give_song, 7, -1 ), // Bolero of Fire + [0xBD] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0075, 0x00B6, 0x05, no_upgrade, give_song, 8, -1 ), // Serenade of Water + [0xBE] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0076, 0x00B6, 0x06, no_upgrade, give_song, 9, -1 ), // Requiem of Spirit + [0xBF] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0077, 0x00B6, 0x07, no_upgrade, give_song, 10, -1), // Nocturn of Shadow + [0xC0] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0078, 0x00B6, 0x08, no_upgrade, give_song, 11, -1), // Prelude of Light - [0xC1] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00D4, 0x00B6, 0x04, no_upgrade, give_song, 12, -1), // Zelda's Lullaby - [0xC2] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00D2, 0x00B6, 0x06, no_upgrade, give_song, 13, -1), // Epona's Song - [0xC3] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00D1, 0x00B6, 0x03, no_upgrade, give_song, 14, -1), // Saria's Song - [0xC4] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00D3, 0x00B6, 0x08, no_upgrade, give_song, 15, -1), // Sun's Song - [0xC5] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00D5, 0x00B6, 0x05, no_upgrade, give_song, 16, -1), // Song of Time - [0xC6] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00D6, 0x00B6, 0x07, no_upgrade, give_song, 17, -1), // Song of Storms + [0xC1] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00D4, 0x00B6, 0x04, no_upgrade, give_song, 12, -1), // Zelda's Lullaby + [0xC2] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00D2, 0x00B6, 0x06, no_upgrade, give_song, 13, -1), // Epona's Song + [0xC3] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00D1, 0x00B6, 0x03, no_upgrade, give_song, 14, -1), // Saria's Song + [0xC4] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00D3, 0x00B6, 0x08, no_upgrade, give_song, 15, -1), // Sun's Song + [0xC5] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00D5, 0x00B6, 0x05, no_upgrade, give_song, 16, -1), // Song of Time + [0xC6] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00D6, 0x00B6, 0x07, no_upgrade, give_song, 17, -1), // Song of Storms - [0xC7] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x00F8, 0x00D1, 0x23, no_upgrade, give_tycoon_wallet, 3, -1), // Tycoon's Wallet - [0xC8] = ITEM_ROW(0x53, GILDED_CHEST, 0x14, 0, 0x9099, 0x010B, 0x45, no_upgrade, no_effect, -1, -1), // Redundant Letter Bottle - [0xC9] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x9048, 0x00F3, 0x3E, no_upgrade, give_bean_pack, -1, -1), // Magic Bean Pack - [0xCA] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, 0, 0x9003, 0x0193, 0x76, no_upgrade, give_triforce_piece, -1, -1), // Triforce piece + [0xC7] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x00F8, 0x00D1, 0x23, no_upgrade, give_tycoon_wallet, 3, -1), // Tycoon's Wallet + [0xC8] = ITEM_ROW(0x53, GILDED_CHEST, 0x14, -1, 0x9099, 0x010B, 0x45, no_upgrade, no_effect, -1, -1), // Redundant Letter Bottle + [0xC9] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x9048, 0x00F3, 0x3E, no_upgrade, give_bean_pack, -1, -1), // Magic Bean Pack + [0xCA] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x9003, 0x0193, 0x76, no_upgrade, give_triforce_piece, -1, -1), // Triforce piece - [0xCB] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9010, 0x0195, 0x77, no_upgrade, give_small_key_ring, FOREST_ID, -1), // Forest Temple Small Key Ring - [0xCC] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9011, 0x0195, 0x77, no_upgrade, give_small_key_ring, FIRE_ID, -1), // Fire Temple Small Key Ring - [0xCD] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9012, 0x0195, 0x77, no_upgrade, give_small_key_ring, WATER_ID, -1), // Water Temple Small Key Ring - [0xCE] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9013, 0x0195, 0x77, no_upgrade, give_small_key_ring, SPIRIT_ID, -1), // Spirit Temple Small Key Ring - [0xCF] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9014, 0x0195, 0x77, no_upgrade, give_small_key_ring, SHADOW_ID, -1), // Shadow Temple Small Key Ring - [0xD0] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9015, 0x0195, 0x77, no_upgrade, give_small_key_ring, BOTW_ID, -1), // Bottom of the Well Small Key Ring - [0xD1] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9016, 0x0195, 0x77, no_upgrade, give_small_key_ring, GTG_ID, -1), // Gerudo Training Small Key Ring - [0xD2] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9017, 0x0195, 0x77, no_upgrade, give_small_key_ring, FORT_ID, -1), // Gerudo Fortress Small Key Ring - [0xD3] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9018, 0x0195, 0x77, no_upgrade, give_small_key_ring, CASTLE_ID, -1), // Ganon's Castle Small Key Ring + [0xCB] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9010, 0x0195, 0x77, no_upgrade, give_small_key_ring, FOREST_ID, -1), // Forest Temple Small Key Ring + [0xCC] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9011, 0x0195, 0x77, no_upgrade, give_small_key_ring, FIRE_ID, -1), // Fire Temple Small Key Ring + [0xCD] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9012, 0x0195, 0x77, no_upgrade, give_small_key_ring, WATER_ID, -1), // Water Temple Small Key Ring + [0xCE] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9013, 0x0195, 0x77, no_upgrade, give_small_key_ring, SPIRIT_ID, -1), // Spirit Temple Small Key Ring + [0xCF] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9014, 0x0195, 0x77, no_upgrade, give_small_key_ring, SHADOW_ID, -1), // Shadow Temple Small Key Ring + [0xD0] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9015, 0x0195, 0x77, no_upgrade, give_small_key_ring, BOTW_ID, -1), // Bottom of the Well Small Key Ring + [0xD1] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9016, 0x0195, 0x77, no_upgrade, give_small_key_ring, GTG_ID, -1), // Gerudo Training Small Key Ring + [0xD2] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9017, 0x0195, 0x77, no_upgrade, give_small_key_ring, FORT_ID, -1), // Gerudo Fortress Small Key Ring + [0xD3] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, -1, 0x9018, 0x0195, 0x77, no_upgrade, give_small_key_ring, CASTLE_ID, -1), // Ganon's Castle Small Key Ring }; diff --git a/ASM/c/item_table.h b/ASM/c/item_table.h index 4ec8f318a..b012be21b 100644 --- a/ASM/c/item_table.h +++ b/ASM/c/item_table.h @@ -24,7 +24,7 @@ typedef struct { effect_fn effect; int16_t effect_arg1; int16_t effect_arg2; - uint8_t collectible; + int8_t collectible; } item_row_t; uint16_t resolve_upgrades(uint16_t item_id); diff --git a/ItemPool.py b/ItemPool.py index 3050122c0..37cbb44d8 100644 --- a/ItemPool.py +++ b/ItemPool.py @@ -516,13 +516,13 @@ def get_pool_core(world): elif location.type == 'ActorOverride' or (location.type == 'Collectable' and ('Freestanding' in location.filter_tags or 'RupeeTower' in location.filter_tags)): if world.settings.shuffle_freestanding_items == 'all': shuffle_item = True - item = get_new_junk() + #item = get_new_junk() elif world.settings.shuffle_freestanding_items == 'dungeons' and location.dungeon is not None: shuffle_item = True - item = get_new_junk() + #item = get_new_junk() elif world.settings.shuffle_freestanding_items == 'overworld' and location.dungeon is None: shuffle_item = True - item = get_new_junk() + #item = get_new_junk() else: shuffle_item = False location.disabled = DisableType.DISABLED @@ -531,13 +531,13 @@ def get_pool_core(world): elif location.type == 'Collectable' and ('Pot' in location.filter_tags or 'FlyingPot' in location.filter_tags): if world.settings.shuffle_pots == 'all': shuffle_item = True - item = get_new_junk() + #item = get_new_junk() elif world.settings.shuffle_pots == 'dungeons' and location.dungeon is not None: shuffle_item = True - item = get_new_junk() + #item = get_new_junk() elif world.settings.shuffle_pots == 'overworld' and location.dungeon is None: shuffle_item = True - item = get_new_junk() + #item = get_new_junk() else: shuffle_item = False location.disabled = DisableType.DISABLED @@ -546,13 +546,13 @@ def get_pool_core(world): elif location.type == 'Collectable' and ('Crate' in location.filter_tags or 'SmallCrate' in location.filter_tags): if world.settings.shuffle_crates == 'all': shuffle_item = True - item = get_new_junk() + #item = get_new_junk() elif world.settings.shuffle_crates == 'dungeons' and location.dungeon is not None: shuffle_item = True - item = get_new_junk() + #item = get_new_junk() elif world.settings.shuffle_crates == 'overworld' and location.dungeon is None: shuffle_item = True - item = get_new_junk() + #item = get_new_junk() else: shuffle_item = False location.disabled = DisableType.DISABLED @@ -561,7 +561,7 @@ def get_pool_core(world): elif location.type == 'Collectable' and 'Beehive' in location.filter_tags: if world.settings.shuffle_beehives: shuffle_item = True - item = get_new_junk() + #item = get_new_junk() else: shuffle_item = False location.disabled = DisableType.DISABLED diff --git a/LocationList.py b/LocationList.py index 55c307195..5e34bb43f 100644 --- a/LocationList.py +++ b/LocationList.py @@ -94,12 +94,12 @@ def shop_address(shop_id, shelf_id): ("KF Top of Sarias Recovery Heart 1", ("Collectable", 0x55, 0x1C, None, 'Recovery Heart', ("Kokiri Forest", "Forest", "Freestanding"))), ("KF Top of Sarias Recovery Heart 2", ("Collectable", 0x55, 0x1E, None, 'Recovery Heart', ("Kokiri Forest", "Forest", "Freestanding"))), ("KF Top of Sarias Recovery Heart 3", ("Collectable", 0x55, 0x1D, None, 'Recovery Heart', ("Kokiri Forest", "Forest", "Freestanding"))), - ("KF Bean Platform Green Rupee 1", ("Collectable", 0x55, 0x40, ([0x020816A0, 0x2081910], None), 'Rupees (20)', ("Kokiri Forest", "Forest", "RupeeTower"))), - ("KF Bean Platform Green Rupee 2", ("Collectable", 0x55, 0x41, None, 'Rupees (20)', ("Kokiri Forest", "Forest", "RupeeTower"))), - ("KF Bean Platform Green Rupee 3", ("Collectable", 0x55, 0x42, None, 'Rupees (20)', ("Kokiri Forest", "Forest", "RupeeTower"))), - ("KF Bean Platform Green Rupee 4", ("Collectable", 0x55, 0x43, None, 'Rupees (20)', ("Kokiri Forest", "Forest", "RupeeTower"))), - ("KF Bean Platform Green Rupee 5", ("Collectable", 0x55, 0x44, None, 'Rupees (20)', ("Kokiri Forest", "Forest", "RupeeTower"))), - ("KF Bean Platform Green Rupee 6", ("Collectable", 0x55, 0x45, None, 'Rupees (20)', ("Kokiri Forest", "Forest", "RupeeTower"))), + ("KF Bean Platform Green Rupee 1", ("Collectable", 0x55, 0x40, ([0x020816A0, 0x2081910], None), 'Rupee (1)', ("Kokiri Forest", "Forest", "RupeeTower"))), + ("KF Bean Platform Green Rupee 2", ("Collectable", 0x55, 0x41, None, 'Rupee (1)', ("Kokiri Forest", "Forest", "RupeeTower"))), + ("KF Bean Platform Green Rupee 3", ("Collectable", 0x55, 0x42, None, 'Rupee (1)', ("Kokiri Forest", "Forest", "RupeeTower"))), + ("KF Bean Platform Green Rupee 4", ("Collectable", 0x55, 0x43, None, 'Rupee (1)', ("Kokiri Forest", "Forest", "RupeeTower"))), + ("KF Bean Platform Green Rupee 5", ("Collectable", 0x55, 0x44, None, 'Rupee (1)', ("Kokiri Forest", "Forest", "RupeeTower"))), + ("KF Bean Platform Green Rupee 6", ("Collectable", 0x55, 0x45, None, 'Rupee (1)', ("Kokiri Forest", "Forest", "RupeeTower"))), ("KF Bean Platform Red Rupee", ("Collectable", 0x55, 0x46, None, 'Rupees (20)', ("Kokiri Forest", "Forest", "RupeeTower"))), ("KF Grass Near Ramp Green Rupee 1", ("Collectable", 0x55, 0x24, None, 'Rupee (1)', ("Kokiri Forest", "Forest", "Freestanding"))), ("KF Grass Near Ramp Green Rupee 2", ("Collectable", 0x55, 0x27, None, 'Rupee (1)', ("Kokiri Forest", "Forest", "Freestanding"))), @@ -118,7 +118,7 @@ def shop_address(shop_id, shelf_id): ("KF House of Twins Pot 1", ("Collectable", 0x27, 0x21, None, 'Rupee (1)', ("Kokiri Forest", "Forest", "Pot"))), ("KF House of Twins Pot 2", ("Collectable", 0x27, 0x22, None, 'Rupees (5)', ("Kokiri Forest", "Forest", "Pot"))), # Kokiri Forest Beehives - ("KF Storms Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x0C * 2), None, 'Rupees (20)', ("Kokiri Forest", "Forest", "Grottos", "Beehive"))), + ("KF Storms Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x0C * 2), None, 'Rupees (5)', ("Kokiri Forest", "Forest", "Grottos", "Beehive"))), ("KF Storms Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x0C * 2 + 1), None, 'Rupees (20)', ("Kokiri Forest", "Forest", "Grottos", "Beehive"))), # Lost Woods @@ -148,7 +148,7 @@ def shop_address(shop_id, shelf_id): ("LW Underwater Green Rupee 7", ("Collectable", 0x5B, 0x3C, None, 'Rupee (1)', ("the Lost Woods", "Forest", "Freestanding"))), ("LW Underwater Green Rupee Nearest Exit", ("Collectable", 0x5B, 0x34, None, 'Rupee (1)', ("the Lost Woods", "Forest", "Freestanding"))), # Lost Woods Beehives - ("LW Near Shortcuts Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x14 * 2), None, 'Rupees (20)', ("the Lost Woods", "Forest", "Grottos", "Beehive"))), + ("LW Near Shortcuts Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x14 * 2), None, 'Rupees (5)', ("the Lost Woods", "Forest", "Grottos", "Beehive"))), ("LW Near Shortcuts Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x14 * 2 + 1), None, 'Rupees (20)', ("the Lost Woods", "Forest", "Grottos", "Beehive"))), ("LW Scrubs Grotto Beehive", ("Collectable", 0x3E, 0x60 + (0x15 * 2), None, 'Rupees (20)', ("the Lost Woods", "Forest", "Grottos", "Beehive"))), @@ -171,14 +171,14 @@ def shop_address(shop_id, shelf_id): ("HF GS Cow Grotto", ("GS Token", 0x0A, 0x01, None, 'Gold Skulltula Token', ("Hyrule Field", "Skulltulas", "Grottos"))), ("HF GS Near Kak Grotto", ("GS Token", 0x0A, 0x02, None, 'Gold Skulltula Token', ("Hyrule Field", "Skulltulas", "Grottos"))), # Hyrule Field Pots - ("HF Cow Grotto Pot 1", ("Collectable", 0x3E, 0x20, None, 'Recovery Heart', ("Hyrule Field", "Grottos", "Pot"))), - ("HF Cow Grotto Pot 2", ("Collectable", 0x3E, 0x21, None, 'Recovery Heart', ("Hyrule Field", "Grottos", "Pot"))), + ("HF Cow Grotto Pot 1", ("Collectable", 0x3E, 0x20, None, 'Deku Nuts (5)', ("Hyrule Field", "Grottos", "Pot"))), + ("HF Cow Grotto Pot 2", ("Collectable", 0x3E, 0x21, None, 'Rupees (5)', ("Hyrule Field", "Grottos", "Pot"))), # Hyrule Field Beehives - ("HF Near Market Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x00 * 2), None, 'Rupees (20)', ("Hyrule Field", "Grottos", "Beehive"))), + ("HF Near Market Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x00 * 2), None, 'Rupees (5)', ("Hyrule Field", "Grottos", "Beehive"))), ("HF Near Market Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x00 * 2 + 1), None, 'Rupees (20)', ("Hyrule Field", "Grottos", "Beehive"))), - ("HF Open Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x03 * 2), None, 'Rupees (20)', ("Hyrule Field", "Grottos", "Beehive"))), + ("HF Open Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x03 * 2), None, 'Rupees (5)', ("Hyrule Field", "Grottos", "Beehive"))), ("HF Open Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x03 * 2 + 1), None, 'Rupees (20)', ("Hyrule Field", "Grottos", "Beehive"))), - ("HF Southeast Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x02 * 2), None, 'Rupees (20)', ("Hyrule Field", "Grottos", "Beehive"))), + ("HF Southeast Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x02 * 2), None, 'Rupees (5)', ("Hyrule Field", "Grottos", "Beehive"))), ("HF Southeast Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x02 * 2 + 1), None, 'Rupees (20)', ("Hyrule Field", "Grottos", "Beehive"))), ("HF Inside Fence Grotto Beehive", ("Collectable", 0x3E, 0x60 + (0x06 * 2), None, 'Rupees (20)', ("Hyrule Field", "Grottos", "Beehive"))), @@ -231,19 +231,19 @@ def shop_address(shop_id, shelf_id): ("Market Guard House Child Pot 2", ("Collectable", 0x4D, 0x21, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 3", ("Collectable", 0x4D, 0x22, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 4", ("Collectable", 0x4D, 0x23, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Child Pot 5", ("Collectable", 0x4D, 0x24, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), + ("Market Guard House Child Pot 5", ("Collectable", 0x4D, 0x24, None, 'Rupees (5)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 6", ("Collectable", 0x4D, 0x25, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 7", ("Collectable", 0x4D, 0x27, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Child Pot 8", ("Collectable", 0x4D, 0x28, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), + ("Market Guard House Child Pot 8", ("Collectable", 0x4D, 0x28, None, 'Rupees (5)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 9", ("Collectable", 0x4D, 0x29, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Child Pot 10", ("Collectable", 0x4D, 0x2B, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), + ("Market Guard House Child Pot 10", ("Collectable", 0x4D, 0x2B, None, 'Rupees (5)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 11", ("Collectable", 0x4D, 0x2C, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Child Pot 12", ("Collectable", 0x4D, 0x2D, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Child Pot 13", ("Collectable", 0x4D, 0x2E, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), + ("Market Guard House Child Pot 12", ("Collectable", 0x4D, 0x2D, None, 'Rupees (5)', ("the Market", "Market", "Pot"))), + ("Market Guard House Child Pot 13", ("Collectable", 0x4D, 0x2E, None, 'Recovery Heart', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 14", ("Collectable", 0x4D, 0x30, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Child Pot 15", ("Collectable", 0x4D, 0x31, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), + ("Market Guard House Child Pot 15", ("Collectable", 0x4D, 0x31, None, 'Recovery Heart', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 16", ("Collectable", 0x4D, 0x32, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Child Pot 17", ("Collectable", 0x4D, 0x33, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), + ("Market Guard House Child Pot 17", ("Collectable", 0x4D, 0x33, None, 'Rupees (5)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 18", ("Collectable", 0x4D, 0x34, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 19", ("Collectable", 0x4D, 0x35, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), ("Market Guard House Child Pot 20", ("Collectable", 0x4D, 0x36, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), @@ -251,14 +251,14 @@ def shop_address(shop_id, shelf_id): ("Market Guard House Child Pot 22", ("Collectable", 0x4D, 0x3B, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), ("Market Guard House Adult Pot 1", ("Collectable", 0x4D, 0x2F, ([0x33904C4],None), 'Rupee (1)', ("the Market", "Market", "Pot"))), ("Market Guard House Adult Pot 2", ("Collectable", 0x4D, 0x38, ([0x33904E4],None), 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Adult Pot 3", ("Collectable", 0x4D, 0x39, ([0x33904F4],None), 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Adult Pot 4", ("Collectable", 0x4D, 0x3A, ([0x3390514],None), 'Rupee (1)', ("the Market", "Market", "Pot"))), + ("Market Guard House Adult Pot 3", ("Collectable", 0x4D, 0x39, ([0x33904F4],None), 'Recovery Heart', ("the Market", "Market", "Pot"))), + ("Market Guard House Adult Pot 4", ("Collectable", 0x4D, 0x3A, ([0x3390514],None), 'Rupees (20)', ("the Market", "Market", "Pot"))), ("Market Guard House Adult Pot 5", ("Collectable", 0x4D, 0x26, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), - ("Market Guard House Adult Pot 6", ("Collectable", 0x4D, 0x3D, ([0x3390544],None), 'Rupee (1)', ("the Market", "Market", "Pot"))), + ("Market Guard House Adult Pot 6", ("Collectable", 0x4D, 0x3D, ([0x3390544],None), 'Recovery Heart', ("the Market", "Market", "Pot"))), ("Market Guard House Adult Pot 7", ("Collectable", 0x4D, 0x2A, None, 'Rupee (1)', ("the Market", "Market", "Pot"))), ("Market Man in Green House Pot 1", ("Collectable", 0x2B, 0x21, None, 'Recovery Heart', ("the Market", "Market", "Pot"))), ("Market Man in Green House Pot 2", ("Collectable", 0x2B, 0x22, None, 'Recovery Heart', ("the Market", "Market", "Pot"))), - ("Market Man in Green House Pot 3", ("Collectable", 0x2B, 0x23, None, 'Recovery Heart', ("the Market", "Market", "Pot"))), + ("Market Man in Green House Pot 3", ("Collectable", 0x2B, 0x23, None, 'Rupees (5)', ("the Market", "Market", "Pot"))), # Hyrule Castle ("HC Malon Egg", ("NPC", 0x5F, 0x47, None, 'Weird Egg', ("Hyrule Castle", "Market"))), @@ -266,10 +266,10 @@ def shop_address(shop_id, shelf_id): ("HC Great Fairy Reward", ("Cutscene", 0xFF, 0x11, None, 'Dins Fire', ("Hyrule Castle", "Market", "Fairies"))), ("HC GS Tree", ("GS Token", 0x0E, 0x04, None, 'Gold Skulltula Token', ("Hyrule Castle", "Skulltulas"))), ("HC GS Storms Grotto", ("GS Token", 0x0E, 0x02, None, 'Gold Skulltula Token', ("Hyrule Castle", "Skulltulas", "Grottos"))), - ("HC Storms Grotto Pot 1", ("Collectable", 0x3E, 0x22, None, 'Recovery Heart', ("Hyrule Castle", "Grottos", "Pot"))), - ("HC Storms Grotto Pot 2", ("Collectable", 0x3E, 0x23, None, 'Recovery Heart', ("Hyrule Castle", "Grottos", "Pot"))), - ("HC Storms Grotto Pot 3", ("Collectable", 0x3E, 0x24, None, 'Recovery Heart', ("Hyrule Castle", "Grottos", "Pot"))), - ("HC Storms Grotto Pot 4", ("Collectable", 0x3E, 0x25, None, 'Recovery Heart', ("Hyrule Castle", "Grottos", "Pot"))), + ("HC Storms Grotto Pot 1", ("Collectable", 0x3E, 0x22, None, 'Rupees (20)', ("Hyrule Castle", "Grottos", "Pot"))), + ("HC Storms Grotto Pot 2", ("Collectable", 0x3E, 0x23, None, 'Bombs (5)', ("Hyrule Castle", "Grottos", "Pot"))), + ("HC Storms Grotto Pot 3", ("Collectable", 0x3E, 0x24, None, 'Arrows (5)', ("Hyrule Castle", "Grottos", "Pot"))), + ("HC Storms Grotto Pot 4", ("Collectable", 0x3E, 0x25, None, 'Deku Nuts (5)', ("Hyrule Castle", "Grottos", "Pot"))), # Lon Lon Ranch ("LLR Talons Chickens", ("NPC", 0x4C, 0x14, None, 'Bottle with Milk', ("Lon Lon Ranch", "Minigames"))), @@ -352,7 +352,7 @@ def shop_address(shop_id, shelf_id): ("Kak Adult Red Rupee Crate", ("Collectable", 0x52, 0x2B, ([0x201689C, 0x2016BFC], None), 'Rupees (20)', ("Kakariko Village", "Kakariko", "Crate"))), # update crate flags to not conflict w/ child pots. These move day/night ("Kak Adult Arrows Crate", ("Collectable", 0x52, 0x2C, ([0x201680C, 0x2016BCC], None), 'Arrows (10)', ("Kakariko Village", "Kakariko", "Crate"))), # update crate flags to not conflict w/ child pots. These move day/night # Kak Beehives - ("Kak Open Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x08 * 2), None, 'Rupees (20)', ("Kakariko Village", "Kakariko", "Grottos", "Beehive"))), + ("Kak Open Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x08 * 2), None, 'Rupees (5)', ("Kakariko Village", "Kakariko", "Grottos", "Beehive"))), ("Kak Open Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x08 * 2 + 1), None, 'Rupees (20)', ("Kakariko Village", "Kakariko", "Grottos", "Beehive"))), # Graveyard @@ -397,20 +397,20 @@ def shop_address(shop_id, shelf_id): ("DMT GS Above Dodongos Cavern", ("GS Token", 0x0F, 0x08, None, 'Gold Skulltula Token', ("Death Mountain Trail", "Skulltulas",))), ("DMT GS Falling Rocks Path", ("GS Token", 0x0F, 0x10, None, 'Gold Skulltula Token', ("Death Mountain Trail", "Skulltulas",))), # Death Mountain Trail Freestanding - ("DMT Cow Grotto Green Rupee 1", ("Collectable", 0x3E, 0x40, ([0x026D2098], None), 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), - ("DMT Cow Grotto Green Rupee 2", ("Collectable", 0x3E, 0x41, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), - ("DMT Cow Grotto Green Rupee 3", ("Collectable", 0x3E, 0x42, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), - ("DMT Cow Grotto Green Rupee 4", ("Collectable", 0x3E, 0x43, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), - ("DMT Cow Grotto Green Rupee 5", ("Collectable", 0x3E, 0x44, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), - ("DMT Cow Grotto Green Rupee 6", ("Collectable", 0x3E, 0x45, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), + ("DMT Cow Grotto Green Rupee 1", ("Collectable", 0x3E, 0x40, ([0x026D2098], None), 'Rupee (1)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), + ("DMT Cow Grotto Green Rupee 2", ("Collectable", 0x3E, 0x41, None, 'Rupee (1)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), + ("DMT Cow Grotto Green Rupee 3", ("Collectable", 0x3E, 0x42, None, 'Rupee (1)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), + ("DMT Cow Grotto Green Rupee 4", ("Collectable", 0x3E, 0x43, None, 'Rupee (1)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), + ("DMT Cow Grotto Green Rupee 5", ("Collectable", 0x3E, 0x44, None, 'Rupee (1)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), + ("DMT Cow Grotto Green Rupee 6", ("Collectable", 0x3E, 0x45, None, 'Rupee (1)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), ("DMT Cow Grotto Red Rupee", ("Collectable", 0x3E, 0x46, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "RupeeTower"))), - ("DMT Cow Grotto Recovery Heart 1", ("Collectable", 0x3E, 0x28, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "Freestanding"))), - ("DMT Cow Grotto Recovery Heart 2", ("Collectable", 0x3E, 0x29, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "Freestanding"))), - ("DMT Cow Grotto Recovery Heart 3", ("Collectable", 0x3E, 0x2A, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "Freestanding"))), - ("DMT Cow Grotto Recovery Heart 4", ("Collectable", 0x3E, 0x2B, None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "Freestanding"))), + ("DMT Cow Grotto Recovery Heart 1", ("Collectable", 0x3E, 0x28, None, 'Recovery Heart', ("Death Mountain Trail", "Death Mountain", "Grottos", "Freestanding"))), + ("DMT Cow Grotto Recovery Heart 2", ("Collectable", 0x3E, 0x29, None, 'Recovery Heart', ("Death Mountain Trail", "Death Mountain", "Grottos", "Freestanding"))), + ("DMT Cow Grotto Recovery Heart 3", ("Collectable", 0x3E, 0x2A, None, 'Recovery Heart', ("Death Mountain Trail", "Death Mountain", "Grottos", "Freestanding"))), + ("DMT Cow Grotto Recovery Heart 4", ("Collectable", 0x3E, 0x2B, None, 'Recovery Heart', ("Death Mountain Trail", "Death Mountain", "Grottos", "Freestanding"))), # Death Mountain Trial Beehives ("DMT Cow Grotto Beehive", ("Collectable", 0x3E, 0x60 + (0x18 * 2), None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "Beehive"))), - ("DMT Storms Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x17 * 2), None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "Beehive"))), + ("DMT Storms Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x17 * 2), None, 'Rupees (5)', ("Death Mountain Trail", "Death Mountain", "Grottos", "Beehive"))), ("DMT Storms Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x17 * 2 + 1), None, 'Rupees (20)', ("Death Mountain Trail", "Death Mountain", "Grottos", "Beehive"))), # Goron City @@ -441,8 +441,8 @@ def shop_address(shop_id, shelf_id): ("GC Spinning Pot Rupee Drop 1", ("Collectable", 0x62, 0x44, None, 'Rupee (1)', ("Goron City", "RupeeTower"))), ("GC Spinning Pot Rupee Drop 2", ("Collectable", 0x62, 0x45, None, 'Rupee (1)', ("Goron City", "RupeeTower"))), ("GC Spinning Pot Rupee Drop 3", ("Collectable", 0x62, 0x46, None, 'Rupee (1)', ("Goron City", "RupeeTower"))), - ("GC Spinning Pot PoH Drop Rupee 1", ("Collectable", 0x62, 0x47, None, 'Rupee (1)', ("Goron City", "RupeeTower"))), - ("GC Spinning Pot PoH Drop Rupee 2", ("Collectable", 0x62, 0x48, None, 'Rupee (1)', ("Goron City", "RupeeTower"))), + ("GC Spinning Pot PoH Drop Rupee 1", ("Collectable", 0x62, 0x47, None, 'Rupees (20)', ("Goron City", "RupeeTower"))), + ("GC Spinning Pot PoH Drop Rupee 2", ("Collectable", 0x62, 0x48, None, 'Rupees (5)', ("Goron City", "RupeeTower"))), # Goron City Pots. Reassign some flags because Nintendo decided adult pots should share flags... ("GC Darunia Pot 1", ("Collectable", 0x62, 0x38, None, 'Deku Stick (1)', ("Goron City", "Pot"))), ("GC Darunia Pot 2", ("Collectable", 0x62, 0x39, None, 'Rupee (1)', ("Goron City", "Pot"))), @@ -469,28 +469,28 @@ def shop_address(shop_id, shelf_id): ("DMC GS Crate", ("GS Token", 0x0F, 0x80, None, 'Gold Skulltula Token', ("Death Mountain Crater", "Skulltulas"))), ("DMC GS Bean Patch", ("GS Token", 0x0F, 0x01, None, 'Gold Skulltula Token', ("Death Mountain Crater", "Skulltulas"))), # Death Mountain Crater Freestanding - ("DMC Adult Green Rupee 1", ("Collectable", 0x61, 0x40, ([0x0225E63C], None), 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), - ("DMC Adult Green Rupee 2", ("Collectable", 0x61, 0x41, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), - ("DMC Adult Green Rupee 3", ("Collectable", 0x61, 0x42, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), - ("DMC Adult Green Rupee 4", ("Collectable", 0x61, 0x43, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), - ("DMC Adult Green Rupee 5", ("Collectable", 0x61, 0x44, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), - ("DMC Adult Green Rupee 6", ("Collectable", 0x61, 0x45, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), - ("DMC Adult Red Rupee", ("Collectable", 0x61, 0x46, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), - ("DMC Child Red Rupee 1", ("Collectable", 0x61, 0x20, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain","Freestanding"))), - ("DMC Child Red Rupee 2", ("Collectable", 0x61, 0x21, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "Freestanding"))), - ("DMC Child Blue Rupee 1", ("Collectable", 0x61, 0x22, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding"))), - ("DMC Child Blue Rupee 2", ("Collectable", 0x61, 0x23, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding"))), - ("DMC Child Blue Rupee 3", ("Collectable", 0x61, 0x24, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding"))), - ("DMC Child Blue Rupee 4", ("Collectable", 0x61, 0x25, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding"))), - ("DMC Child Blue Rupee 5", ("Collectable", 0x61, 0x26, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding"))), - ("DMC Child Blue Rupee 6", ("Collectable", 0x61, 0x27, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding"))), + ("DMC Adult Green Rupee 1", ("Collectable", 0x61, 0x40,([0x0225E63C], None ), 'Rupee (1)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), + ("DMC Adult Green Rupee 2", ("Collectable", 0x61, 0x41, None, 'Rupee (1)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), + ("DMC Adult Green Rupee 3", ("Collectable", 0x61, 0x42, None, 'Rupee (1)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), + ("DMC Adult Green Rupee 4", ("Collectable", 0x61, 0x43, None, 'Rupee (1)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), + ("DMC Adult Green Rupee 5", ("Collectable", 0x61, 0x44, None, 'Rupee (1)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), + ("DMC Adult Green Rupee 6", ("Collectable", 0x61, 0x45, None, 'Rupee (1)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), + ("DMC Adult Red Rupee", ("Collectable", 0x61, 0x46, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "RupeeTower"))), + ("DMC Child Red Rupee 1", ("Collectable", 0x61, 0x20, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain","Freestanding",))), + ("DMC Child Red Rupee 2", ("Collectable", 0x61, 0x21, None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "Freestanding",))), + ("DMC Child Blue Rupee 1", ("Collectable", 0x61, 0x22, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding",))), + ("DMC Child Blue Rupee 2", ("Collectable", 0x61, 0x23, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding",))), + ("DMC Child Blue Rupee 3", ("Collectable", 0x61, 0x24, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding",))), + ("DMC Child Blue Rupee 4", ("Collectable", 0x61, 0x25, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding",))), + ("DMC Child Blue Rupee 5", ("Collectable", 0x61, 0x26, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding",))), + ("DMC Child Blue Rupee 6", ("Collectable", 0x61, 0x27, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Freestanding",))), # Death Mountain Crater Pots ("DMC Near GC Pot 1", ("Collectable", 0x61, 0x20, None, 'Recovery Heart', ("Death Mountain Crater", "Death Mountain", "Pot"))), ("DMC Near GC Pot 2", ("Collectable", 0x61, 0x21, None, 'Arrows (10)', ("Death Mountain Crater", "Death Mountain", "Pot"))), ("DMC Near GC Pot 3", ("Collectable", 0x61, 0x22, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Pot"))), ("DMC Near GC Pot 4", ("Collectable", 0x61, 0x23, None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Pot"))), # Death mountain Crater Beehives - ("DMC Upper Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x1A * 2), None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "Grottos", "Beehive"))), + ("DMC Upper Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x1A * 2), None, 'Rupees (5)', ("Death Mountain Crater", "Death Mountain", "Grottos", "Beehive"))), ("DMC Upper Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x1A * 2 + 1), None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "Grottos", "Beehive"))), ("DMC Hammer Grotto Beehive", ("Collectable", 0x3E, 0x60 + (0x19 * 2), None, 'Rupees (20)', ("Death Mountain Crater", "Death Mountain", "Grottos", "Beehive"))), @@ -518,7 +518,7 @@ def shop_address(shop_id, shelf_id): ("ZR Waterfall Red Rupee 3", ("Collectable", 0x54, 0x22, None, 'Rupees (20)', ("Zora's River", "Freestanding"))), ("ZR Waterfall Red Rupee 4", ("Collectable", 0x54, 0x23, None, 'Rupees (20)', ("Zora's River", "Freestanding"))), # Zora's River Beehives - ("ZR Open Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x09 * 2), None, 'Rupees (20)', ("Zora's River", "Grottos", "Beehive"))), + ("ZR Open Grotto Beehive 1", ("Collectable", 0x3E, 0x60 + (0x09 * 2), None, 'Rupees (5)', ("Zora's River", "Grottos", "Beehive"))), ("ZR Open Grotto Beehive 2", ("Collectable", 0x3E, 0x60 + (0x09 * 2 + 1), None, 'Rupees (20)', ("Zora's River", "Grottos", "Beehive"))), ("ZR Storms Grotto Beehive", ("Collectable", 0x3E, 0x60 + (0x0B * 2), None, 'Rupees (20)', ("Zora's River", "Grottos", "Beehive"))), @@ -537,10 +537,10 @@ def shop_address(shop_id, shelf_id): ("ZD Shop Item 8", ("Shop", 0x2F, 0x37, (shop_address(7, 7), None), 'Buy Red Potion for 50 Rupees', ("Zora's Domain", "Shops"))), # Zora's Domain Pots ("ZD Pot 1", ("Collectable", 0x58, 0x24, None, 'Deku Stick (1)', ("Zora's Domain", "Pot"))), - ("ZD Pot 2", ("Collectable", 0x58, 0x23, None, 'Deku Stick (1)', ("Zora's Domain", "Pot"))), - ("ZD Pot 3", ("Collectable", 0x58, 0x22, None, 'Deku Stick (1)', ("Zora's Domain", "Pot"))), - ("ZD Pot 4", ("Collectable", 0x58, 0x21, None, 'Deku Stick (1)', ("Zora's Domain", "Pot"))), - ("ZD Pot 5", ("Collectable", 0x58, 0x20, None, 'Deku Stick (1)', ("Zora's Domain", "Pot"))), + ("ZD Pot 2", ("Collectable", 0x58, 0x23, None, 'Deku Nuts (5)', ("Zora's Domain", "Pot"))), + ("ZD Pot 3", ("Collectable", 0x58, 0x22, None, 'Recovery Heart', ("Zora's Domain", "Pot"))), + ("ZD Pot 4", ("Collectable", 0x58, 0x21, None, 'Recovery Heart', ("Zora's Domain", "Pot"))), + ("ZD Pot 5", ("Collectable", 0x58, 0x20, None, 'Rupees (5)', ("Zora's Domain", "Pot"))), # Zora's Domain Beehives ("ZD In Front of King Zora Beehive 1", ("Collectable", 0x58, 0x40, ([0x20FC0F8], None), 'Rupees (20)', ("Zora's Domain", "Beehive"))), ("ZD In Front of King Zora Beehive 2", ("Collectable", 0x58, 0x41, ([0x20FC108], None), 'Rupees (20)', ("Zora's Domain", "Beehive"))), @@ -575,11 +575,11 @@ def shop_address(shop_id, shelf_id): # Zora's Fountain Pots ("ZF Hidden Cave Pot 1", ("Collectable", 0x59, 0x3F, ([0x2122624], None), 'Rupees (5)', ("Zora's Fountain", "Pot"))), ("ZF Hidden Cave Pot 2", ("Collectable", 0x59, 0x3C, None, 'Rupees (5)', ("Zora's Fountain", "Pot"))), - ("ZF Hidden Cave Pot 3", ("Collectable", 0x59, 0x3E, ([0x2122644], None), 'Rupees (5)', ("Zora's Fountain", "Pot"))), - ("ZF Near Jabu Pot 1", ("Collectable", 0x59, 0x38, None, 'Rupees (5)', ("Zora's Fountain", "Pot"))), - ("ZF Near Jabu Pot 2", ("Collectable", 0x59, 0x39, None, 'Rupees (5)', ("Zora's Fountain", "Pot"))), - ("ZF Near Jabu Pot 3", ("Collectable", 0x59, 0x3B, None, 'Rupees (5)', ("Zora's Fountain", "Pot"))), - ("ZF Near Jabu Pot 4", ("Collectable", 0x59, 0x3D, None, 'Rupees (5)', ("Zora's Fountain", "Pot"))), + ("ZF Hidden Cave Pot 3", ("Collectable", 0x59, 0x3E, ([0x2122644], None), 'Arrows (10)', ("Zora's Fountain", "Pot"))), + ("ZF Near Jabu Pot 1", ("Collectable", 0x59, 0x38, None, 'Rupee (1)', ("Zora's Fountain", "Pot"))), + ("ZF Near Jabu Pot 2", ("Collectable", 0x59, 0x39, None, 'Rupee (1)', ("Zora's Fountain", "Pot"))), + ("ZF Near Jabu Pot 3", ("Collectable", 0x59, 0x3B, None, 'Rupee (1)', ("Zora's Fountain", "Pot"))), + ("ZF Near Jabu Pot 4", ("Collectable", 0x59, 0x3D, None, 'Recovery Heart', ("Zora's Fountain", "Pot"))), # Lake Hylia ("LH Underwater Item", ("NPC", 0x57, 0x15, None, 'Rutos Letter', ("Lake Hylia"))), @@ -619,13 +619,13 @@ def shop_address(shop_id, shelf_id): ("GV GS Pillar", ("GS Token", 0x13, 0x04, None, 'Gold Skulltula Token', ("Gerudo Valley", "Skulltulas"))), # Gerudo Valley Freestanding ("GV Octorok Grotto Red Rupee", ("Collectable", 0x3E, 0x3F, None, 'Rupees (20)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), - ("GV Octorok Grotto Blue Rupee 1", ("Collectable", 0x3E, 0x38, None, 'Rupees (20)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), - ("GV Octorok Grotto Blue Rupee 2", ("Collectable", 0x3E, 0x39, None, 'Rupees (20)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), - ("GV Octorok Grotto Blue Rupee 3", ("Collectable", 0x3E, 0x3A, None, 'Rupees (20)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), - ("GV Octorok Grotto Green Rupee 1", ("Collectable", 0x3E, 0x3B, None, 'Rupees (20)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), - ("GV Octorok Grotto Green Rupee 2", ("Collectable", 0x3E, 0x3C, None, 'Rupees (20)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), - ("GV Octorok Grotto Green Rupee 3", ("Collectable", 0x3E, 0x3D, None, 'Rupees (20)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), - ("GV Octorok Grotto Green Rupee 4", ("Collectable", 0x3E, 0x3E, None, 'Rupees (20)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), + ("GV Octorok Grotto Blue Rupee 1", ("Collectable", 0x3E, 0x38, None, 'Rupees (5)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), + ("GV Octorok Grotto Blue Rupee 2", ("Collectable", 0x3E, 0x39, None, 'Rupees (5)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), + ("GV Octorok Grotto Blue Rupee 3", ("Collectable", 0x3E, 0x3A, None, 'Rupees (5)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), + ("GV Octorok Grotto Green Rupee 1", ("Collectable", 0x3E, 0x3B, None, 'Rupee (1)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), + ("GV Octorok Grotto Green Rupee 2", ("Collectable", 0x3E, 0x3C, None, 'Rupee (1)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), + ("GV Octorok Grotto Green Rupee 3", ("Collectable", 0x3E, 0x3D, None, 'Rupee (1)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), + ("GV Octorok Grotto Green Rupee 4", ("Collectable", 0x3E, 0x3E, None, 'Rupee (1)', ("Gerudo Valley", "Gerudo", "Grottos", "Freestanding"))), # Gerudo Valley Pots/Crates ("GV Crate Near Cow", ("Collectable", 0x5A, 0x40, ([0x213D2CC], None), 'Rupee (1)', ("Gerudo Valley", "Gerudo", "Crate"))), ("GV Freestanding PoH Crate", ("Collectable", 0x5A, 0x41, ([0x213D2DC, 0x213d548], None), 'Rupee (1)', ("Gerudo Valley", "Gerudo", "Crate"))), @@ -648,18 +648,18 @@ def shop_address(shop_id, shelf_id): ("Hideout 4 Torches Jail Gerudo Key", ("Collectable", 0x0C, 0x0E, None, 'Small Key (Thieves Hideout)', ("Thieves' Hideout", "Gerudo", "Drop"))), ("Hideout Gerudo Membership Card", ("NPC", 0x0C, 0x3A, None, 'Gerudo Membership Card', ("Thieves' Hideout", "Gerudo"))), # Thieves' Hideout Pots/Crates - ("Hideout Break Room Pot 1", ("Collectable", 0x0C, 0x2A, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), - ("Hideout Break Room Pot 2", ("Collectable", 0x0C, 0x2B, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), + ("Hideout Break Room Pot 1", ("Collectable", 0x0C, 0x2A, None, 'Arrows (10)', ("Thieves' Hideout", "Gerudo", "Pot"))), + ("Hideout Break Room Pot 2", ("Collectable", 0x0C, 0x2B, None, 'Rupees (5)', ("Thieves' Hideout", "Gerudo", "Pot"))), ("Hideout 1 Torch Jail Pot 1", ("Collectable", 0x0C, 0x20, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), - ("Hideout 1 Torch Jail Pot 2", ("Collectable", 0x0C, 0x21, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), - ("Hideout 1 Torch Jail Pot 3", ("Collectable", 0x0C, 0x22, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), - ("Hideout Kitchen Pot 1", ("Collectable", 0x0C, 0x23, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), + ("Hideout 1 Torch Jail Pot 2", ("Collectable", 0x0C, 0x21, None, 'Arrows (10)', ("Thieves' Hideout", "Gerudo", "Pot"))), + ("Hideout 1 Torch Jail Pot 3", ("Collectable", 0x0C, 0x22, None, 'Rupees (20)', ("Thieves' Hideout", "Gerudo", "Pot"))), + ("Hideout Kitchen Pot 1", ("Collectable", 0x0C, 0x23, None, 'Arrows (10)', ("Thieves' Hideout", "Gerudo", "Pot"))), ("Hideout Kitchen Pot 2", ("Collectable", 0x0C, 0x24, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), - ("Hideout 4 Torch Jail Pot 1", ("Collectable", 0x0C, 0x25, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), + ("Hideout 4 Torch Jail Pot 1", ("Collectable", 0x0C, 0x25, None, 'Rupees (5)', ("Thieves' Hideout", "Gerudo", "Pot"))), ("Hideout 4 Torch Jail Pot 2", ("Collectable", 0x0C, 0x26, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), ("Hideout 2 Torch Jail Pot 1", ("Collectable", 0x0C, 0x27, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), - ("Hideout 2 Torch Jail Pot 2", ("Collectable", 0x0C, 0x28, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), - ("Hideout 2 Torch Jail Pot 3", ("Collectable", 0x0C, 0x29, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), + ("Hideout 2 Torch Jail Pot 2", ("Collectable", 0x0C, 0x28, None, 'Rupees (5)', ("Thieves' Hideout", "Gerudo", "Pot"))), + ("Hideout 2 Torch Jail Pot 3", ("Collectable", 0x0C, 0x29, None, 'Rupees (20)', ("Thieves' Hideout", "Gerudo", "Pot"))), ("Hideout 2 Torch Jail In Cell Pot 1", ("Collectable", 0x0C, 0x2C, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), ("Hideout 2 Torch Jail In Cell Pot 2", ("Collectable", 0x0C, 0x2D, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), ("Hideout 2 Torch Jail In Cell Pot 3", ("Collectable", 0x0C, 0x2E, None, 'Recovery Heart', ("Thieves' Hideout", "Gerudo", "Pot"))), @@ -1047,25 +1047,25 @@ def shop_address(shop_id, shelf_id): ("Forest Temple Well Recovery Heart 1", ("Collectable", 0x03, 0x2F, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Freestanding"))), ("Forest Temple Well Recovery Heart 2", ("Collectable", 0x03, 0x30, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Freestanding"))), # Forest Temple Vanilla Pots - ("Forest Temple Center Room Right Pot 1", ("Collectable", 0x03, 0x24, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Center Room Right Pot 2", ("Collectable", 0x03, 0x20, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Center Room Right Pot 3", ("Collectable", 0x03, 0x22, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Center Room Left Pot 1", ("Collectable", 0x03, 0x25, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Center Room Left Pot 2", ("Collectable", 0x03, 0x21, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Center Room Left Pot 3", ("Collectable", 0x03, 0x23, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Lower Stalfos Pot", ("Collectable", 0x03, 0x31, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Center Room Right Pot 1", ("Collectable", 0x03, 0x24, None, 'Arrows (10)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Center Room Right Pot 2", ("Collectable", 0x03, 0x20, None, 'Rupees (5)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Center Room Right Pot 3", ("Collectable", 0x03, 0x22, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Center Room Left Pot 1", ("Collectable", 0x03, 0x25, None, 'Arrows (10)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Center Room Left Pot 2", ("Collectable", 0x03, 0x21, None, 'Rupees (5)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Center Room Left Pot 3", ("Collectable", 0x03, 0x23, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Lower Stalfos Pot", ("Collectable", 0x03, 0x31, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), #("Forest Temple Lower Stalfos Pot 2", ("Collectable", 0x03, 0x32, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Upper Stalfos Pot 1", ("Collectable", 0x03, 0x33, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Upper Stalfos Pot 2", ("Collectable", 0x03, 0x34, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Upper Stalfos Pot 3", ("Collectable", 0x03, 0x35, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Upper Stalfos Pot 4", ("Collectable", 0x03, 0x36, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Blue Poe Room Pot 1", ("Collectable", 0x03, 0x26, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Blue Poe Room Pot 2", ("Collectable", 0x03, 0x27, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Blue Poe Room Pot 3", ("Collectable", 0x03, 0x28, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Frozen Eye Switch Room Pot 1", ("Collectable", 0x03, 0x29, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Frozen Eye Switch Room Pot 2", ("Collectable", 0x03, 0x2A, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Green Poe Room Pot 1", ("Collectable", 0x03, 0x2B, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), - ("Forest Temple Green Poe Room Pot 2", ("Collectable", 0x03, 0x2C, None, 'Rupees (20)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Upper Stalfos Pot 1", ("Collectable", 0x03, 0x33, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Upper Stalfos Pot 2", ("Collectable", 0x03, 0x34, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Upper Stalfos Pot 3", ("Collectable", 0x03, 0x35, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Upper Stalfos Pot 4", ("Collectable", 0x03, 0x36, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Blue Poe Room Pot 1", ("Collectable", 0x03, 0x26, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Blue Poe Room Pot 2", ("Collectable", 0x03, 0x27, None, 'Arrows (10)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Blue Poe Room Pot 3", ("Collectable", 0x03, 0x28, None, 'Arrows (10)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Frozen Eye Switch Room Pot 1", ("Collectable", 0x03, 0x29, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Frozen Eye Switch Room Pot 2", ("Collectable", 0x03, 0x2A, None, 'Arrows (10)', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Green Poe Room Pot 1", ("Collectable", 0x03, 0x2B, None, 'Recovery Heart', ("Forest Temple", "Vanilla", "Pot"))), + ("Forest Temple Green Poe Room Pot 2", ("Collectable", 0x03, 0x2C, None, 'Arrows (10)', ("Forest Temple", "Vanilla", "Pot"))), # Forest Temple MQ ("Forest Temple MQ First Room Chest", ("Chest", 0x03, 0x03, None, 'Small Key (Forest Temple)', ("Forest Temple", "Master Quest"))), @@ -1276,23 +1276,23 @@ def shop_address(shop_id, shelf_id): # Water Temple Vanilla Pots ("Water Temple Main Room L2 Pot 1", ("Collectable", 0x05, 0x22, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), ("Water Temple Main Room L2 Pot 2", ("Collectable", 0x05, 0x23, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple Behind Gate Pot 1", ("Collectable", 0x05, 0x21, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple Behind Gate Pot 2", ("Collectable", 0x05, 0x24, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple Behind Gate Pot 3", ("Collectable", 0x05, 0x29, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple Behind Gate Pot 4", ("Collectable", 0x05, 0x35, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple Behind Gate Pot 1", ("Collectable", 0x05, 0x21, None, 'Bombs (5)', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple Behind Gate Pot 2", ("Collectable", 0x05, 0x24, None, 'Bombs (5)', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple Behind Gate Pot 3", ("Collectable", 0x05, 0x29, None, 'Arrows (10)', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple Behind Gate Pot 4", ("Collectable", 0x05, 0x35, None, 'Arrows (10)', ("Water Temple", "Vanilla", "Pot"))), ("Water Temple Near Compass Pot 1", ("Collectable", 0x05, 0x20, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), ("Water Temple Near Compass Pot 2", ("Collectable", 0x05, 0x27, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), ("Water Temple Near Compass Pot 3", ("Collectable", 0x05, 0x28, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple Like Like Pot 1", ("Collectable", 0x05, 0x2B, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple Like Like Pot 2", ("Collectable", 0x05, 0x2C, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple North Basement Block Puzzle Pot 1", ("Collectable", 0x05, 0x3B, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple North Basement Block Puzzle Pot 2", ("Collectable", 0x05, 0x3C, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - #("Water Temple Boss Key Pot 1", ("Collectable", 0x05, 0x3D, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - #("Water Temple Boss Key Pot 2", ("Collectable", 0x05, 0x3E, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple L1 Torch Pot 1", ("Collectable", 0x05, 0x25, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple L1 Torch Pot 2", ("Collectable", 0x05, 0x26, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - ("Water Temple River Pot 1", ("Collectable", 0x05, 0x2F, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), - #("Water Temple River Pot 2", ("Collectable", 0x05, 0x26, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple Like Like Pot 1", ("Collectable", 0x05, 0x2B, None, 'Rupees (5)', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple Like Like Pot 2", ("Collectable", 0x05, 0x2C, None, 'Rupees (5)', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple North Basement Block Puzzle Pot 1", ("Collectable", 0x05, 0x3B, None, 'Bombs (5)', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple North Basement Block Puzzle Pot 2", ("Collectable", 0x05, 0x3C, None, 'Bombs (5)', ("Water Temple", "Vanilla", "Pot"))), + #("Water Temple Boss Key Pot 1", ("Collectable", 0x05, 0x3D, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), + #("Water Temple Boss Key Pot 2", ("Collectable", 0x05, 0x3E, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple L1 Torch Pot 1", ("Collectable", 0x05, 0x25, None, 'Arrows (10)', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple L1 Torch Pot 2", ("Collectable", 0x05, 0x26, None, 'Arrows (10)', ("Water Temple", "Vanilla", "Pot"))), + ("Water Temple River Pot 1", ("Collectable", 0x05, 0x2F, None, 'Arrows (10)', ("Water Temple", "Vanilla", "Pot"))), + #("Water Temple River Pot 2", ("Collectable", 0x05, 0x26, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), ("Water Temple Central Bow Target Pot 1", ("Collectable", 0x05, 0x37, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), ("Water Temple Central Bow Target Pot 2", ("Collectable", 0x05, 0x3F, None, 'Recovery Heart', ("Water Temple", "Vanilla", "Pot"))), @@ -1461,15 +1461,15 @@ def shop_address(shop_id, shelf_id): ("Shadow Temple After Boat Upper Recovery Heart 1", ("Collectable", 0x07, 0x39, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Freestanding"))), ("Shadow Temple After Boat Upper Recovery Heart 2", ("Collectable", 0x07, 0x3A, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Freestanding"))), ("Shadow Temple After Boat Lower Recovery Heart", ("Collectable", 0x07, 0x3C, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Freestanding"))), - ("Shadow Temple 3 Spinning Pots Rupee 1", ("Collectable", 0x07, 0x40, ([0x280D0D4, 0x280D0E4, 0x280D0F4], None), 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple 3 Spinning Pots Rupee 1", ("Collectable", 0x07, 0x40, ([0x280D0D4, 0x280D0E4, 0x280D0F4], None), 'Rupee (1)', ("Shadow Temple", "Vanilla", "RupeeTower"))), ("Shadow Temple 3 Spinning Pots Rupee 2", ("Collectable", 0x07, 0x41, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple 3 Spinning Pots Rupee 3", ("Collectable", 0x07, 0x42, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple 3 Spinning Pots Rupee 4", ("Collectable", 0x07, 0x43, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple 3 Spinning Pots Rupee 3", ("Collectable", 0x07, 0x42, None, 'Rupees (20)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple 3 Spinning Pots Rupee 4", ("Collectable", 0x07, 0x43, None, 'Rupee (1)', ("Shadow Temple", "Vanilla", "RupeeTower"))), ("Shadow Temple 3 Spinning Pots Rupee 5", ("Collectable", 0x07, 0x44, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple 3 Spinning Pots Rupee 6", ("Collectable", 0x07, 0x45, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple 3 Spinning Pots Rupee 7", ("Collectable", 0x07, 0x46, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple 3 Spinning Pots Rupee 6", ("Collectable", 0x07, 0x45, None, 'Rupees (20)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple 3 Spinning Pots Rupee 7", ("Collectable", 0x07, 0x46, None, 'Rupee (1)', ("Shadow Temple", "Vanilla", "RupeeTower"))), ("Shadow Temple 3 Spinning Pots Rupee 8", ("Collectable", 0x07, 0x47, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple 3 Spinning Pots Rupee 9", ("Collectable", 0x07, 0x48, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple 3 Spinning Pots Rupee 9", ("Collectable", 0x07, 0x48, None, 'Rupees (20)', ("Shadow Temple", "Vanilla", "RupeeTower"))), #Shadow Temple Vanilla Pots ("Shadow Temple Whispering Walls Near Dead Hand Pot", ("Collectable", 0x07, 0x28, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple Whispering Walls Left Pot 1", ("Collectable", 0x07, 0x29, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "Pot"))), @@ -1478,22 +1478,22 @@ def shop_address(shop_id, shelf_id): ("Shadow Temple Whispering Walls Front Pot 1", ("Collectable", 0x07, 0x30, None, 'Deku Nuts (5)', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple Whispering Walls Front Pot 2", ("Collectable", 0x07, 0x31, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple Map Chest Room Pot 1", ("Collectable", 0x07, 0x27, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), - ("Shadow Temple Map Chest Room Pot 2", ("Collectable", 0x07, 0x2C, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), - ("Shadow Temple Falling Spikes Lower Pot 2", ("Collectable", 0x07, 0x25, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple Map Chest Room Pot 2", ("Collectable", 0x07, 0x2C, None, 'Arrows (10)', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple Falling Spikes Lower Pot 2", ("Collectable", 0x07, 0x25, None, 'Bombs (5)', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple Falling Spikes Lower Pot 1", ("Collectable", 0x07, 0x24, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple Falling Spikes Upper Pot 1", ("Collectable", 0x07, 0x2B, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple Falling Spikes Upper Pot 2", ("Collectable", 0x07, 0x2D, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), - ("Shadow Temple Spike Walls Pot", ("Collectable", 0x07, 0x26, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple Spike Walls Pot", ("Collectable", 0x07, 0x26, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple Invisible Floormaster Pot 1", ("Collectable", 0x07, 0x33, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), - ("Shadow Temple Invisible Floormaster Pot 2", ("Collectable", 0x07, 0x34, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), - ("Shadow Temple After Wind Pot 1", ("Collectable", 0x07, 0x2E, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), - ("Shadow Temple After Wind Pot 2", ("Collectable", 0x07, 0x32, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple Invisible Floormaster Pot 2", ("Collectable", 0x07, 0x34, None, 'Arrows (30)', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple After Wind Pot 1", ("Collectable", 0x07, 0x2E, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple After Wind Pot 2", ("Collectable", 0x07, 0x32, None, 'Deku Nuts (5)', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple After Wind Flying Pot 1", ("Collectable", 0x07, 0x36, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "FlyingPot"))), ("Shadow Temple After Wind Flying Pot 2", ("Collectable", 0x07, 0x37, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "FlyingPot"))), - ("Shadow Temple After Boat Pot", ("Collectable", 0x07, 0x38, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple After Boat Pot", ("Collectable", 0x07, 0x38, None, 'Arrows (10)', ("Shadow Temple", "Vanilla", "Pot"))), #("Shadow Temple After Boat Pot 2" ("Collectable", 0x07, 0x3B, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), - ("Shadow Temple Near Boss Pot 1", ("Collectable", 0x07, 0x3D, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), - ("Shadow Temple Near Boss Pot 2", ("Collectable", 0x07, 0x3E, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple Near Boss Pot 1", ("Collectable", 0x07, 0x3D, None, 'Arrows (30)', ("Shadow Temple", "Vanilla", "Pot"))), + ("Shadow Temple Near Boss Pot 2", ("Collectable", 0x07, 0x3E, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "Pot"))), ("Shadow Temple Whispering Walls Flying Pot", ("Collectable", 0x07, 0x35, None, 'Recovery Heart', ("Shadow Temple", "Vanilla", "FlyingPot"))), # Shadow Temple MQ @@ -1530,15 +1530,15 @@ def shop_address(shop_id, shelf_id): ("Shadow Temple MQ After Boat Upper Recovery Heart 1", ("Collectable", 0x07, 0x39, None, 'Recovery Heart', ("Shadow Temple", "Master Quest", "Freestanding"))), ("Shadow Temple MQ After Boat Upper Recovery Heart 2", ("Collectable", 0x07, 0x3A, None, 'Recovery Heart', ("Shadow Temple", "Master Quest", "Freestanding"))), ("Shadow Temple MQ After Boat Lower Recovery Heart", ("Collectable", 0x07, 0x3C, None, 'Recovery Heart', ("Shadow Temple", "Master Quest", "Freestanding"))), - ("Shadow Temple MQ 3 Spinning Pots Rupee 1", ("Collectable", 0x07, 0x40, ([0x28127b8, 0x28127c8, 0x28127d8], None), 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple MQ 3 Spinning Pots Rupee 1", ("Collectable", 0x07, 0x40, ([0x28127b8, 0x28127c8, 0x28127d8], None), 'Rupee (1)', ("Shadow Temple", "Vanilla", "RupeeTower"))), ("Shadow Temple MQ 3 Spinning Pots Rupee 2", ("Collectable", 0x07, 0x41, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple MQ 3 Spinning Pots Rupee 3", ("Collectable", 0x07, 0x42, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple MQ 3 Spinning Pots Rupee 4", ("Collectable", 0x07, 0x43, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple MQ 3 Spinning Pots Rupee 3", ("Collectable", 0x07, 0x42, None, 'Rupees (20)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple MQ 3 Spinning Pots Rupee 4", ("Collectable", 0x07, 0x43, None, 'Rupee (1)', ("Shadow Temple", "Vanilla", "RupeeTower"))), ("Shadow Temple MQ 3 Spinning Pots Rupee 5", ("Collectable", 0x07, 0x44, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple MQ 3 Spinning Pots Rupee 6", ("Collectable", 0x07, 0x45, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple MQ 3 Spinning Pots Rupee 7", ("Collectable", 0x07, 0x46, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple MQ 3 Spinning Pots Rupee 6", ("Collectable", 0x07, 0x45, None, 'Rupees (20)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple MQ 3 Spinning Pots Rupee 7", ("Collectable", 0x07, 0x46, None, 'Rupee (1)', ("Shadow Temple", "Vanilla", "RupeeTower"))), ("Shadow Temple MQ 3 Spinning Pots Rupee 8", ("Collectable", 0x07, 0x47, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), - ("Shadow Temple MQ 3 Spinning Pots Rupee 9", ("Collectable", 0x07, 0x48, None, 'Rupees (5)', ("Shadow Temple", "Vanilla", "RupeeTower"))), + ("Shadow Temple MQ 3 Spinning Pots Rupee 9", ("Collectable", 0x07, 0x48, None, 'Rupees (20)', ("Shadow Temple", "Vanilla", "RupeeTower"))), # Shadow Temple MQ Pots/Crates ("Shadow Temple MQ Whispering Walls Pot 1", ("Collectable", 0x07, 0x28, ([0x27cb110], None), 'Recovery Heart', ("Shadow Temple", "Master Quest", "Pot"))), ("Shadow Temple MQ Whispering Walls Pot 2", ("Collectable", 0x07, 0x39, None, 'Recovery Heart', ("Shadow Temple", "Master Quest", "Pot"))), @@ -1636,26 +1636,26 @@ def shop_address(shop_id, shelf_id): # Spirit Temple Vanilla Pots/Crates ("Spirit Temple Lobby Pot 1", ("Collectable", 0x06, 0x21, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - ("Spirit Temple Lobby Pot 2", ("Collectable", 0x06, 0x22, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - ("Spirit Temple Child Climb Pot", ("Collectable", 0x06, 0x23, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - #("Spirit Temple Statue Room Pot 1", ("Collectable", 0x06, 0x24, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - #("Spirit Temple Statue Room Pot 2", ("Collectable", 0x06, 0x25, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - #("Spirit Temple Statue Room Pot 3", ("Collectable", 0x06, 0x26, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - #("Spirit Temple Statue Room Pot 4", ("Collectable", 0x06, 0x27, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - #("Spirit Temple Statue Room Pot 5", ("Collectable", 0x06, 0x28, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - #("Spirit Temple Statue Room Pot 6", ("Collectable", 0x06, 0x29, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), + ("Spirit Temple Lobby Pot 2", ("Collectable", 0x06, 0x22, None, 'Rupees (5)', ("Spirit Temple", "Vanilla", "Pot"))), + ("Spirit Temple Child Climb Pot", ("Collectable", 0x06, 0x23, None, 'Deku Seeds (30)', ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Statue Room Pot 1", ("Collectable", 0x06, 0x24, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Statue Room Pot 2", ("Collectable", 0x06, 0x25, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Statue Room Pot 3", ("Collectable", 0x06, 0x26, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Statue Room Pot 4", ("Collectable", 0x06, 0x27, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Statue Room Pot 5", ("Collectable", 0x06, 0x28, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Statue Room Pot 6", ("Collectable", 0x06, 0x29, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), ("Spirit Temple Hall After Sun Block Room Pot 1", ("Collectable", 0x06, 0x2A, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), ("Spirit Temple Hall After Sun Block Room Pot 2", ("Collectable", 0x06, 0x2B, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - ("Spirit Temple Beamos Hall Pot", ("Collectable", 0x06, 0x2C, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), + ("Spirit Temple Beamos Hall Pot", ("Collectable", 0x06, 0x2C, None, 'Bombs (5)', ("Spirit Temple", "Vanilla", "Pot"))), ("Spirit Temple Child Anubis Pot", ("Collectable", 0x06, 0x2F, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), ("Spirit Temple Lobby Flying Pot 1", ("Collectable", 0x06, 0x31, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "FlyingPot"))), ("Spirit Temple Lobby Flying Pot 2", ("Collectable", 0x06, 0x32, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "FlyingPot"))), ("Spirit Temple Child Bridge Flying Pot", ("Collectable", 0x06, 0x34, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "FlyingPot"))), ("Spirit Temple Before Child Climb Small Wooden Crate 1", ("Collectable", 0x06, 0x3F, ([0x2B090E0], None), 'Deku Nuts (5)', ("Spirit Temple", "Vanilla", "SmallCrate"))), # Overwrite original flag 0x2C because it conflicts w/ Beamos hall pot ("Spirit Temple Before Child Climb Small Wooden Crate 2", ("Collectable", 0x06, 0x2E, None, 'Bombs (5)', ("Spirit Temple", "Vanilla", "SmallCrate"))), - #("Spirit Temple Child Anubis Pot", ("Collectable", 0x07, 0x2F, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - #("Spirit Temple Child Anubis Pot", ("Collectable", 0x07, 0x2F, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), - #("Spirit Temple Child Anubis Pot", ("Collectable", 0x07, 0x2F, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Child Anubis Pot", ("Collectable", 0x07, 0x2F, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Child Anubis Pot", ("Collectable", 0x07, 0x2F, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), + #("Spirit Temple Child Anubis Pot", ("Collectable", 0x07, 0x2F, None, 'Recovery Heart' ("Spirit Temple", "Vanilla", "Pot"))), ("Spirit Temple Central Chamber Flying Pot 1", ("Collectable", 0x06, 0x35, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "FlyingPot"))), ("Spirit Temple Central Chamber Flying Pot 2", ("Collectable", 0x06, 0x36, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "FlyingPot"))), ("Spirit Temple Adult Climb Flying Pot 1", ("Collectable", 0x06, 0x37, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "FlyingPot"))), @@ -1727,12 +1727,12 @@ def shop_address(shop_id, shelf_id): # Ice Cavern Vanilla Pots ("Ice Cavern Hall Pot 1", ("Collectable", 0x09, 0x25, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))), ("Ice Cavern Hall Pot 2", ("Collectable", 0x09, 0x26, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))), - ("Ice Cavern Spinning Blade Pot 1", ("Collectable", 0x09, 0x27, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))), - ("Ice Cavern Spinning Blade Pot 2", ("Collectable", 0x09, 0x28, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))), + ("Ice Cavern Spinning Blade Pot 1", ("Collectable", 0x09, 0x27, None, 'Arrows (10)', ("Ice Cavern", "Vanilla", "Pot"))), + ("Ice Cavern Spinning Blade Pot 2", ("Collectable", 0x09, 0x28, None, 'Rupees (5)', ("Ice Cavern", "Vanilla", "Pot"))), ("Ice Cavern Spinning Blade Pot 3", ("Collectable", 0x09, 0x29, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))), ("Ice Cavern Near End Pot 1", ("Collectable", 0x09, 0x2A, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))), ("Ice Cavern Near End Pot 2", ("Collectable", 0x09, 0x2B, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))), - ("Ice Cavern Frozen Pot", ("Collectable", 0x09, 0x2D, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))), + ("Ice Cavern Frozen Pot", ("Collectable", 0x09, 0x2D, None, 'Rupees (50)', ("Ice Cavern", "Vanilla", "Pot"))), ("Ice Cavern Spinning Blade Flying Pot", ("Collectable", 0x09, 0x2C, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "FlyingPot"))), # Ice Cavern MQ @@ -1836,20 +1836,20 @@ def shop_address(shop_id, shelf_id): ("Ganons Castle Spirit Trial Recovery Heart", ("Collectable", 0x0D, 0x26, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Freestanding"))), # Ganons Castle Vanilla Pots ("Ganons Castle Water Trial Pot 1", ("Collectable", 0x0D, 0x39, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Water Trial Pot 2", ("Collectable", 0x0D, 0x3A, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Water Trial Pot 2", ("Collectable", 0x0D, 0x3A, None, 'Rupees (5)', ("Ganon's Castle", "Vanilla", "Pot"))), ("Ganons Castle Forest Trial Pot 1", ("Collectable", 0x0D, 0x35, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Forest Trial Pot 2", ("Collectable", 0x0D, 0x36, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Light Trial Boulder Pot", ("Collectable", 0x0D, 0x25, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Forest Trial Pot 2", ("Collectable", 0x0D, 0x36, None, 'Rupees (5)', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Light Trial Boulder Pot", ("Collectable", 0x0D, 0x25, None, 'Arrows (30)', ("Ganon's Castle", "Vanilla", "Pot"))), ("Ganons Castle Light Trial Pot 1", ("Collectable", 0x0D, 0x3B, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Light Trial Pot 2", ("Collectable", 0x0D, 0x3C, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Shadow Trial Like Like Pot 1", ("Collectable", 0x0D, 0x2D, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Shadow Trial Like Like Pot 2", ("Collectable", 0x0D, 0x2F, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Light Trial Pot 2", ("Collectable", 0x0D, 0x3C, None, 'Rupees (5)', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Shadow Trial Like Like Pot 1", ("Collectable", 0x0D, 0x2D, None, 'Arrows (10)', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Shadow Trial Like Like Pot 2", ("Collectable", 0x0D, 0x2F, None, 'Rupees (5)', ("Ganon's Castle", "Vanilla", "Pot"))), ("Ganons Castle Shadow Trial Pot 1", ("Collectable", 0x0D, 0x31, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Shadow Trial Pot 2", ("Collectable", 0x0D, 0x32, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Fire Trial Pot 1", ("Collectable", 0x0D, 0x30, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Fire Trial Pot 2", ("Collectable", 0x0D, 0x37, ([0x325409C], None), 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Spirit Trial Pot 1", ("Collectable", 0x0D, 0x33, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), - ("Ganons Castle Spirit Trial Pot 2", ("Collectable", 0x0D, 0x34, None, 'Recovery Heart', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Shadow Trial Pot 2", ("Collectable", 0x0D, 0x32, None, 'Arrows (10)', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Fire Trial Pot 1", ("Collectable", 0x0D, 0x30, None, 'Rupees (5)', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Fire Trial Pot 2", ("Collectable", 0x0D, 0x37, ([0x325409C], None), 'Rupees (5)', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Spirit Trial Pot 1", ("Collectable", 0x0D, 0x33, None, 'Deku Nuts (5)', ("Ganon's Castle", "Vanilla", "Pot"))), + ("Ganons Castle Spirit Trial Pot 2", ("Collectable", 0x0D, 0x34, None, 'Rupees (5)', ("Ganon's Castle", "Vanilla", "Pot"))), # Ganon's Castle MQ ("Ganons Castle MQ Forest Trial Freestanding Key", ("Collectable", 0x0D, 0x01, None, 'Small Key (Ganons Castle)', ("Ganon's Castle", "Master Quest"))), @@ -1892,20 +1892,20 @@ def shop_address(shop_id, shelf_id): ("Ganons Tower Boss Key Chest", ("Chest", 0x0A, 0x0B, None, 'Boss Key (Ganons Castle)', ("Ganon's Castle", "Vanilla", "Master Quest"))), # Ganon's Tower Pots - ("Ganons Tower Pot 1", ("Collectable", 0x19, 0x20, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 1", ("Collectable", 0x19, 0x20, None, 'Rupees (5)', ("Ganon's Tower", "Pot"))), ("Ganons Tower Pot 2", ("Collectable", 0x19, 0x21, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 3", ("Collectable", 0x19, 0x25, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 4", ("Collectable", 0x19, 0x22, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 5", ("Collectable", 0x19, 0x26, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 3", ("Collectable", 0x19, 0x25, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 4", ("Collectable", 0x19, 0x22, None, 'Rupees (5)', ("Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 5", ("Collectable", 0x19, 0x26, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))), ("Ganons Tower Pot 6", ("Collectable", 0x19, 0x27, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 7", ("Collectable", 0x19, 0x23, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 7", ("Collectable", 0x19, 0x23, None, 'Rupees (5)', ("Ganon's Tower", "Pot"))), ("Ganons Tower Pot 8", ("Collectable", 0x19, 0x24, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 9", ("Collectable", 0x19, 0x2A, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 10", ("Collectable", 0x19, 0x2B, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 9", ("Collectable", 0x19, 0x2A, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 10", ("Collectable", 0x19, 0x2B, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))), ("Ganons Tower Pot 11", ("Collectable", 0x19, 0x2C, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), ("Ganons Tower Pot 12", ("Collectable", 0x19, 0x2D, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), ("Ganons Tower Pot 13", ("Collectable", 0x19, 0x2E, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 14", ("Collectable", 0x19, 0x31, None, 'Recovery Heart', ("Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 14", ("Collectable", 0x19, 0x31, None, 'Arrows (10)', ("Ganon's Tower", "Pot"))), ## Events and Drops ("Pierre", ("Event", None, None, None, 'Scarecrow Song', None)), diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt index 97100c017..63b77cecc 100644 --- a/data/generated/rom_patch.txt +++ b/data/generated/rom_patch.txt @@ -10242,8 +10242,8 @@ fec1fc,9000000 34899bc,90513e16 34899c0,3c028040 34899c4,a0510025 -34899c8,92420014 -34899cc,10400021 +34899c8,82420014 +34899cc,4400021 34899d0,3c02800c 34899d4,3c028041 34899d8,ac403e18 @@ -10255,8 +10255,8 @@ fec1fc,9000000 34899f0,3442fdcc 34899f4,40f809 34899f8,348484a0 -34899fc,92420014 -3489a00,2c430003 +34899fc,82420014 +3489a00,28430003 3489a04,14600007 3489a08,24044803 3489a0c,2442ffed @@ -18565,21 +18565,25 @@ fec1fc,9000000 3492890,8040cf9c 3492894,8040cb10 3492898,ffffffff +349289c,ff000000 34928a0,53030031 34928a4,e9350c 34928a8,8040cf9c 34928ac,8040cb10 34928b0,ffffffff +34928b4,ff000000 34928b8,53060030 34928bc,e7330c 34928c0,8040cf9c 34928c4,8040cb10 34928c8,ffffffff +34928cc,ff000000 34928d0,530e0035 34928d4,e8340c 34928d8,8040cf9c 34928dc,8040cb10 34928e0,ffffffff +34928e4,ff000000 34928e8,4d000037 34928ec,c71b00 34928f0,8040cf9c @@ -18591,261 +18595,313 @@ fec1fc,9000000 3492908,8040cf9c 349290c,8040cb10 3492910,ffffffff +3492914,ff000000 3492918,530b004f 349291c,dd2e0c 3492920,8040cf9c 3492924,8040cb10 3492928,ffffffff +349292c,ff000000 3492930,530f0039 3492934,ea360c 3492938,8040cf9c 349293c,8040cb10 3492940,ffffffff +3492944,ff000000 3492948,53230069 349294c,ef3b0c 3492950,8040cf9c 3492954,8040ce58 3492958,ffffffff +349295c,ff000000 3492960,5308003a 3492964,de2f0c 3492968,8040cf9c 349296c,8040cb10 3492970,ffffffff +3492974,ff000000 3492978,53110038 349297c,f6410c 3492980,8040cf9c 3492984,8040cb10 3492988,ffffffff +349298c,ff000000 3492990,532f0002 3492994,1095e0c 3492998,8040cf9c 349299c,8040cb10 34929a0,ffffffff +34929a4,ff000000 34929a8,53140042 34929ac,c6010c 34929b0,8040cf9c 34929b4,8040cb10 34929b8,ffffffff +34929bc,ff000000 34929c0,53150043 34929c4,eb380c 34929c8,8040cf9c 34929cc,8040cb10 34929d0,ffffffff +34929d4,ff000000 34929d8,53160044 34929dc,eb370c 34929e0,8040cf9c 34929e4,8040cb10 34929e8,ffffffff +34929ec,ff000000 34929f0,53170045 34929f4,eb390c 34929f8,8040cf9c 34929fc,8040cb10 3492a00,ffffffff +3492a04,ff000000 3492a08,53180046 3492a0c,c6010c 3492a10,8040cf9c 3492a14,8040cb10 3492a18,ffffffff +3492a1c,ff000000 3492a20,531a0098 3492a24,df300c 3492a28,8040cf9c 3492a2c,8040cb10 3492a30,ffffffff +3492a34,ff000000 3492a38,531b0099 3492a3c,10b450c 3492a40,8040d1a4 3492a44,8040cb10 3492a48,ffffffff +3492a4c,ff000000 3492a50,53100048 3492a54,f33e00 3492a58,8040cf9c 3492a5c,8040cb10 3492a60,ffffffff +3492a64,ff000000 3492a68,53250010 3492a6c,1364f0c 3492a70,8040cf9c 3492a74,8040cb10 3492a78,ffffffff +3492a7c,ff000000 3492a80,53260011 3492a84,135320c 3492a88,8040cf9c 3492a8c,8040cb10 3492a90,ffffffff +3492a94,ff000000 3492a98,5322000b 3492a9c,109440c 3492aa0,8040cf9c 3492aa4,8040cb10 3492aa8,ffffffff +3492aac,ff000000 3492ab0,53240012 3492ab4,134310c 3492ab8,8040cf9c 3492abc,8040cb10 3492ac0,ffffffff +3492ac4,ff000000 3492ac8,53270013 3492acc,137500c 3492ad0,8040cf9c 3492ad4,8040cb10 3492ad8,ffffffff +3492adc,ff000000 3492ae0,532b0017 3492ae4,138510c 3492ae8,8040cf9c 3492aec,8040cb10 3492af0,ffffffff +3492af4,ff000000 3492af8,532d9001 3492afc,da290c 3492b00,8040cf9c 3492b04,8040cb10 3492b08,ffffffff +3492b0c,ff000000 3492b10,532e000b 3492b14,109440c 3492b18,8040cf9c 3492b1c,8040cb10 3492b20,ffffffff +3492b24,ff000000 3492b28,53300003 3492b2c,141540c 3492b30,8040cf9c 3492b34,8040cb10 3492b38,ffffffff +3492b3c,ff000000 3492b40,53310004 3492b44,140530c 3492b48,8040cf9c 3492b4c,8040cb10 3492b50,ffffffff +3492b54,ff000000 3492b58,53320005 3492b5c,f5400c 3492b60,8040cf9c 3492b64,8040cb10 3492b68,ffffffff +3492b6c,ff000000 3492b70,53330008 3492b74,143560c 3492b78,8040cf9c 3492b7c,8040cb10 3492b80,ffffffff +3492b84,ff000000 3492b88,53340009 3492b8c,146570c 3492b90,8040cf9c 3492b94,8040cb10 3492b98,ffffffff +3492b9c,ff000000 3492ba0,5335000d 3492ba4,1495a0c 3492ba8,8040cf9c 3492bac,8040cb10 3492bb0,ffffffff +3492bb4,ff000000 3492bb8,5336000e 3492bbc,13f520c 3492bc0,8040cf9c 3492bc4,8040cb10 3492bc8,ffffffff +3492bcc,ff000000 3492bd0,5337000a 3492bd4,142550c 3492bd8,8040cf9c 3492bdc,8040cb10 3492be0,ffffffff +3492be4,ff000000 3492be8,533b00a4 3492bec,18d740c 3492bf0,8040cf9c 3492bf4,8040cb10 3492bf8,ffffffff +3492bfc,ff000000 3492c00,533d004b 3492c04,f8430c 3492c08,8040cf9c 3492c0c,8040cb10 3492c10,ffffffff +3492c14,ff000000 3492c18,533e004c 3492c1c,cb1d00 3492c20,8040cf9c 3492c24,8040cb10 3492c28,ffffffff +3492c2c,ff000000 3492c30,533f004d 3492c34,dc2c00 3492c38,8040cf9c 3492c3c,8040cb10 3492c40,ffffffff +3492c44,ff000000 3492c48,5340004e 3492c4c,ee3a0c 3492c50,8040cf9c 3492c54,8040cb10 3492c58,ffffffff +3492c5c,ff000000 3492c60,53420050 3492c64,f23c0c 3492c68,8040cf9c 3492c6c,8040cb10 3492c70,ffffffff +3492c74,ff000000 3492c78,53430051 3492c7c,f23d0c 3492c80,8040cf9c 3492c84,8040cb10 3492c88,ffffffff +3492c8c,ff000000 3492c90,53450053 3492c94,118470c 3492c98,8040cf9c 3492c9c,8040cb10 3492ca0,ffffffff +3492ca4,ff000000 3492ca8,53460054 3492cac,1575f0c 3492cb0,8040cf9c 3492cb4,8040cb10 3492cb8,ffffffff +3492cbc,ff000000 3492cc0,534b0056 3492cc4,be160c 3492cc8,8040cf9c 3492ccc,8040cb10 3492cd0,ffffffff +3492cd4,ff000000 3492cd8,534c0057 3492cdc,be170c 3492ce0,8040cf9c 3492ce4,8040cb10 3492ce8,ffffffff +3492cec,ff000000 3492cf0,534d0058 3492cf4,bf180c 3492cf8,8040cf9c 3492cfc,8040cb10 3492d00,ffffffff +3492d04,ff000000 3492d08,534e0059 3492d0c,bf190c 3492d10,8040cf9c 3492d14,8040cb10 3492d18,ffffffff +3492d1c,ff000000 3492d20,534f005a 3492d24,bf1a0c 3492d28,8040cf9c 3492d2c,8040cb10 3492d30,ffffffff +3492d34,ff000000 3492d38,5351005b 3492d3c,12d490c 3492d40,8040cf9c 3492d44,8040cb10 3492d48,ffffffff +3492d4c,ff000000 3492d50,5352005c 3492d54,12d4a0c 3492d58,8040cf9c 3492d5c,8040cb10 3492d60,ffffffff +3492d64,ff000000 3492d68,535300cd 3492d6c,db2a0c 3492d70,8040cf9c 3492d74,8040cb10 3492d78,ffffffff +3492d7c,ff000000 3492d80,535400ce 3492d84,db2b0c 3492d88,8040cf9c 3492d8c,8040cb10 3492d90,ffffffff +3492d94,ff000000 3492d98,536f0068 3492d9c,c8210c 3492da0,8040cf9c 3492da4,8040cb10 3492da8,ffffffff +3492dac,ff000000 3492db0,5370007b 3492db4,d7240c 3492db8,8040cf9c 3492dbc,8040cb10 3492dc0,ffffffff +3492dc4,ff000000 3492dc8,5341004a 3492dcc,10e460c 3492dd0,8040cf9c 3492dd4,8040cdb8 3492dd8,ffffffff +3492ddc,ff000000 3492de0,4d5800dc 3492de4,1194800 3492de8,8040d180 @@ -18857,56 +18913,67 @@ fec1fc,9000000 3492e00,8040d214 3492e04,8040ce3c 3492e08,ffffffff +3492e0c,ff000000 3492e10,3e7a00c2 3492e14,bd1400 3492e18,8040d214 3492e1c,8040cb18 3492e20,ffffffff +3492e24,ff000000 3492e28,537400c7 3492e2c,b90a02 3492e30,8040cf9c 3492e34,8040cb10 3492e38,ffffffff +3492e3c,ff000000 3492e40,53750067 3492e44,b80b00 3492e48,8040cf9c 3492e4c,8040cb10 3492e50,ffffffff +3492e54,ff000000 3492e58,53760066 3492e5c,c81c00 3492e60,8040cf9c 3492e64,8040cb10 3492e68,ffffffff +3492e6c,ff000000 3492e70,53770060 3492e74,aa020d 3492e78,8040cf9c 3492e7c,8040cb10 3492e80,ffffffff +3492e84,ff000000 3492e88,53780052 3492e8c,cd1e00 3492e90,8040cf9c 3492e94,8040cb10 3492e98,ffffffff +3492e9c,ff000000 3492ea0,53790052 3492ea4,cd1f00 3492ea8,8040cf9c 3492eac,8040cb10 3492eb0,ffffffff +3492eb4,ff000000 3492eb8,5356005e 3492ebc,d1220c 3492ec0,8040cf9c 3492ec4,8040ce10 3492ec8,1ffff +3492ecc,ff000000 3492ed0,5357005f 3492ed4,d1230c 3492ed8,8040cf9c 3492edc,8040ce10 3492ee0,2ffff +3492ee4,ff000000 3492ee8,5321009a 3492eec,da290c 3492ef0,8040cf9c 3492ef4,8040cb10 3492ef8,ffffffff +3492efc,ff000000 3492f00,4d830055 3492f04,b70900 3492f08,8040cf9c @@ -18953,31 +19020,37 @@ fec1fc,9000000 3492fb0,8040cf9c 3492fb4,8040cb18 3492fb8,ffffffff +3492fbc,ff000000 3492fc0,53820098 3492fc4,df300c 3492fc8,8040cf9c 3492fcc,8040cb10 3492fd0,ffffffff +3492fd4,ff000000 3492fd8,53280014 3492fdc,1505b0c 3492fe0,8040cf9c 3492fe4,8040cb10 3492fe8,ffffffff +3492fec,ff000000 3492ff0,53290015 3492ff4,1515c0c 3492ff8,8040cf9c 3492ffc,8040cb10 3493000,ffffffff +3493004,ff000000 3493008,532a0016 349300c,1525d0c 3493010,8040cf9c 3493014,8040cb10 3493018,ffffffff +349301c,ff000000 3493020,53500079 3493024,147580c 3493028,8040cf9c 349302c,8040cb10 3493030,ffffffff +3493034,ff000000 3493038,4d8700f1 349303c,17f7100 3493040,8040cf9c @@ -18995,51 +19068,61 @@ fec1fc,9000000 3493070,8040cf9c 3493074,8040cc18 3493078,ffffffff +349307c,ff000000 3493080,53040070 3493084,158600c 3493088,8040cf9c 349308c,8040cb10 3493090,ffffffff +3493094,ff000000 3493098,530c0071 349309c,158610c 34930a0,8040cf9c 34930a4,8040cb10 34930a8,ffffffff +34930ac,ff000000 34930b0,53120072 34930b4,158620c 34930b8,8040cf9c 34930bc,8040cb10 34930c0,ffffffff +34930c4,ff000000 34930c8,5b7100b4 34930cc,15c630e 34930d0,8040cf9c 34930d4,8040cb10 34930d8,ffffffff +34930dc,ff000000 34930e0,530500ad 34930e4,15d640c 34930e8,8040cf9c 34930ec,8040cb10 34930f0,ffffffff +34930f4,ff000000 34930f8,530d00ae 34930fc,15d650c 3493100,8040cf9c 3493104,8040cb10 3493108,ffffffff +349310c,ff000000 3493110,531300af 3493114,15d660c 3493118,8040cf9c 349311c,8040cb10 3493120,ffffffff +3493124,ff000000 3493128,53470007 349312c,17b6c0c 3493130,8040cf9c 3493134,8040cb10 3493138,ffffffff +349313c,ff000000 3493140,53480007 3493144,17b6c0c 3493148,8040cf9c 349314c,8040cb10 3493150,ffffffff +3493154,ff000000 3493158,4d8a0037 349315c,c71b00 3493160,8040cf9c @@ -19099,531 +19182,637 @@ fec1fc,9000000 3493238,8040cf9c 349323c,8040cb10 3493240,ffffffff +3493244,ff000000 3493248,4d970033 349324c,d92800 3493250,8040cf9c 3493254,8040cb10 3493258,ffffffff +349325c,ff000000 3493260,53190047 3493264,f43f0c 3493268,8040cf9c 349326c,8040cb10 3493270,ffffffff +3493274,ff000000 3493278,531d007a 349327c,174680c 3493280,8040cf9c 3493284,8040cb10 3493288,ffffffff +349328c,ff000000 3493290,531c005d 3493294,173670c 3493298,8040cf9c 349329c,8040cb10 34932a0,ffffffff +34932a4,ff000000 34932a8,53200097 34932ac,1766a0c 34932b0,8040cf9c 34932b4,8040cb10 34932b8,ffffffff +34932bc,ff000000 34932c0,531e00f9 34932c4,176700c 34932c8,8040cf9c 34932cc,8040cb10 34932d0,ffffffff +34932d4,ff000000 34932d8,537700f3 34932dc,aa0200 34932e0,8040cf9c 34932e4,8040cb10 34932e8,ffffffff +34932ec,ff000000 34932f0,4d8400f4 34932f4,17f6d00 34932f8,8040cf9c 34932fc,8040cb10 3493300,ffffffff +3493304,ff000000 3493308,4d8500f5 349330c,17f6e00 3493310,8040cf9c 3493314,8040cb10 3493318,ffffffff +349331c,ff000000 3493320,4d8600f6 3493324,17f6f00 3493328,8040cf9c 349332c,8040cb10 3493330,ffffffff +3493334,ff000000 3493338,4d8700f7 349333c,17f7100 3493340,8040cf9c 3493344,8040cb10 3493348,ffffffff +349334c,ff000000 3493350,537a00fa 3493354,bd1400 3493358,8040d214 349335c,8040cb18 3493360,ffffffff +3493364,ff000000 3493368,53980090 349336c,c71b00 3493370,8040cf9c 3493374,8040cb10 3493378,ffffffff +349337c,ff000000 3493380,53990091 3493384,c71b00 3493388,8040cf9c 349338c,8040cb10 3493390,ffffffff +3493394,ff000000 3493398,539a00a7 349339c,bb1200 34933a0,8040cf9c 34933a4,8040cb10 34933a8,ffffffff +34933ac,ff000000 34933b0,539b00a8 34933b4,bb1200 34933b8,8040cf9c 34933bc,8040cb10 34933c0,ffffffff +34933c4,ff000000 34933c8,5349006c 34933cc,17b730c 34933d0,8040cf9c 34933d4,8040cb10 34933d8,ffffffff +34933dc,ff000000 34933e0,53419002 34933e4,c 34933e8,8040cf9c 34933ec,8040cddc 34933f0,ffffffff +34933f4,ff000000 34933f8,3e4190c2 34933fc,bd1400 3493400,8040cf9c 3493404,8040cb18 3493408,ffffffff +349340c,ff000000 3493410,3e4190c6 3493414,bd1300 3493418,8040cf9c 349341c,8040cb18 3493420,ffffffff +3493424,ff000000 3493428,534190fa 349342c,bd1400 3493430,8040cf9c 3493434,8040cb18 3493438,ffffffff +349343c,ff000000 3493440,ffffffff 3493444,dd2d0c 3493448,8040cfa4 349344c,8040cb10 3493450,ffffffff +3493454,ff000000 3493458,ffffffff 349345c,147580c 3493460,8040cfb8 3493464,8040cb10 3493468,ffffffff +349346c,ff000000 3493470,ffffffff 3493474,bf180c 3493478,8040cfe4 349347c,8040cb10 3493480,ffffffff +3493484,ff000000 3493488,ffffffff 349348c,e9350c 3493490,8040d010 3493494,8040cb10 3493498,ffffffff +349349c,ff000000 34934a0,ffffffff 34934a4,e7330c 34934a8,8040d038 34934ac,8040cb10 34934b0,ffffffff +34934b4,ff000000 34934b8,ffffffff 34934bc,d1220c 34934c0,8040d068 34934c4,8040cb10 34934c8,ffffffff +34934cc,ff000000 34934d0,ffffffff 34934d4,db2a0c 34934d8,8040d098 34934dc,8040cb10 34934e0,ffffffff +34934e4,ff000000 34934e8,ffffffff 34934ec,bb1200 34934f0,8040d0b0 34934f4,8040cb10 34934f8,ffffffff +34934fc,ff000000 3493500,ffffffff 3493504,c71b00 3493508,8040d0cc 349350c,8040cb10 3493510,ffffffff +3493514,ff000000 3493518,ffffffff 349351c,d9280c 3493520,8040d0f8 3493524,8040cb10 3493528,ffffffff +349352c,ff000000 3493530,ffffffff 3493534,cd1e0c 3493538,8040d0e8 349353c,8040cb10 3493540,ffffffff +3493544,ff000000 3493548,ffffffff 349354c,10e460c 3493550,8040d128 3493554,8040cb10 3493558,ffffffff +349355c,ff000000 3493560,53410043 3493564,c6010c 3493568,8040cf9c 349356c,8040cc24 3493570,15ffff +3493574,ff000000 3493578,53410044 349357c,c6010c 3493580,8040cf9c 3493584,8040cc24 3493588,16ffff +349358c,ff000000 3493590,53410045 3493594,c6010c 3493598,8040cf9c 349359c,8040cc24 34935a0,17ffff +34935a4,ff000000 34935a8,53410046 34935ac,1776b0c 34935b0,8040cf9c 34935b4,8040cc24 34935b8,18ffff +34935bc,ff000000 34935c0,53410047 34935c4,f43f0c 34935c8,8040cf9c 34935cc,8040cc24 34935d0,19ffff +34935d4,ff000000 34935d8,5341005d 34935dc,173670c 34935e0,8040cf9c 34935e4,8040cc24 34935e8,1cffff +34935ec,ff000000 34935f0,5341007a 34935f4,174680c 34935f8,8040cf9c 34935fc,8040cc24 3493600,1dffff +3493604,ff000000 3493608,534100f9 349360c,176700c 3493610,8040cf9c 3493614,8040cc24 3493618,1effff +349361c,ff000000 3493620,53410097 3493624,1766a0c 3493628,8040cf9c 349362c,8040cc24 3493630,20ffff +3493634,ff000000 3493638,53410006 349363c,b90a02 3493640,8040cf9c 3493644,8040cc5c 3493648,10003 +349364c,ff000000 3493650,5341001c 3493654,b90a02 3493658,8040cf9c 349365c,8040cc5c 3493660,10004 +3493664,ff000000 3493668,5341001d 349366c,b90a02 3493670,8040cf9c 3493674,8040cc5c 3493678,10005 +349367c,ff000000 3493680,5341001e 3493684,b90a02 3493688,8040cf9c 349368c,8040cc5c 3493690,10006 +3493694,ff000000 3493698,5341002a 349369c,b90a02 34936a0,8040cf9c 34936a4,8040cc5c 34936a8,10007 +34936ac,ff000000 34936b0,53410061 34936b4,b90a02 34936b8,8040cf9c 34936bc,8040cc5c 34936c0,1000a +34936c4,ff000000 34936c8,53410062 34936cc,b80b00 34936d0,8040cf9c 34936d4,8040cc5c 34936d8,20000 +34936dc,ff000000 34936e0,53410063 34936e4,b80b00 34936e8,8040cf9c 34936ec,8040cc5c 34936f0,20001 +34936f4,ff000000 34936f8,53410064 34936fc,b80b00 3493700,8040cf9c 3493704,8040cc5c 3493708,20002 +349370c,ff000000 3493710,53410065 3493714,b80b00 3493718,8040cf9c 349371c,8040cc5c 3493720,20003 +3493724,ff000000 3493728,5341007c 349372c,b80b00 3493730,8040cf9c 3493734,8040cc5c 3493738,20004 +349373c,ff000000 3493740,5341007d 3493744,b80b00 3493748,8040cf9c 349374c,8040cc5c 3493750,20005 +3493754,ff000000 3493758,5341007e 349375c,b80b00 3493760,8040cf9c 3493764,8040cc5c 3493768,20006 +349376c,ff000000 3493770,5341007f 3493774,b80b00 3493778,8040cf9c 349377c,8040cc5c 3493780,20007 +3493784,ff000000 3493788,534100a2 349378c,b80b00 3493790,8040cf9c 3493794,8040cc5c 3493798,20008 +349379c,ff000000 34937a0,53410087 34937a4,b80b00 34937a8,8040cf9c 34937ac,8040cc5c 34937b0,20009 +34937b4,ff000000 34937b8,53410088 34937bc,c81c00 34937c0,8040cf9c 34937c4,8040cc5c 34937c8,40000 +34937cc,ff000000 34937d0,53410089 34937d4,c81c00 34937d8,8040cf9c 34937dc,8040cc5c 34937e0,40001 +34937e4,ff000000 34937e8,5341008a 34937ec,c81c00 34937f0,8040cf9c 34937f4,8040cc5c 34937f8,40002 +34937fc,ff000000 3493800,5341008b 3493804,c81c00 3493808,8040cf9c 349380c,8040cc5c 3493810,40003 +3493814,ff000000 3493818,5341008c 349381c,c81c00 3493820,8040cf9c 3493824,8040cc5c 3493828,40004 +349382c,ff000000 3493830,5341008e 3493834,c81c00 3493838,8040cf9c 349383c,8040cc5c 3493840,40005 +3493844,ff000000 3493848,5341008f 349384c,c81c00 3493850,8040cf9c 3493854,8040cc5c 3493858,40006 +349385c,ff000000 3493860,534100a3 3493864,c81c00 3493868,8040cf9c 349386c,8040cc5c 3493870,40007 +3493874,ff000000 3493878,534100a5 349387c,c81c00 3493880,8040cf9c 3493884,8040cc5c 3493888,40008 +349388c,ff000000 3493890,53410092 3493894,c81c00 3493898,8040cf9c 349389c,8040cc5c 34938a0,40009 +34938a4,ff000000 34938a8,53410093 34938ac,aa020d 34938b0,8040cf9c 34938b4,8040cc70 34938b8,3ffff +34938bc,ff000000 34938c0,53410094 34938c4,aa020d 34938c8,8040cf9c 34938cc,8040cc70 34938d0,4ffff +34938d4,ff000000 34938d8,53410095 34938dc,aa020d 34938e0,8040cf9c 34938e4,8040cc70 34938e8,5ffff +34938ec,ff000000 34938f0,534100a6 34938f4,aa020d 34938f8,8040cf9c 34938fc,8040cc70 3493900,6ffff +3493904,ff000000 3493908,534100a9 349390c,aa020d 3493910,8040cf9c 3493914,8040cc70 3493918,7ffff +349391c,ff000000 3493920,5341009b 3493924,aa020d 3493928,8040cf9c 349392c,8040cc70 3493930,8ffff +3493934,ff000000 3493938,5341009f 349393c,aa020d 3493940,8040cf9c 3493944,8040cc70 3493948,bffff +349394c,ff000000 3493950,534100a0 3493954,aa020d 3493958,8040cf9c 349395c,8040cc70 3493960,cffff +3493964,ff000000 3493968,534100a1 349396c,aa020d 3493970,8040cf9c 3493974,8040cc70 3493978,dffff +349397c,ff000000 3493980,534100e9 3493984,194130c 3493988,8040cf9c 349398c,8040cd5c 3493990,ffffffff +3493994,ff000000 3493998,534100e4 349399c,cd1e0c 34939a0,8040cf9c 34939a4,8040cd78 34939a8,ffffffff +34939ac,ff000000 34939b0,534100e8 34939b4,cd1f0c 34939b8,8040cf9c 34939bc,8040cd94 34939c0,ffffffff +34939c4,ff000000 34939c8,53410073 34939cc,b6030c 34939d0,8040cf9c 34939d4,8040cdc4 34939d8,6ffff +34939dc,ff000000 34939e0,53410074 34939e4,b6040c 34939e8,8040cf9c 34939ec,8040cdc4 34939f0,7ffff +34939f4,ff000000 34939f8,53410075 34939fc,b6050c 3493a00,8040cf9c 3493a04,8040cdc4 3493a08,8ffff +3493a0c,ff000000 3493a10,53410076 3493a14,b6060c 3493a18,8040cf9c 3493a1c,8040cdc4 3493a20,9ffff +3493a24,ff000000 3493a28,53410077 3493a2c,b6070c 3493a30,8040cf9c 3493a34,8040cdc4 3493a38,affff +3493a3c,ff000000 3493a40,53410078 3493a44,b6080c 3493a48,8040cf9c 3493a4c,8040cdc4 3493a50,bffff +3493a54,ff000000 3493a58,534100d4 3493a5c,b6040c 3493a60,8040cf9c 3493a64,8040cdc4 3493a68,cffff +3493a6c,ff000000 3493a70,534100d2 3493a74,b6060c 3493a78,8040cf9c 3493a7c,8040cdc4 3493a80,dffff +3493a84,ff000000 3493a88,534100d1 3493a8c,b6030c 3493a90,8040cf9c 3493a94,8040cdc4 3493a98,effff +3493a9c,ff000000 3493aa0,534100d3 3493aa4,b6080c 3493aa8,8040cf9c 3493aac,8040cdc4 3493ab0,fffff +3493ab4,ff000000 3493ab8,534100d5 3493abc,b6050c 3493ac0,8040cf9c 3493ac4,8040cdc4 3493ac8,10ffff +3493acc,ff000000 3493ad0,534100d6 3493ad4,b6070c 3493ad8,8040cf9c 3493adc,8040cdc4 3493ae0,11ffff +3493ae4,ff000000 3493ae8,534100f8 3493aec,d1230c 3493af0,8040cf9c 3493af4,8040cbe0 3493af8,3ffff +3493afc,ff000000 3493b00,53149099 3493b04,10b450c 3493b08,8040cf9c 3493b0c,8040cb10 3493b10,ffffffff +3493b14,ff000000 3493b18,53419048 3493b1c,f33e0c 3493b20,8040cf9c 3493b24,8040cdf8 3493b28,ffffffff +3493b2c,ff000000 3493b30,53419003 3493b34,193760c 3493b38,8040cf9c 3493b3c,8040cb24 3493b40,ffffffff +3493b44,ff000000 3493b48,53419010 3493b4c,195770d 3493b50,8040cf9c 3493b54,8040ccc0 3493b58,3ffff +3493b5c,ff000000 3493b60,53419011 3493b64,195770d 3493b68,8040cf9c 3493b6c,8040ccc0 3493b70,4ffff +3493b74,ff000000 3493b78,53419012 3493b7c,195770d 3493b80,8040cf9c 3493b84,8040ccc0 3493b88,5ffff +3493b8c,ff000000 3493b90,53419013 3493b94,195770d 3493b98,8040cf9c 3493b9c,8040ccc0 3493ba0,6ffff +3493ba4,ff000000 3493ba8,53419014 3493bac,195770d 3493bb0,8040cf9c 3493bb4,8040ccc0 3493bb8,7ffff +3493bbc,ff000000 3493bc0,53419015 3493bc4,195770d 3493bc8,8040cf9c 3493bcc,8040ccc0 3493bd0,8ffff +3493bd4,ff000000 3493bd8,53419016 3493bdc,195770d 3493be0,8040cf9c 3493be4,8040ccc0 3493be8,bffff +3493bec,ff000000 3493bf0,53419017 3493bf4,195770d 3493bf8,8040cf9c 3493bfc,8040ccc0 3493c00,cffff +3493c04,ff000000 3493c08,53419018 3493c0c,195770d 3493c10,8040cf9c 3493c14,8040ccc0 3493c18,dffff +3493c1c,ff000000 3493c30,10000 3493c40,20000 3493c50,30000