diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index cf822f7dc2..64021830da 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -75,64 +75,293 @@ static void* sItemDropTex[] = { }; static u8 sItemDropIds[] = { - ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NONE, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, - ITEM00_MAGIC_SMALL, ITEM00_FLEXIBLE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_RUPEE_BLUE, ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, - ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_NONE, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, - ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, - ITEM00_NONE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_NONE, ITEM00_FLEXIBLE, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, - ITEM00_NUTS, ITEM00_NONE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NUTS, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_NONE, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_RUPEE_GREEN, - ITEM00_RUPEE_GREEN, ITEM00_SEEDS, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_BOMBS_A, - ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_SMALL, - ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NONE, ITEM00_RUPEE_GREEN, - ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_ARROWS_SMALL, ITEM00_NONE, ITEM00_ARROWS_MEDIUM, ITEM00_MAGIC_SMALL, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_MAGIC_LARGE, ITEM00_RUPEE_GREEN, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_NONE, ITEM00_RUPEE_GREEN, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_BOMBS_A, - ITEM00_ARROWS_SMALL, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_SMALL, - ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_LARGE, ITEM00_ARROWS_LARGE, ITEM00_ARROWS_MEDIUM, - ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, ITEM00_FLEXIBLE, ITEM00_ARROWS_SMALL, - ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, - ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_LARGE, ITEM00_ARROWS_LARGE, ITEM00_MAGIC_LARGE, - ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, - ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, - ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, - ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_FLEXIBLE, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_NONE, - ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, - ITEM00_BOMBS_A, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, - ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, - ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, - ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_NUTS, ITEM00_NONE, ITEM00_STICK, ITEM00_NONE, ITEM00_NONE, - ITEM00_SEEDS, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_NUTS, - ITEM00_NONE, ITEM00_NUTS, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_RECOVERY_HEART, - ITEM00_NONE, ITEM00_SEEDS, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, - ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_FLEXIBLE, + // 0 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_BLUE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_GREEN, + ITEM00_MAGIC_SMALL, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + ITEM00_FLEXIBLE, + ITEM00_SEEDS, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_RUPEE_BLUE, + + // 1 + ITEM00_RUPEE_GREEN, + ITEM00_MAGIC_SMALL, + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_BLUE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_FLEXIBLE, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + + // 2 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_GREEN, + ITEM00_MAGIC_SMALL, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_FLEXIBLE, + ITEM00_MAGIC_SMALL, + + // 3 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_GREEN, + ITEM00_NUTS, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_SEEDS, + ITEM00_NUTS, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_FLEXIBLE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + + // 4 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_GREEN, + ITEM00_SEEDS, + ITEM00_BOMBS_A, + ITEM00_MAGIC_SMALL, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + + // 5 + ITEM00_RUPEE_GREEN, + ITEM00_MAGIC_SMALL, + ITEM00_RUPEE_GREEN, + ITEM00_NONE, + ITEM00_RUPEE_BLUE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_FLEXIBLE, + ITEM00_SEEDS, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + + // 6 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_BLUE, + ITEM00_NONE, + ITEM00_RUPEE_GREEN, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_ARROWS_SMALL, + ITEM00_NONE, + ITEM00_ARROWS_MEDIUM, + ITEM00_MAGIC_SMALL, + ITEM00_FLEXIBLE, + ITEM00_NONE, + ITEM00_MAGIC_LARGE, + + // 7 + ITEM00_RUPEE_GREEN, + ITEM00_NONE, + ITEM00_RUPEE_BLUE, + ITEM00_NONE, + ITEM00_RUPEE_GREEN, + ITEM00_RECOVERY_HEART, + ITEM00_FLEXIBLE, + ITEM00_BOMBS_A, + ITEM00_ARROWS_SMALL, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_MAGIC_LARGE, + + // 8 + ITEM00_ARROWS_LARGE, + ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_FLEXIBLE, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_LARGE, + ITEM00_ARROWS_LARGE, + + // 9 + ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, + + // 10 + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_FLEXIBLE, + ITEM00_BOMBS_A, + ITEM00_BOMBS_A, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_BOMBS_A, + + // 11 + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + + // 12 + ITEM00_RUPEE_RED, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, + + // 13 + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_NUTS, + ITEM00_NONE, + ITEM00_STICK, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NUTS, + ITEM00_NONE, + ITEM00_NUTS, + ITEM00_RECOVERY_HEART, + ITEM00_SEEDS, + + // 14 + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_SEEDS, + ITEM00_FLEXIBLE, }; static u8 sDropQuantities[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 1, 1, 3, 1, 3, 1, 1, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, // 3 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, // 4 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, // 5 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 6 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 7 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 8 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 9 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, // 10 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 11 + 3, 3, 3, 1, 3, 3, 3, 1, 1, 3, 1, 3, 1, 1, 1, 3, // 12 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 13 + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, // 14 }; void EnItem00_SetupAction(EnItem00* this, EnItem00ActionFunc actionFunc) {