diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o index fd0fd8da7..af7cf7292 100644 Binary files a/ASM/build/bundle.o and b/ASM/build/bundle.o differ diff --git a/ASM/c/item_table.c b/ASM/c/item_table.c index c8379060a..e174ac807 100644 --- a/ASM/c/item_table.c +++ b/ASM/c/item_table.c @@ -53,7 +53,7 @@ item_row_t item_table[GI_RANDO_MAX] = { [GI_MAGIC_BEAN] = ITEM_ROW(0x53, BROWN_CHEST, 0x10, -1, 0x0048, 0x00F3, 0x3E, no_upgrade, no_effect, -1, -1, NULL), // Magic Bean [GI_MASK_SKULL] = ITEM_ROW(0x53, GILDED_CHEST, 0x25, -1, 0x0010, 0x0136, 0x4F, no_upgrade, trade_quest_upgrade, 0x25, -1, NULL), // Skull Mask [GI_MASK_SPOOKY] = ITEM_ROW(0x53, GILDED_CHEST, 0x26, -1, 0x0011, 0x0135, 0x32, no_upgrade, trade_quest_upgrade, 0x26, -1, NULL), // Spooky Mask - [GI_CHICKEN] = ITEM_ROW(0x53, GILDED_CHEST, 0x22, -1, 0x000B, 0x0109, 0x44, no_upgrade, trade_quest_upgrade, 0x22, -1, NULL), // Chicken + [GI_CHICKEN] = ITEM_ROW(0x53, GILDED_CHEST, 0x22, -1, 0x9097, 0x0109, 0x44, no_upgrade, trade_quest_upgrade, 0x22, -1, NULL), // Chicken [GI_MASK_KEATON] = ITEM_ROW(0x53, GILDED_CHEST, 0x24, -1, 0x0012, 0x0134, 0x31, no_upgrade, trade_quest_upgrade, 0x24, -1, NULL), // Keaton Mask [GI_MASK_BUNNY_HOOD] = ITEM_ROW(0x53, GILDED_CHEST, 0x27, -1, 0x0013, 0x0137, 0x50, no_upgrade, trade_quest_upgrade, 0x27, -1, NULL), // Bunny Hood [GI_MASK_TRUTH] = ITEM_ROW(0x53, GILDED_CHEST, 0x2B, -1, 0x0017, 0x0138, 0x51, no_upgrade, trade_quest_upgrade, 0x2B, -1, NULL), // Mask of Truth diff --git a/Messages.py b/Messages.py index b6f35f8a2..0fe17c948 100644 --- a/Messages.py +++ b/Messages.py @@ -209,6 +209,7 @@ (0x0099, "\x08\x13\x1BYou found \x05\x41Ruto's Letter\x05\x40 in a\x01bottle! Show it to King Zora."), (0x9099, "\x08\x13\x1BYou found \x05\x41a letter in a bottle\x05\x40!\x01You remove the letter from the\x01bottle, freeing it for other uses."), (0x009A, "\x08\x13\x21You got a \x05\x41Weird Egg\x05\x40!\x01Feels like there's something\x01moving inside!"), + (0x9097, "\x08\x13\x2EYou got a \x05\x41Chicken, \x05\x40one\x01of Anju's prized hens! It fits \x01in your pocket."), (0x00A4, "\x08\x13\x3BYou got the \x05\x42Kokiri Sword\x05\x40!\x01This is a hidden treasure of\x01the Kokiri."), (0x00A7, "\x08\x13\x01Now you can carry\x01many \x05\x41Deku Nuts\x05\x40!\x01You can hold up to \x05\x4630\x05\x40 nuts!"), (0x00A8, "\x08\x13\x01You can now carry even\x01more \x05\x41Deku Nuts\x05\x40! You can carry\x01up to \x05\x4640\x05\x41 \x05\x40nuts!"), @@ -260,7 +261,7 @@ (0x9094, "\x08\x06\x28You have learned the\x01\x06\x2D\x05\x46Requiem of Spirit\x05\x40!"), (0x9095, "\x08\x06\x28You have learned the\x01\x06\x28\x05\x45Nocturne of Shadow\x05\x40!"), (0x9096, "\x08\x06\x28You have learned the\x01\x06\x32\x05\x44Prelude of Light\x05\x40!"), - # 0x9097 and 0x9098 unused + # 0x9098 unused # 0x9099 used above (0x909A, "\x08\x06\x15You've learned \x05\x43Zelda's Lullaby\x05\x40!"), (0x909B, "\x08\x06\x11You've learned \x05\x41Epona's Song\x05\x40!"), diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt index 6f2ff8003..46bfb06a5 100644 --- a/data/generated/rom_patch.txt +++ b/data/generated/rom_patch.txt @@ -41912,7 +41912,7 @@ fec1fc,9000000 34acddc,8041d214 34acde0,26ffff 34acde4,ff000000 -34acdec,5322000b +34acdec,53229097 34acdf0,109440c 34acdf4,8041d5d8 34acdf8,8041d214