diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index 2afdb692e1..8733dd613b 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -18,8 +18,10 @@ extern u8 gAreaGsFlags[]; #define CHECK_AGE_REQ_SLOT(slot) \ ((gSlotAgeReqs[slot] == AGE_REQ_NONE) || gSlotAgeReqs[slot] == ((void)0, gSaveContext.save.linkAge)) + #define CHECK_AGE_REQ_EQUIP(y, x) \ ((gEquipAgeReqs[y][x] == AGE_REQ_NONE) || (gEquipAgeReqs[y][x] == ((void)0, gSaveContext.save.linkAge))) + #define CHECK_AGE_REQ_ITEM(item) \ ((gItemAgeReqs[item] == AGE_REQ_NONE) || (gItemAgeReqs[item] == ((void)0, gSaveContext.save.linkAge))) diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 4726a7c3d1..e4fcf1fd2b 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -595,31 +595,31 @@ u8 gItemAgeReqs[] = { AGE_REQ_ADULT, // ITEM_ARROW_ICE AGE_REQ_NONE, // ITEM_FARORES_WIND AGE_REQ_CHILD, // ITEM_BOOMERANG - AGE_REQ_NONE, // ITEM_LENS + AGE_REQ_NONE, // ITEM_LENS_OF_TRUTH AGE_REQ_CHILD, // ITEM_MAGIC_BEAN AGE_REQ_ADULT, // ITEM_HAMMER AGE_REQ_ADULT, // ITEM_ARROW_LIGHT AGE_REQ_NONE, // ITEM_NAYRUS_LOVE - AGE_REQ_NONE, // ITEM_BOTTLE - AGE_REQ_NONE, // ITEM_POTION_RED - AGE_REQ_NONE, // ITEM_POTION_GREEN - AGE_REQ_NONE, // ITEM_POTION_BLUE - AGE_REQ_NONE, // ITEM_FAIRY - AGE_REQ_NONE, // ITEM_FISH - AGE_REQ_NONE, // ITEM_MILK_BOTTLE - AGE_REQ_NONE, // ITEM_LETTER_RUTO - AGE_REQ_NONE, // ITEM_BLUE_FIRE - AGE_REQ_NONE, // ITEM_BUG - AGE_REQ_NONE, // ITEM_BIG_POE - AGE_REQ_NONE, // ITEM_MILK_HALF - AGE_REQ_NONE, // ITEM_POE + AGE_REQ_NONE, // ITEM_BOTTLE_EMPTY + AGE_REQ_NONE, // ITEM_BOTTLE_POTION_RED + AGE_REQ_NONE, // ITEM_BOTTLE_POTION_GREEN + AGE_REQ_NONE, // ITEM_BOTTLE_POTION_BLUE + AGE_REQ_NONE, // ITEM_BOTTLE_FAIRY + AGE_REQ_NONE, // ITEM_BOTTLE_FISH + AGE_REQ_NONE, // ITEM_BOTTLE_MILK_FULL + AGE_REQ_NONE, // ITEM_BOTTLE_RUTOS_LETTER + AGE_REQ_NONE, // ITEM_BOTTLE_BLUE_FIRE + AGE_REQ_NONE, // ITEM_BOTTLE_BUG + AGE_REQ_NONE, // ITEM_BOTTLE_BIG_POE + AGE_REQ_NONE, // ITEM_BOTTLE_MILK_HALF + AGE_REQ_NONE, // ITEM_BOTTLE_POE AGE_REQ_CHILD, // ITEM_WEIRD_EGG AGE_REQ_CHILD, // ITEM_CHICKEN - AGE_REQ_CHILD, // ITEM_LETTER_ZELDA + AGE_REQ_CHILD, // ITEM_ZELDAS_LETTER AGE_REQ_CHILD, // ITEM_MASK_KEATON AGE_REQ_CHILD, // ITEM_MASK_SKULL AGE_REQ_CHILD, // ITEM_MASK_SPOOKY - AGE_REQ_CHILD, // ITEM_MASK_BUNNY + AGE_REQ_CHILD, // ITEM_MASK_BUNNY_HOOD AGE_REQ_CHILD, // ITEM_MASK_GORON AGE_REQ_CHILD, // ITEM_MASK_ZORA AGE_REQ_CHILD, // ITEM_MASK_GERUDO @@ -637,8 +637,8 @@ u8 gItemAgeReqs[] = { AGE_REQ_ADULT, // ITEM_EYE_DROPS AGE_REQ_ADULT, // ITEM_CLAIM_CHECK AGE_REQ_ADULT, // ITEM_BOW_FIRE - AGE_REQ_ADULT, // ITEM_BOW_ARROW_ICE - AGE_REQ_ADULT, // ITEM_BOW_ARROW_LIGHT + AGE_REQ_ADULT, // ITEM_BOW_ICE + AGE_REQ_ADULT, // ITEM_BOW_LIGHT AGE_REQ_CHILD, // ITEM_SWORD_KOKIRI AGE_REQ_ADULT, // ITEM_SWORD_MASTER AGE_REQ_ADULT, // ITEM_SWORD_BIGGORON @@ -661,11 +661,11 @@ u8 gItemAgeReqs[] = { AGE_REQ_NONE, // ITEM_BOMB_BAG_30 AGE_REQ_NONE, // ITEM_BOMB_BAG_40 AGE_REQ_CHILD, // ITEM_STRENGTH_GORONS_BRACELET - AGE_REQ_ADULT, // ITEM_GAUNTLETS_SILVER - AGE_REQ_ADULT, // ITEM_GAUNTLETS_GOLD + AGE_REQ_ADULT, // ITEM_STRENGTH_SILVER_GAUNTLETS + AGE_REQ_ADULT, // ITEM_STRENGTH_GOLD_GAUNTLETS AGE_REQ_NONE, // ITEM_SCALE_SILVER AGE_REQ_NONE, // ITEM_SCALE_GOLDEN - AGE_REQ_ADULT, // ITEM_SWORD_KNIFE + AGE_REQ_ADULT, // ITEM_GIANTS_KNIFE }; u8 gAreaGsFlags[] = {