From c8b9834f7507676d6d80b4e55edf161f2c788c40 Mon Sep 17 00:00:00 2001 From: rrealmuto Date: Mon, 19 Sep 2022 21:13:41 -0400 Subject: [PATCH] Make pots/crates shuffle their vanilla items (#50) --- ASM/build/bundle.o | Bin 106952 -> 106952 bytes ASM/c/get_items.c | 2 +- ASM/c/item_table.c | 378 +++++++++++++++++------------------ ASM/c/item_table.h | 2 +- ItemPool.py | 20 +- LocationList.py | 340 +++++++++++++++---------------- data/generated/rom_patch.txt | 197 +++++++++++++++++- 7 files changed, 564 insertions(+), 375 deletions(-) diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o index 8d747cf120b49b753af580df0bd7ced4cafd9c94..96dd695805ca75eb5c05250843773b47c6d7fc4e 100644 GIT binary patch delta 2830 zcmZwJZD?Cn7zgnGNz=4x7iXK+th1?tMVvFnx>YwZooOwdj^MW1S;nr;*NGS`Iy=`9 z3PThbk?7r+V*~_2L<|bUqDU+_nEev*1?GnurM~plIPHRO5aKz>eeTJ9>irb>-RGSD zxz9QGX6C$S=Dg>F?veWA{b+NWn?}NwUpJgHM*cd{Q3fzvhaN2Tu9H72S6N+Vd@fMc zE6|I@txVH%VNo`7bkBNh$MS9Lo)T#z?!fn9rlB9L@xyQl?}JPY(sm4BWgF8ZX#j&* z+0Haex)E>Shg+ByNUy|BT<)Vqqq^$gPgbhy(IR?pWwkNVZnTQ6Jxmj%n-LJ(_At$m z-i&79y_;#CvIf?fD~fN73& z2V(f{CibjKr2W{9)jL^j=oc&VAcn<;A*KfDF6_gnS20bJ#xRQM4NSA7_hCP#H!>}d z?!^HSx|eBi-b!^pzQF8erZLhn9K*NWOcV0~x#v&Khb!lzZvvko+s2+roQ1G+1cPyr!~ExvVFKPT|KkM|8M6f z7p>Vhp}jUH{m++^Ue1>U(MxMaGYxha;S1Z*SyoS%OX0!ev@%VQMpG_HEOW-v zzG&(KvVK;Zw^a2U`4Fr16{@K!y5`(PYIR`?tBu#{?2Sy*wYp}#xmwM2vD%WQ!%_Jy zxFBpryUb~ZezTrrRDKI;HK5ec>ew6TP@2>_Ar3#OM-D2@YCSE+pVE4*(t_4beB7iu zQN0A*WixomPSwTKQ#NB-A7`>R*&QK(3nQ+|h5dSqyAcW9+YNv#2gR(g~zs&C@lmu;tK N{la^0wRrKp{{WEHcq;$^ delta 2828 zcmZwJZD?Cn7zgnGNz=4xciq}FW}QtPScJL7ShwmXrZcUjo8#iP+F8b~&ew?;EIK>a z5eg!Tj7Z$wm}3M4K|~A+!=gwmIGFts@df6G8l}GU)i~{fZxHmpJ@@23^?VBa?sM+{ z+~=HoGkq~IeKGKU*Kqx*KD4dVHx0+FUt2C{!+)M^hcSlg(2d2OHRf+~{Aso99F z*PsUr+nDBN;{tk-u33v6Sh|f}QzdQ09r!NJH1>lte;hs$e1NG&8b&{sw=>OG0l_S zjAjwMn`w!(8-8)u5L4wRC)HLoiv9yk6Qn&*#O{MkQ>3?}N%Rdf&5Z5Et2kp zif^~DXH_Nb!(Oc1$!cRiJDCSCB-Rfy)kyc?06w{vX@*qA2&UFEEs)-egP7XDv`o4m zheYfirqMYk)qVIJGn<*Jq@y^2Z@QSK=OV_QKQkA%&PDGyK1HF8J(Cj6@Enfd!)B(+ zymR+sIE;6E3bB3S5~RnmAI0kl={%C&j|cJP4Q@90%+s2iH?w^(KV_fU7yfVOXBM2h zZ$en?JLJw_-@QP(7stim2-EVypgpr6qhjPRQ+3gqxfRcdk%yV4N$Zgp+M`VKq#?W~ zw8xp2NOz$@oOp_Qc+ z6zfQV^dsYNydLD1%<5s3=(qz_W5X+o*v^SZ( zghGhbmK?QuUW&0=rEI6Nbk(^_)av|JR-3BTnVXpAYIW6mi?v$pWVKaChmyv(;F53^ zVRPrles!K?()bqCYQ$7cs%LMY-PDZKadGqsIdjz1g4DBO>`AE`O)X39z(-AHC+s2M zhaSD+rs`xGfUZh?h-nk_wA4px-y!h9*zI|#k1?%-UXq$-S`S_M%}q7Iv;lfT>dQ=n z#{U7SuVA`^RtsabMyj0DlT3|NMX9ecHBwcjzRA=`75m-Ie2S@&N|SoJ_Kga^)nBP^ zc{E`4SL%6>Hd_6a`i4i>m>OMiQ!R?qA$M=s?^0Fjg7GG2nwEMLlYUpxV9uPEI)=%B z)S#&)sn27wQEIcP%2hYjSDsqM)P&TpJ+*61O-a3s$p$%di>W!%w(L34Jm9Lm-Xdu- zTPO4}rd6pe;>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 b3f9a97d9..e5b8e8998 100644 --- a/data/generated/rom_patch.txt +++ b/data/generated/rom_patch.txt @@ -10232,8 +10232,8 @@ fec1fc,9000000 34899b0,90513b6a 34899b4,3c028040 34899b8,a0510025 -34899bc,92420014 -34899c0,10400021 +34899bc,82420014 +34899c0,4400021 34899c4,3c02800c 34899c8,3c028041 34899cc,ac403b6c @@ -10245,8 +10245,8 @@ fec1fc,9000000 34899e4,3442fdcc 34899e8,40f809 34899ec,348484a0 -34899f0,92420014 -34899f4,2c430003 +34899f0,82420014 +34899f4,28430003 34899f8,14600007 34899fc,24044803 3489a00,2442ffed @@ -18386,21 +18386,25 @@ fec1fc,9000000 34925e0,8040cf90 34925e4,8040cb04 34925e8,ffffffff +34925ec,ff000000 34925f0,53030031 34925f4,e9350c 34925f8,8040cf90 34925fc,8040cb04 3492600,ffffffff +3492604,ff000000 3492608,53060030 349260c,e7330c 3492610,8040cf90 3492614,8040cb04 3492618,ffffffff +349261c,ff000000 3492620,530e0035 3492624,e8340c 3492628,8040cf90 349262c,8040cb04 3492630,ffffffff +3492634,ff000000 3492638,4d000037 349263c,c71b00 3492640,8040cf90 @@ -18412,261 +18416,313 @@ fec1fc,9000000 3492658,8040cf90 349265c,8040cb04 3492660,ffffffff +3492664,ff000000 3492668,530b004f 349266c,dd2e0c 3492670,8040cf90 3492674,8040cb04 3492678,ffffffff +349267c,ff000000 3492680,530f0039 3492684,ea360c 3492688,8040cf90 349268c,8040cb04 3492690,ffffffff +3492694,ff000000 3492698,53230069 349269c,ef3b0c 34926a0,8040cf90 34926a4,8040ce4c 34926a8,ffffffff +34926ac,ff000000 34926b0,5308003a 34926b4,de2f0c 34926b8,8040cf90 34926bc,8040cb04 34926c0,ffffffff +34926c4,ff000000 34926c8,53110038 34926cc,f6410c 34926d0,8040cf90 34926d4,8040cb04 34926d8,ffffffff +34926dc,ff000000 34926e0,532f0002 34926e4,1095e0c 34926e8,8040cf90 34926ec,8040cb04 34926f0,ffffffff +34926f4,ff000000 34926f8,53140042 34926fc,c6010c 3492700,8040cf90 3492704,8040cb04 3492708,ffffffff +349270c,ff000000 3492710,53150043 3492714,eb380c 3492718,8040cf90 349271c,8040cb04 3492720,ffffffff +3492724,ff000000 3492728,53160044 349272c,eb370c 3492730,8040cf90 3492734,8040cb04 3492738,ffffffff +349273c,ff000000 3492740,53170045 3492744,eb390c 3492748,8040cf90 349274c,8040cb04 3492750,ffffffff +3492754,ff000000 3492758,53180046 349275c,c6010c 3492760,8040cf90 3492764,8040cb04 3492768,ffffffff +349276c,ff000000 3492770,531a0098 3492774,df300c 3492778,8040cf90 349277c,8040cb04 3492780,ffffffff +3492784,ff000000 3492788,531b0099 349278c,10b450c 3492790,8040d198 3492794,8040cb04 3492798,ffffffff +349279c,ff000000 34927a0,53100048 34927a4,f33e00 34927a8,8040cf90 34927ac,8040cb04 34927b0,ffffffff +34927b4,ff000000 34927b8,53250010 34927bc,1364f0c 34927c0,8040cf90 34927c4,8040cb04 34927c8,ffffffff +34927cc,ff000000 34927d0,53260011 34927d4,135320c 34927d8,8040cf90 34927dc,8040cb04 34927e0,ffffffff +34927e4,ff000000 34927e8,5322000b 34927ec,109440c 34927f0,8040cf90 34927f4,8040cb04 34927f8,ffffffff +34927fc,ff000000 3492800,53240012 3492804,134310c 3492808,8040cf90 349280c,8040cb04 3492810,ffffffff +3492814,ff000000 3492818,53270013 349281c,137500c 3492820,8040cf90 3492824,8040cb04 3492828,ffffffff +349282c,ff000000 3492830,532b0017 3492834,138510c 3492838,8040cf90 349283c,8040cb04 3492840,ffffffff +3492844,ff000000 3492848,532d9001 349284c,da290c 3492850,8040cf90 3492854,8040cb04 3492858,ffffffff +349285c,ff000000 3492860,532e000b 3492864,109440c 3492868,8040cf90 349286c,8040cb04 3492870,ffffffff +3492874,ff000000 3492878,53300003 349287c,141540c 3492880,8040cf90 3492884,8040cb04 3492888,ffffffff +349288c,ff000000 3492890,53310004 3492894,140530c 3492898,8040cf90 349289c,8040cb04 34928a0,ffffffff +34928a4,ff000000 34928a8,53320005 34928ac,f5400c 34928b0,8040cf90 34928b4,8040cb04 34928b8,ffffffff +34928bc,ff000000 34928c0,53330008 34928c4,143560c 34928c8,8040cf90 34928cc,8040cb04 34928d0,ffffffff +34928d4,ff000000 34928d8,53340009 34928dc,146570c 34928e0,8040cf90 34928e4,8040cb04 34928e8,ffffffff +34928ec,ff000000 34928f0,5335000d 34928f4,1495a0c 34928f8,8040cf90 34928fc,8040cb04 3492900,ffffffff +3492904,ff000000 3492908,5336000e 349290c,13f520c 3492910,8040cf90 3492914,8040cb04 3492918,ffffffff +349291c,ff000000 3492920,5337000a 3492924,142550c 3492928,8040cf90 349292c,8040cb04 3492930,ffffffff +3492934,ff000000 3492938,533b00a4 349293c,18d740c 3492940,8040cf90 3492944,8040cb04 3492948,ffffffff +349294c,ff000000 3492950,533d004b 3492954,f8430c 3492958,8040cf90 349295c,8040cb04 3492960,ffffffff +3492964,ff000000 3492968,533e004c 349296c,cb1d00 3492970,8040cf90 3492974,8040cb04 3492978,ffffffff +349297c,ff000000 3492980,533f004d 3492984,dc2c00 3492988,8040cf90 349298c,8040cb04 3492990,ffffffff +3492994,ff000000 3492998,5340004e 349299c,ee3a0c 34929a0,8040cf90 34929a4,8040cb04 34929a8,ffffffff +34929ac,ff000000 34929b0,53420050 34929b4,f23c0c 34929b8,8040cf90 34929bc,8040cb04 34929c0,ffffffff +34929c4,ff000000 34929c8,53430051 34929cc,f23d0c 34929d0,8040cf90 34929d4,8040cb04 34929d8,ffffffff +34929dc,ff000000 34929e0,53450053 34929e4,118470c 34929e8,8040cf90 34929ec,8040cb04 34929f0,ffffffff +34929f4,ff000000 34929f8,53460054 34929fc,1575f0c 3492a00,8040cf90 3492a04,8040cb04 3492a08,ffffffff +3492a0c,ff000000 3492a10,534b0056 3492a14,be160c 3492a18,8040cf90 3492a1c,8040cb04 3492a20,ffffffff +3492a24,ff000000 3492a28,534c0057 3492a2c,be170c 3492a30,8040cf90 3492a34,8040cb04 3492a38,ffffffff +3492a3c,ff000000 3492a40,534d0058 3492a44,bf180c 3492a48,8040cf90 3492a4c,8040cb04 3492a50,ffffffff +3492a54,ff000000 3492a58,534e0059 3492a5c,bf190c 3492a60,8040cf90 3492a64,8040cb04 3492a68,ffffffff +3492a6c,ff000000 3492a70,534f005a 3492a74,bf1a0c 3492a78,8040cf90 3492a7c,8040cb04 3492a80,ffffffff +3492a84,ff000000 3492a88,5351005b 3492a8c,12d490c 3492a90,8040cf90 3492a94,8040cb04 3492a98,ffffffff +3492a9c,ff000000 3492aa0,5352005c 3492aa4,12d4a0c 3492aa8,8040cf90 3492aac,8040cb04 3492ab0,ffffffff +3492ab4,ff000000 3492ab8,535300cd 3492abc,db2a0c 3492ac0,8040cf90 3492ac4,8040cb04 3492ac8,ffffffff +3492acc,ff000000 3492ad0,535400ce 3492ad4,db2b0c 3492ad8,8040cf90 3492adc,8040cb04 3492ae0,ffffffff +3492ae4,ff000000 3492ae8,536f0068 3492aec,c8210c 3492af0,8040cf90 3492af4,8040cb04 3492af8,ffffffff +3492afc,ff000000 3492b00,5370007b 3492b04,d7240c 3492b08,8040cf90 3492b0c,8040cb04 3492b10,ffffffff +3492b14,ff000000 3492b18,5341004a 3492b1c,10e460c 3492b20,8040cf90 3492b24,8040cdac 3492b28,ffffffff +3492b2c,ff000000 3492b30,4d5800dc 3492b34,1194800 3492b38,8040d174 @@ -18678,56 +18734,67 @@ fec1fc,9000000 3492b50,8040d208 3492b54,8040ce30 3492b58,ffffffff +3492b5c,ff000000 3492b60,3e7a00c2 3492b64,bd1400 3492b68,8040d208 3492b6c,8040cb0c 3492b70,ffffffff +3492b74,ff000000 3492b78,537400c7 3492b7c,b90a02 3492b80,8040cf90 3492b84,8040cb04 3492b88,ffffffff +3492b8c,ff000000 3492b90,53750067 3492b94,b80b00 3492b98,8040cf90 3492b9c,8040cb04 3492ba0,ffffffff +3492ba4,ff000000 3492ba8,53760066 3492bac,c81c00 3492bb0,8040cf90 3492bb4,8040cb04 3492bb8,ffffffff +3492bbc,ff000000 3492bc0,53770060 3492bc4,aa020d 3492bc8,8040cf90 3492bcc,8040cb04 3492bd0,ffffffff +3492bd4,ff000000 3492bd8,53780052 3492bdc,cd1e00 3492be0,8040cf90 3492be4,8040cb04 3492be8,ffffffff +3492bec,ff000000 3492bf0,53790052 3492bf4,cd1f00 3492bf8,8040cf90 3492bfc,8040cb04 3492c00,ffffffff +3492c04,ff000000 3492c08,5356005e 3492c0c,d1220c 3492c10,8040cf90 3492c14,8040ce04 3492c18,1ffff +3492c1c,ff000000 3492c20,5357005f 3492c24,d1230c 3492c28,8040cf90 3492c2c,8040ce04 3492c30,2ffff +3492c34,ff000000 3492c38,5321009a 3492c3c,da290c 3492c40,8040cf90 3492c44,8040cb04 3492c48,ffffffff +3492c4c,ff000000 3492c50,4d830055 3492c54,b70900 3492c58,8040cf90 @@ -18774,31 +18841,37 @@ fec1fc,9000000 3492d00,8040cf90 3492d04,8040cb0c 3492d08,ffffffff +3492d0c,ff000000 3492d10,53820098 3492d14,df300c 3492d18,8040cf90 3492d1c,8040cb04 3492d20,ffffffff +3492d24,ff000000 3492d28,53280014 3492d2c,1505b0c 3492d30,8040cf90 3492d34,8040cb04 3492d38,ffffffff +3492d3c,ff000000 3492d40,53290015 3492d44,1515c0c 3492d48,8040cf90 3492d4c,8040cb04 3492d50,ffffffff +3492d54,ff000000 3492d58,532a0016 3492d5c,1525d0c 3492d60,8040cf90 3492d64,8040cb04 3492d68,ffffffff +3492d6c,ff000000 3492d70,53500079 3492d74,147580c 3492d78,8040cf90 3492d7c,8040cb04 3492d80,ffffffff +3492d84,ff000000 3492d88,4d8700f1 3492d8c,17f7100 3492d90,8040cf90 @@ -18816,51 +18889,61 @@ fec1fc,9000000 3492dc0,8040cf90 3492dc4,8040cc0c 3492dc8,ffffffff +3492dcc,ff000000 3492dd0,53040070 3492dd4,158600c 3492dd8,8040cf90 3492ddc,8040cb04 3492de0,ffffffff +3492de4,ff000000 3492de8,530c0071 3492dec,158610c 3492df0,8040cf90 3492df4,8040cb04 3492df8,ffffffff +3492dfc,ff000000 3492e00,53120072 3492e04,158620c 3492e08,8040cf90 3492e0c,8040cb04 3492e10,ffffffff +3492e14,ff000000 3492e18,5b7100b4 3492e1c,15c630e 3492e20,8040cf90 3492e24,8040cb04 3492e28,ffffffff +3492e2c,ff000000 3492e30,530500ad 3492e34,15d640c 3492e38,8040cf90 3492e3c,8040cb04 3492e40,ffffffff +3492e44,ff000000 3492e48,530d00ae 3492e4c,15d650c 3492e50,8040cf90 3492e54,8040cb04 3492e58,ffffffff +3492e5c,ff000000 3492e60,531300af 3492e64,15d660c 3492e68,8040cf90 3492e6c,8040cb04 3492e70,ffffffff +3492e74,ff000000 3492e78,53470007 3492e7c,17b6c0c 3492e80,8040cf90 3492e84,8040cb04 3492e88,ffffffff +3492e8c,ff000000 3492e90,53480007 3492e94,17b6c0c 3492e98,8040cf90 3492e9c,8040cb04 3492ea0,ffffffff +3492ea4,ff000000 3492ea8,4d8a0037 3492eac,c71b00 3492eb0,8040cf90 @@ -18920,531 +19003,637 @@ fec1fc,9000000 3492f88,8040cf90 3492f8c,8040cb04 3492f90,ffffffff +3492f94,ff000000 3492f98,4d970033 3492f9c,d92800 3492fa0,8040cf90 3492fa4,8040cb04 3492fa8,ffffffff +3492fac,ff000000 3492fb0,53190047 3492fb4,f43f0c 3492fb8,8040cf90 3492fbc,8040cb04 3492fc0,ffffffff +3492fc4,ff000000 3492fc8,531d007a 3492fcc,174680c 3492fd0,8040cf90 3492fd4,8040cb04 3492fd8,ffffffff +3492fdc,ff000000 3492fe0,531c005d 3492fe4,173670c 3492fe8,8040cf90 3492fec,8040cb04 3492ff0,ffffffff +3492ff4,ff000000 3492ff8,53200097 3492ffc,1766a0c 3493000,8040cf90 3493004,8040cb04 3493008,ffffffff +349300c,ff000000 3493010,531e00f9 3493014,176700c 3493018,8040cf90 349301c,8040cb04 3493020,ffffffff +3493024,ff000000 3493028,537700f3 349302c,aa0200 3493030,8040cf90 3493034,8040cb04 3493038,ffffffff +349303c,ff000000 3493040,4d8400f4 3493044,17f6d00 3493048,8040cf90 349304c,8040cb04 3493050,ffffffff +3493054,ff000000 3493058,4d8500f5 349305c,17f6e00 3493060,8040cf90 3493064,8040cb04 3493068,ffffffff +349306c,ff000000 3493070,4d8600f6 3493074,17f6f00 3493078,8040cf90 349307c,8040cb04 3493080,ffffffff +3493084,ff000000 3493088,4d8700f7 349308c,17f7100 3493090,8040cf90 3493094,8040cb04 3493098,ffffffff +349309c,ff000000 34930a0,537a00fa 34930a4,bd1400 34930a8,8040d208 34930ac,8040cb0c 34930b0,ffffffff +34930b4,ff000000 34930b8,53980090 34930bc,c71b00 34930c0,8040cf90 34930c4,8040cb04 34930c8,ffffffff +34930cc,ff000000 34930d0,53990091 34930d4,c71b00 34930d8,8040cf90 34930dc,8040cb04 34930e0,ffffffff +34930e4,ff000000 34930e8,539a00a7 34930ec,bb1200 34930f0,8040cf90 34930f4,8040cb04 34930f8,ffffffff +34930fc,ff000000 3493100,539b00a8 3493104,bb1200 3493108,8040cf90 349310c,8040cb04 3493110,ffffffff +3493114,ff000000 3493118,5349006c 349311c,17b730c 3493120,8040cf90 3493124,8040cb04 3493128,ffffffff +349312c,ff000000 3493130,53419002 3493134,c 3493138,8040cf90 349313c,8040cdd0 3493140,ffffffff +3493144,ff000000 3493148,3e4190c2 349314c,bd1400 3493150,8040cf90 3493154,8040cb0c 3493158,ffffffff +349315c,ff000000 3493160,3e4190c6 3493164,bd1300 3493168,8040cf90 349316c,8040cb0c 3493170,ffffffff +3493174,ff000000 3493178,534190fa 349317c,bd1400 3493180,8040cf90 3493184,8040cb0c 3493188,ffffffff +349318c,ff000000 3493190,ffffffff 3493194,dd2d0c 3493198,8040cf98 349319c,8040cb04 34931a0,ffffffff +34931a4,ff000000 34931a8,ffffffff 34931ac,147580c 34931b0,8040cfac 34931b4,8040cb04 34931b8,ffffffff +34931bc,ff000000 34931c0,ffffffff 34931c4,bf180c 34931c8,8040cfd8 34931cc,8040cb04 34931d0,ffffffff +34931d4,ff000000 34931d8,ffffffff 34931dc,e9350c 34931e0,8040d004 34931e4,8040cb04 34931e8,ffffffff +34931ec,ff000000 34931f0,ffffffff 34931f4,e7330c 34931f8,8040d02c 34931fc,8040cb04 3493200,ffffffff +3493204,ff000000 3493208,ffffffff 349320c,d1220c 3493210,8040d05c 3493214,8040cb04 3493218,ffffffff +349321c,ff000000 3493220,ffffffff 3493224,db2a0c 3493228,8040d08c 349322c,8040cb04 3493230,ffffffff +3493234,ff000000 3493238,ffffffff 349323c,bb1200 3493240,8040d0a4 3493244,8040cb04 3493248,ffffffff +349324c,ff000000 3493250,ffffffff 3493254,c71b00 3493258,8040d0c0 349325c,8040cb04 3493260,ffffffff +3493264,ff000000 3493268,ffffffff 349326c,d9280c 3493270,8040d0ec 3493274,8040cb04 3493278,ffffffff +349327c,ff000000 3493280,ffffffff 3493284,cd1e0c 3493288,8040d0dc 349328c,8040cb04 3493290,ffffffff +3493294,ff000000 3493298,ffffffff 349329c,10e460c 34932a0,8040d11c 34932a4,8040cb04 34932a8,ffffffff +34932ac,ff000000 34932b0,53410043 34932b4,c6010c 34932b8,8040cf90 34932bc,8040cc18 34932c0,15ffff +34932c4,ff000000 34932c8,53410044 34932cc,c6010c 34932d0,8040cf90 34932d4,8040cc18 34932d8,16ffff +34932dc,ff000000 34932e0,53410045 34932e4,c6010c 34932e8,8040cf90 34932ec,8040cc18 34932f0,17ffff +34932f4,ff000000 34932f8,53410046 34932fc,1776b0c 3493300,8040cf90 3493304,8040cc18 3493308,18ffff +349330c,ff000000 3493310,53410047 3493314,f43f0c 3493318,8040cf90 349331c,8040cc18 3493320,19ffff +3493324,ff000000 3493328,5341005d 349332c,173670c 3493330,8040cf90 3493334,8040cc18 3493338,1cffff +349333c,ff000000 3493340,5341007a 3493344,174680c 3493348,8040cf90 349334c,8040cc18 3493350,1dffff +3493354,ff000000 3493358,534100f9 349335c,176700c 3493360,8040cf90 3493364,8040cc18 3493368,1effff +349336c,ff000000 3493370,53410097 3493374,1766a0c 3493378,8040cf90 349337c,8040cc18 3493380,20ffff +3493384,ff000000 3493388,53410006 349338c,b90a02 3493390,8040cf90 3493394,8040cc50 3493398,10003 +349339c,ff000000 34933a0,5341001c 34933a4,b90a02 34933a8,8040cf90 34933ac,8040cc50 34933b0,10004 +34933b4,ff000000 34933b8,5341001d 34933bc,b90a02 34933c0,8040cf90 34933c4,8040cc50 34933c8,10005 +34933cc,ff000000 34933d0,5341001e 34933d4,b90a02 34933d8,8040cf90 34933dc,8040cc50 34933e0,10006 +34933e4,ff000000 34933e8,5341002a 34933ec,b90a02 34933f0,8040cf90 34933f4,8040cc50 34933f8,10007 +34933fc,ff000000 3493400,53410061 3493404,b90a02 3493408,8040cf90 349340c,8040cc50 3493410,1000a +3493414,ff000000 3493418,53410062 349341c,b80b00 3493420,8040cf90 3493424,8040cc50 3493428,20000 +349342c,ff000000 3493430,53410063 3493434,b80b00 3493438,8040cf90 349343c,8040cc50 3493440,20001 +3493444,ff000000 3493448,53410064 349344c,b80b00 3493450,8040cf90 3493454,8040cc50 3493458,20002 +349345c,ff000000 3493460,53410065 3493464,b80b00 3493468,8040cf90 349346c,8040cc50 3493470,20003 +3493474,ff000000 3493478,5341007c 349347c,b80b00 3493480,8040cf90 3493484,8040cc50 3493488,20004 +349348c,ff000000 3493490,5341007d 3493494,b80b00 3493498,8040cf90 349349c,8040cc50 34934a0,20005 +34934a4,ff000000 34934a8,5341007e 34934ac,b80b00 34934b0,8040cf90 34934b4,8040cc50 34934b8,20006 +34934bc,ff000000 34934c0,5341007f 34934c4,b80b00 34934c8,8040cf90 34934cc,8040cc50 34934d0,20007 +34934d4,ff000000 34934d8,534100a2 34934dc,b80b00 34934e0,8040cf90 34934e4,8040cc50 34934e8,20008 +34934ec,ff000000 34934f0,53410087 34934f4,b80b00 34934f8,8040cf90 34934fc,8040cc50 3493500,20009 +3493504,ff000000 3493508,53410088 349350c,c81c00 3493510,8040cf90 3493514,8040cc50 3493518,40000 +349351c,ff000000 3493520,53410089 3493524,c81c00 3493528,8040cf90 349352c,8040cc50 3493530,40001 +3493534,ff000000 3493538,5341008a 349353c,c81c00 3493540,8040cf90 3493544,8040cc50 3493548,40002 +349354c,ff000000 3493550,5341008b 3493554,c81c00 3493558,8040cf90 349355c,8040cc50 3493560,40003 +3493564,ff000000 3493568,5341008c 349356c,c81c00 3493570,8040cf90 3493574,8040cc50 3493578,40004 +349357c,ff000000 3493580,5341008e 3493584,c81c00 3493588,8040cf90 349358c,8040cc50 3493590,40005 +3493594,ff000000 3493598,5341008f 349359c,c81c00 34935a0,8040cf90 34935a4,8040cc50 34935a8,40006 +34935ac,ff000000 34935b0,534100a3 34935b4,c81c00 34935b8,8040cf90 34935bc,8040cc50 34935c0,40007 +34935c4,ff000000 34935c8,534100a5 34935cc,c81c00 34935d0,8040cf90 34935d4,8040cc50 34935d8,40008 +34935dc,ff000000 34935e0,53410092 34935e4,c81c00 34935e8,8040cf90 34935ec,8040cc50 34935f0,40009 +34935f4,ff000000 34935f8,53410093 34935fc,aa020d 3493600,8040cf90 3493604,8040cc64 3493608,3ffff +349360c,ff000000 3493610,53410094 3493614,aa020d 3493618,8040cf90 349361c,8040cc64 3493620,4ffff +3493624,ff000000 3493628,53410095 349362c,aa020d 3493630,8040cf90 3493634,8040cc64 3493638,5ffff +349363c,ff000000 3493640,534100a6 3493644,aa020d 3493648,8040cf90 349364c,8040cc64 3493650,6ffff +3493654,ff000000 3493658,534100a9 349365c,aa020d 3493660,8040cf90 3493664,8040cc64 3493668,7ffff +349366c,ff000000 3493670,5341009b 3493674,aa020d 3493678,8040cf90 349367c,8040cc64 3493680,8ffff +3493684,ff000000 3493688,5341009f 349368c,aa020d 3493690,8040cf90 3493694,8040cc64 3493698,bffff +349369c,ff000000 34936a0,534100a0 34936a4,aa020d 34936a8,8040cf90 34936ac,8040cc64 34936b0,cffff +34936b4,ff000000 34936b8,534100a1 34936bc,aa020d 34936c0,8040cf90 34936c4,8040cc64 34936c8,dffff +34936cc,ff000000 34936d0,534100e9 34936d4,194130c 34936d8,8040cf90 34936dc,8040cd50 34936e0,ffffffff +34936e4,ff000000 34936e8,534100e4 34936ec,cd1e0c 34936f0,8040cf90 34936f4,8040cd6c 34936f8,ffffffff +34936fc,ff000000 3493700,534100e8 3493704,cd1f0c 3493708,8040cf90 349370c,8040cd88 3493710,ffffffff +3493714,ff000000 3493718,53410073 349371c,b6030c 3493720,8040cf90 3493724,8040cdb8 3493728,6ffff +349372c,ff000000 3493730,53410074 3493734,b6040c 3493738,8040cf90 349373c,8040cdb8 3493740,7ffff +3493744,ff000000 3493748,53410075 349374c,b6050c 3493750,8040cf90 3493754,8040cdb8 3493758,8ffff +349375c,ff000000 3493760,53410076 3493764,b6060c 3493768,8040cf90 349376c,8040cdb8 3493770,9ffff +3493774,ff000000 3493778,53410077 349377c,b6070c 3493780,8040cf90 3493784,8040cdb8 3493788,affff +349378c,ff000000 3493790,53410078 3493794,b6080c 3493798,8040cf90 349379c,8040cdb8 34937a0,bffff +34937a4,ff000000 34937a8,534100d4 34937ac,b6040c 34937b0,8040cf90 34937b4,8040cdb8 34937b8,cffff +34937bc,ff000000 34937c0,534100d2 34937c4,b6060c 34937c8,8040cf90 34937cc,8040cdb8 34937d0,dffff +34937d4,ff000000 34937d8,534100d1 34937dc,b6030c 34937e0,8040cf90 34937e4,8040cdb8 34937e8,effff +34937ec,ff000000 34937f0,534100d3 34937f4,b6080c 34937f8,8040cf90 34937fc,8040cdb8 3493800,fffff +3493804,ff000000 3493808,534100d5 349380c,b6050c 3493810,8040cf90 3493814,8040cdb8 3493818,10ffff +349381c,ff000000 3493820,534100d6 3493824,b6070c 3493828,8040cf90 349382c,8040cdb8 3493830,11ffff +3493834,ff000000 3493838,534100f8 349383c,d1230c 3493840,8040cf90 3493844,8040cbd4 3493848,3ffff +349384c,ff000000 3493850,53149099 3493854,10b450c 3493858,8040cf90 349385c,8040cb04 3493860,ffffffff +3493864,ff000000 3493868,53419048 349386c,f33e0c 3493870,8040cf90 3493874,8040cdec 3493878,ffffffff +349387c,ff000000 3493880,53419003 3493884,193760c 3493888,8040cf90 349388c,8040cb18 3493890,ffffffff +3493894,ff000000 3493898,53419010 349389c,195770d 34938a0,8040cf90 34938a4,8040ccb4 34938a8,3ffff +34938ac,ff000000 34938b0,53419011 34938b4,195770d 34938b8,8040cf90 34938bc,8040ccb4 34938c0,4ffff +34938c4,ff000000 34938c8,53419012 34938cc,195770d 34938d0,8040cf90 34938d4,8040ccb4 34938d8,5ffff +34938dc,ff000000 34938e0,53419013 34938e4,195770d 34938e8,8040cf90 34938ec,8040ccb4 34938f0,6ffff +34938f4,ff000000 34938f8,53419014 34938fc,195770d 3493900,8040cf90 3493904,8040ccb4 3493908,7ffff +349390c,ff000000 3493910,53419015 3493914,195770d 3493918,8040cf90 349391c,8040ccb4 3493920,8ffff +3493924,ff000000 3493928,53419016 349392c,195770d 3493930,8040cf90 3493934,8040ccb4 3493938,bffff +349393c,ff000000 3493940,53419017 3493944,195770d 3493948,8040cf90 349394c,8040ccb4 3493950,cffff +3493954,ff000000 3493958,53419018 349395c,195770d 3493960,8040cf90 3493964,8040ccb4 3493968,dffff +349396c,ff000000 3493980,10000 3493990,20000 34939a0,30000