From 12bc93dc789f51382da801ea0fafdbc91f38b9a6 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 17 Oct 2020 17:07:54 -0300 Subject: [PATCH] Review changes --- include/constants/item_config.h | 2 +- src/data/items.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/constants/item_config.h b/include/constants/item_config.h index 4d9a5f068..666ed9adf 100644 --- a/include/constants/item_config.h +++ b/include/constants/item_config.h @@ -26,7 +26,7 @@ #define P_QUICK_BALL_MODIFIER GEN_7 // In Gen5+, Quick Ball's catch multiplier is x5 instead of x4. #define P_DREAM_BALL_MODIFIER GEN_8 // In Gen8+, Dream Ball's catch multiplier is x4 when the target is asleep. #define P_TIMER_BALL_MODIFIER GEN_7 // In Gen5+, Timer Ball's effectiveness increases by x0.3 per turn instead of x0.1 -#define P_DIVE_BALL_MODIFIER GEN_3 // In Gen4+, Dive Ball's effectiveness increases by when Surfing or Fishing. +#define P_DIVE_BALL_MODIFIER GEN_7 // In Gen4+, Dive Ball's effectiveness increases by when Surfing or Fishing. #define P_HEAVY_BALL_MODIFIER GEN_7 // In Gen7+, Heavy Ball's ranges change. See Cmd_handleballthrow. #define P_NEST_BALL_MODIFIER GEN_7 // Nest Ball's formula varies depending on the Gen. See Cmd_handleballthrow. diff --git a/src/data/items.h b/src/data/items.h index ee7865898..070eca422 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1281,12 +1281,13 @@ const struct Item gItems[] = { .name = _("Escape Rope"), .itemId = ITEM_ESCAPE_ROPE, - .price = 550, .description = sEscapeRopeDesc, #if P_KEY_ESCAPE_ROPE >= GEN_8 + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #else + .price = 550, .importance = 0, .pocket = POCKET_ITEMS, #endif