diff --git a/include/item.h b/include/item.h index 9090789437..46fe42e37b 100644 --- a/include/item.h +++ b/include/item.h @@ -22,6 +22,7 @@ struct Item u8 battleUsage; ItemUseFunc battleUseFunc; u8 secondaryId; + u8 flingPower; }; struct BagPocket @@ -75,5 +76,6 @@ ItemUseFunc ItemId_GetFieldFunc(u16 itemId); u8 ItemId_GetBattleUsage(u16 itemId); ItemUseFunc ItemId_GetBattleFunc(u16 itemId); u8 ItemId_GetSecondaryId(u16 itemId); +u8 ItemId_GetFlingPower(u16 itemId); #endif // GUARD_ITEM_H diff --git a/src/data/items.h b/src/data/items.h index 1dbc740352..226b1ab255 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -378,6 +378,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_SUPER_POTION] = @@ -392,6 +393,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_HYPER_POTION] = @@ -406,6 +408,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_MAX_POTION] = @@ -420,6 +423,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_FULL_RESTORE] = @@ -434,6 +438,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_REVIVE] = @@ -447,6 +452,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_MAX_REVIVE] = @@ -460,6 +466,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_FRESH_WATER] = @@ -474,6 +481,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_SODA_POP] = @@ -488,6 +496,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_LEMONADE] = @@ -502,6 +511,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_MOOMOO_MILK] = @@ -516,6 +526,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ENERGY_POWDER] = @@ -529,6 +540,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ENERGY_ROOT] = @@ -542,6 +554,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_HEAL_POWDER] = @@ -555,6 +568,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_REVIVAL_HERB] = @@ -568,6 +582,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ANTIDOTE] = @@ -581,6 +596,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_PARALYZE_HEAL] = @@ -594,6 +610,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_BURN_HEAL] = @@ -607,6 +624,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ICE_HEAL] = @@ -620,6 +638,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_AWAKENING] = @@ -633,6 +652,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_FULL_HEAL] = @@ -646,6 +666,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ETHER] = @@ -660,6 +681,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 30, }, [ITEM_MAX_ETHER] = @@ -674,6 +696,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 30, }, [ITEM_ELIXIR] = @@ -688,6 +711,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 30, }, [ITEM_MAX_ELIXIR] = @@ -702,6 +726,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 30, }, [ITEM_BERRY_JUICE] = @@ -717,6 +742,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_SACRED_ASH] = @@ -728,6 +754,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_SacredAsh, + .flingPower = 30, }, [ITEM_SWEET_HEART] = @@ -742,6 +769,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_MAX_HONEY] = // Todo @@ -766,6 +794,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RAGE_CANDY_BAR] = // Todo @@ -777,6 +806,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LAVA_COOKIE] = @@ -790,6 +820,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_OLD_GATEAU] = @@ -803,6 +834,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_CASTELIACONE] = // Todo @@ -814,6 +846,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LUMIOSE_GALETTE] = // Todo @@ -825,6 +858,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SHALOUR_SABLE] = // Todo @@ -836,6 +870,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BIG_MALASADA] = @@ -849,6 +884,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, // Vitamins @@ -862,6 +898,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_PROTEIN] = @@ -873,6 +910,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_IRON] = @@ -884,6 +922,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_CALCIUM] = @@ -895,6 +934,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_ZINC] = @@ -906,6 +946,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_CARBOS] = @@ -917,6 +958,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_PP_UP] = @@ -928,6 +970,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPUp, + .flingPower = 30, }, [ITEM_PP_MAX] = @@ -939,6 +982,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPUp, + .flingPower = 30, }, // EV Feathers @@ -952,6 +996,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_MUSCLE_FEATHER] = @@ -963,6 +1008,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_RESIST_FEATHER] = @@ -974,6 +1020,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_GENIUS_FEATHER] = @@ -985,6 +1032,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_CLEVER_FEATHER] = @@ -996,6 +1044,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_SWIFT_FEATHER] = @@ -1007,6 +1056,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, // Ability Modifiers @@ -1045,6 +1095,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ADAMANT_MINT] = // Todo @@ -1056,6 +1107,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_NAUGHTY_MINT] = // Todo @@ -1067,6 +1119,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BRAVE_MINT] = // Todo @@ -1078,6 +1131,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BOLD_MINT] = // Todo @@ -1089,6 +1143,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_IMPISH_MINT] = // Todo @@ -1100,6 +1155,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LAX_MINT] = // Todo @@ -1111,6 +1167,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RELAXED_MINT] = // Todo @@ -1122,6 +1179,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MODEST_MINT] = // Todo @@ -1133,6 +1191,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MILD_MINT] = // Todo @@ -1144,6 +1203,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RASH_MINT] = // Todo @@ -1155,6 +1215,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_QUIET_MINT] = // Todo @@ -1166,6 +1227,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CALM_MINT] = // Todo @@ -1177,6 +1239,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_GENTLE_MINT] = // Todo @@ -1188,6 +1251,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CAREFUL_MINT] = // Todo @@ -1199,6 +1263,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SASSY_MINT] = // Todo @@ -1210,6 +1275,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_TIMID_MINT] = // Todo @@ -1221,6 +1287,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_HASTY_MINT] = // Todo @@ -1232,6 +1299,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_JOLLY_MINT] = // Todo @@ -1243,6 +1311,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_NAIVE_MINT] = // Todo @@ -1254,6 +1323,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SERIOUS_MINT] = // Todo @@ -1265,6 +1335,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // Candy @@ -1278,6 +1349,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_RareCandy, + .flingPower = 30, }, [ITEM_EXP_CANDY_XS] = // Todo @@ -1289,6 +1361,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EXP_CANDY_S] = // Todo @@ -1300,6 +1373,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EXP_CANDY_M] = // Todo @@ -1311,6 +1385,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EXP_CANDY_L] = // Todo @@ -1322,6 +1397,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EXP_CANDY_XL] = // Todo @@ -1333,6 +1409,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_DYNAMAX_CANDY] = // Todo @@ -1344,6 +1421,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Medicinal Flutes @@ -1359,6 +1437,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_YELLOW_FLUTE] = @@ -1372,6 +1451,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_RED_FLUTE] = @@ -1385,6 +1465,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, // Encounter-modifying Flutes @@ -1399,6 +1480,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, + .flingPower = 30, }, [ITEM_WHITE_FLUTE] = @@ -1411,6 +1493,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, + .flingPower = 30, }, // Encounter Modifiers @@ -1425,6 +1508,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, + .flingPower = 30, }, [ITEM_SUPER_REPEL] = @@ -1437,6 +1521,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, + .flingPower = 30, }, [ITEM_MAX_REPEL] = @@ -1449,6 +1534,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, + .flingPower = 30, }, [ITEM_LURE] = // Todo @@ -1499,6 +1585,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope, + .flingPower = 30, }, // X Items @@ -1514,6 +1601,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_DEFENSE] = @@ -1527,6 +1615,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_SP_ATK] = @@ -1540,6 +1629,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_SP_DEF] = @@ -1553,6 +1643,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_SPEED] = @@ -1566,6 +1657,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_ACCURACY] = @@ -1579,6 +1671,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_DIRE_HIT] = @@ -1592,6 +1685,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_GUARD_SPEC] = @@ -1605,6 +1699,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_POKE_DOLL] = @@ -1618,6 +1713,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_Escape, + .flingPower = 30, }, [ITEM_FLUFFY_TAIL] = @@ -1631,6 +1727,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_Escape, + .flingPower = 30, }, [ITEM_POKE_TOY] = // Todo @@ -1642,6 +1739,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_MAX_MUSHROOMS] = // Todo @@ -1653,6 +1751,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Treasures @@ -1666,6 +1765,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_GOLD_BOTTLE_CAP] = // Todo @@ -1677,6 +1777,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_NUGGET] = @@ -1688,6 +1789,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BIG_NUGGET] = // Todo @@ -1699,6 +1801,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_TINY_MUSHROOM] = @@ -1710,6 +1813,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BIG_MUSHROOM] = @@ -1721,6 +1825,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BALM_MUSHROOM] = // Todo @@ -1732,6 +1837,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_PEARL] = @@ -1743,6 +1849,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BIG_PEARL] = @@ -1754,6 +1861,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_PEARL_STRING] = // Todo @@ -1765,6 +1873,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_STARDUST] = @@ -1776,6 +1885,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_STAR_PIECE] = @@ -1787,6 +1897,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_COMET_SHARD] = // Todo @@ -1798,6 +1909,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SHOAL_SALT] = @@ -1809,6 +1921,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SHOAL_SHELL] = @@ -1820,6 +1933,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RED_SHARD] = @@ -1831,6 +1945,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BLUE_SHARD] = @@ -1842,6 +1957,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_YELLOW_SHARD] = @@ -1853,6 +1969,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_GREEN_SHARD] = @@ -1864,6 +1981,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_HEART_SCALE] = @@ -1875,6 +1993,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_HONEY] = @@ -1886,6 +2005,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RARE_BONE] = @@ -1897,6 +2017,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_ODD_KEYSTONE] = @@ -1908,6 +2029,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_PRETTY_FEATHER] = @@ -1919,6 +2041,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 20, }, [ITEM_RELIC_COPPER] = // Todo @@ -1930,6 +2053,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RELIC_SILVER] = // Todo @@ -1941,6 +2065,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RELIC_GOLD] = // Todo @@ -1952,6 +2077,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RELIC_VASE] = // Todo @@ -1963,6 +2089,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RELIC_BAND] = // Todo @@ -1974,6 +2101,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RELIC_STATUE] = // Todo @@ -1985,6 +2113,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RELIC_CROWN] = // Todo @@ -1996,6 +2125,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_STRANGE_SOUVENIR] = // Todo @@ -2007,6 +2137,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Fossils @@ -2026,6 +2157,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_DOME_FOSSIL] = @@ -2043,6 +2175,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_OLD_AMBER] = @@ -2060,6 +2193,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_ROOT_FOSSIL] = @@ -2077,6 +2211,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_CLAW_FOSSIL] = @@ -2094,6 +2229,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_ARMOR_FOSSIL] = @@ -2105,6 +2241,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_SKULL_FOSSIL] = @@ -2116,6 +2253,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_COVER_FOSSIL] = @@ -2127,6 +2265,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_PLUME_FOSSIL] = @@ -2138,6 +2277,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_JAW_FOSSIL] = @@ -2149,6 +2289,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_SAIL_FOSSIL] = @@ -2160,6 +2301,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_FOSSILIZED_BIRD] = // Todo @@ -2171,6 +2313,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_FOSSILIZED_FISH] = // Todo @@ -2182,6 +2325,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_FOSSILIZED_DRAKE] = // Todo @@ -2193,6 +2337,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_FOSSILIZED_DINO] = // Todo @@ -2204,6 +2349,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, // Mulch @@ -2217,6 +2363,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_DAMP_MULCH] = // Todo @@ -2228,6 +2375,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_STABLE_MULCH] = // Todo @@ -2239,6 +2387,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_GOOEY_MULCH] = // Todo @@ -2250,6 +2399,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RICH_MULCH] = // Todo @@ -2261,6 +2411,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SURPRISE_MULCH] = // Todo @@ -2272,6 +2423,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BOOST_MULCH] = // Todo @@ -2283,6 +2435,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_AMAZE_MULCH] = // Todo @@ -2294,6 +2447,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Apricorns @@ -2384,6 +2538,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 50, }, [ITEM_GALARICA_TWIG] = // Todo @@ -2395,6 +2550,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_ARMORITE_ORE] = // Todo @@ -2406,6 +2562,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_DYNITE_ORE] = // Todo @@ -2576,6 +2733,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_WATER_STONE] = @@ -2587,6 +2745,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_THUNDER_STONE] = @@ -2598,6 +2757,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_LEAF_STONE] = @@ -2609,6 +2769,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_ICE_STONE] = @@ -2620,6 +2781,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_SUN_STONE] = @@ -2631,6 +2793,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_MOON_STONE] = @@ -2653,6 +2816,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_DUSK_STONE] = @@ -2664,6 +2828,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 80, }, [ITEM_DAWN_STONE] = @@ -2675,6 +2840,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 80, }, [ITEM_SWEET_APPLE] = // Todo @@ -2686,6 +2852,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_TART_APPLE] = // Todo @@ -2697,6 +2864,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_CRACKED_POT] = // Todo @@ -2708,6 +2876,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_CHIPPED_POT] = // Todo @@ -2719,6 +2888,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GALARICA_CUFF] = // Todo @@ -2730,6 +2900,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_GALARICA_WREATH] = // Todo @@ -2741,6 +2912,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_DRAGON_SCALE] = @@ -2754,6 +2926,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_UPGRADE] = @@ -2766,6 +2939,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_PROTECTOR] = @@ -2777,6 +2951,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ELECTIRIZER] = @@ -2788,6 +2963,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MAGMARIZER] = @@ -2799,6 +2975,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_DUBIOUS_DISC] = @@ -2810,6 +2987,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 50, }, [ITEM_REAPER_CLOTH] = @@ -2821,6 +2999,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PRISM_SCALE] = @@ -2832,6 +3011,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_WHIPPED_DREAM] = @@ -2843,6 +3023,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SACHET] = @@ -2854,6 +3035,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_OVAL_STONE] = @@ -2865,6 +3047,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_STRAWBERRY_SWEET] = // Todo @@ -2876,6 +3059,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LOVE_SWEET] = // Todo @@ -2887,6 +3071,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BERRY_SWEET] = // Todo @@ -2898,6 +3083,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CLOVER_SWEET] = // Todo @@ -2909,6 +3095,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_FLOWER_SWEET] = // Todo @@ -2920,6 +3107,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_STAR_SWEET] = // Todo @@ -2931,6 +3119,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RIBBON_SWEET] = // Todo @@ -2942,6 +3131,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_EVERSTONE] = @@ -2954,6 +3144,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Nectars @@ -2974,6 +3165,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .flingPower = 10, }, [ITEM_YELLOW_NECTAR] = @@ -2992,6 +3184,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .flingPower = 10, }, [ITEM_PINK_NECTAR] = @@ -3010,6 +3203,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .flingPower = 10, }, [ITEM_PURPLE_NECTAR] = @@ -3028,6 +3222,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .flingPower = 10, }, // Plates @@ -3044,6 +3239,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, + .flingPower = 90, }, [ITEM_SPLASH_PLATE] = @@ -3058,6 +3254,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, + .flingPower = 90, }, [ITEM_ZAP_PLATE] = @@ -3072,6 +3269,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, + .flingPower = 90, }, [ITEM_MEADOW_PLATE] = @@ -3086,6 +3284,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, + .flingPower = 90, }, [ITEM_ICICLE_PLATE] = @@ -3100,6 +3299,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, + .flingPower = 90, }, [ITEM_FIST_PLATE] = @@ -3114,6 +3314,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, + .flingPower = 90, }, [ITEM_TOXIC_PLATE] = @@ -3128,6 +3329,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, + .flingPower = 90, }, [ITEM_EARTH_PLATE] = @@ -3142,6 +3344,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, + .flingPower = 90, }, [ITEM_SKY_PLATE] = @@ -3156,6 +3359,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, + .flingPower = 90, }, [ITEM_MIND_PLATE] = @@ -3170,6 +3374,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, + .flingPower = 90, }, [ITEM_INSECT_PLATE] = @@ -3184,6 +3389,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, + .flingPower = 90, }, [ITEM_STONE_PLATE] = @@ -3198,6 +3404,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, + .flingPower = 90, }, [ITEM_SPOOKY_PLATE] = @@ -3212,6 +3419,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, + .flingPower = 90, }, [ITEM_DRACO_PLATE] = @@ -3226,6 +3434,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, + .flingPower = 90, }, [ITEM_DREAD_PLATE] = @@ -3240,6 +3449,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, + .flingPower = 90, }, [ITEM_IRON_PLATE] = @@ -3254,6 +3464,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, + .flingPower = 90, }, [ITEM_PIXIE_PLATE] = @@ -3268,6 +3479,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, + .flingPower = 90, }, // Drives @@ -3283,6 +3495,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, + .flingPower = 70, }, [ITEM_SHOCK_DRIVE] = @@ -3296,6 +3509,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, + .flingPower = 70, }, [ITEM_BURN_DRIVE] = @@ -3309,6 +3523,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, + .flingPower = 70, }, [ITEM_CHILL_DRIVE] = @@ -3322,6 +3537,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, + .flingPower = 70, }, // Memories @@ -3338,6 +3554,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, + .flingPower = 50, }, [ITEM_WATER_MEMORY] = @@ -3352,6 +3569,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, + .flingPower = 50, }, [ITEM_ELECTRIC_MEMORY] = @@ -3366,6 +3584,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, + .flingPower = 50, }, [ITEM_GRASS_MEMORY] = @@ -3380,6 +3599,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, + .flingPower = 50, }, [ITEM_ICE_MEMORY] = @@ -3394,6 +3614,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, + .flingPower = 50, }, [ITEM_FIGHTING_MEMORY] = @@ -3408,6 +3629,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, + .flingPower = 50, }, [ITEM_POISON_MEMORY] = @@ -3422,6 +3644,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, + .flingPower = 50, }, [ITEM_GROUND_MEMORY] = @@ -3436,6 +3659,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, + .flingPower = 50, }, [ITEM_FLYING_MEMORY] = @@ -3450,6 +3674,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, + .flingPower = 50, }, [ITEM_PSYCHIC_MEMORY] = @@ -3464,6 +3689,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, + .flingPower = 50, }, [ITEM_BUG_MEMORY] = @@ -3478,6 +3704,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, + .flingPower = 50, }, [ITEM_ROCK_MEMORY] = @@ -3492,6 +3719,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, + .flingPower = 50, }, [ITEM_GHOST_MEMORY] = @@ -3506,6 +3734,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, + .flingPower = 50, }, [ITEM_DRAGON_MEMORY] = @@ -3520,6 +3749,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, + .flingPower = 50, }, [ITEM_DARK_MEMORY] = @@ -3534,6 +3764,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, + .flingPower = 50, }, [ITEM_STEEL_MEMORY] = @@ -3548,6 +3779,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, + .flingPower = 50, }, [ITEM_FAIRY_MEMORY] = @@ -3562,6 +3794,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, + .flingPower = 50, }, [ITEM_RUSTED_SWORD] = // Todo @@ -3635,6 +3868,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_CHARIZARDITE_X] = @@ -3647,6 +3881,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_CHARIZARDITE_Y] = @@ -3659,6 +3894,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BLASTOISINITE] = @@ -3671,6 +3907,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BEEDRILLITE] = @@ -3683,6 +3920,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_PIDGEOTITE] = @@ -3695,6 +3933,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ALAKAZITE] = @@ -3707,6 +3946,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SLOWBRONITE] = @@ -3719,6 +3959,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GENGARITE] = @@ -3731,6 +3972,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_KANGASKHANITE] = @@ -3743,6 +3985,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_PINSIRITE] = @@ -3755,6 +3998,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GYARADOSITE] = @@ -3767,6 +4011,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_AERODACTYLITE] = @@ -3779,6 +4024,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MEWTWONITE_X] = @@ -3791,6 +4037,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MEWTWONITE_Y] = @@ -3803,6 +4050,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_AMPHAROSITE] = @@ -3815,6 +4063,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_STEELIXITE] = @@ -3827,6 +4076,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SCIZORITE] = @@ -3839,6 +4089,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_HERACRONITE] = @@ -3851,6 +4102,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_HOUNDOOMINITE] = @@ -3863,6 +4115,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_TYRANITARITE] = @@ -3875,6 +4128,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SCEPTILITE] = @@ -3887,6 +4141,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BLAZIKENITE] = @@ -3899,6 +4154,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SWAMPERTITE] = @@ -3911,6 +4167,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GARDEVOIRITE] = @@ -3923,6 +4180,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SABLENITE] = @@ -3935,6 +4193,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MAWILITE] = @@ -3947,6 +4206,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_AGGRONITE] = @@ -3959,6 +4219,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MEDICHAMITE] = @@ -3971,6 +4232,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MANECTITE] = @@ -3983,6 +4245,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SHARPEDONITE] = @@ -3995,6 +4258,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_CAMERUPTITE] = @@ -4007,6 +4271,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ALTARIANITE] = @@ -4019,6 +4284,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BANETTITE] = @@ -4031,6 +4297,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ABSOLITE] = @@ -4043,6 +4310,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GLALITITE] = @@ -4055,6 +4323,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SALAMENCITE] = @@ -4067,6 +4336,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_METAGROSSITE] = @@ -4079,6 +4349,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_LATIASITE] = @@ -4091,6 +4362,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_LATIOSITE] = @@ -4103,6 +4375,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_LOPUNNITE] = @@ -4115,6 +4388,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GARCHOMPITE] = @@ -4127,6 +4401,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_LUCARIONITE] = @@ -4139,6 +4414,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ABOMASITE] = @@ -4151,6 +4427,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GALLADITE] = @@ -4163,6 +4440,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_AUDINITE] = @@ -4175,6 +4453,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_DIANCITE] = @@ -4187,6 +4466,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, // Gems @@ -4912,6 +5192,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LEEK] = @@ -4924,6 +5205,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_THICK_CLUB] = @@ -4936,6 +5218,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 90, }, [ITEM_LUCKY_PUNCH] = @@ -4948,6 +5231,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 40, }, [ITEM_METAL_POWDER] = @@ -4960,6 +5244,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_QUICK_POWDER] = @@ -4972,6 +5257,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_DEEP_SEA_SCALE] = @@ -4984,6 +5270,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_DEEP_SEA_TOOTH] = @@ -4996,6 +5283,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 90, }, [ITEM_SOUL_DEW] = @@ -5013,6 +5301,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_ADAMANT_ORB] = @@ -5026,6 +5315,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_LUSTROUS_ORB] = @@ -5039,6 +5329,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_GRISEOUS_ORB] = @@ -5052,6 +5343,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, // Incenses @@ -5067,6 +5359,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LAX_INCENSE] = @@ -5080,6 +5373,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ODD_INCENSE] = @@ -5093,6 +5387,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ROCK_INCENSE] = @@ -5106,6 +5401,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_FULL_INCENSE] = @@ -5119,6 +5415,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WAVE_INCENSE] = @@ -5132,6 +5429,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ROSE_INCENSE] = @@ -5145,6 +5443,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LUCK_INCENSE] = @@ -5158,6 +5457,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PURE_INCENSE] = @@ -5170,6 +5470,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // Contest Scarves @@ -5183,6 +5484,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BLUE_SCARF] = @@ -5194,6 +5496,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PINK_SCARF] = @@ -5205,6 +5508,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_GREEN_SCARF] = @@ -5216,6 +5520,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_YELLOW_SCARF] = @@ -5227,6 +5532,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // EV Gain Modifiers @@ -5241,6 +5547,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_POWER_WEIGHT] = @@ -5255,6 +5562,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_HP, + .flingPower = 70, }, [ITEM_POWER_BRACER] = @@ -5269,6 +5577,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_ATK, + .flingPower = 70, }, [ITEM_POWER_BELT] = @@ -5283,6 +5592,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_DEF, + .flingPower = 70, }, [ITEM_POWER_LENS] = @@ -5297,6 +5607,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPATK, + .flingPower = 70, }, [ITEM_POWER_BAND] = @@ -5311,6 +5622,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPDEF, + .flingPower = 70, }, [ITEM_POWER_ANKLET] = @@ -5325,6 +5637,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPEED, + .flingPower = 70, }, // Type-boosting Held Items @@ -5340,6 +5653,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHARCOAL] = @@ -5353,6 +5667,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_MYSTIC_WATER] = @@ -5366,6 +5681,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_MAGNET] = @@ -5379,6 +5695,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_MIRACLE_SEED] = @@ -5392,6 +5709,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_NEVER_MELT_ICE] = @@ -5405,6 +5723,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BLACK_BELT] = @@ -5418,6 +5737,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_POISON_BARB] = @@ -5431,6 +5751,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 70, }, [ITEM_SOFT_SAND] = @@ -5444,6 +5765,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SHARP_BEAK] = @@ -5457,6 +5779,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 50, }, [ITEM_TWISTED_SPOON] = @@ -5470,6 +5793,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SILVER_POWDER] = @@ -5483,6 +5807,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_HARD_STONE] = @@ -5496,6 +5821,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_SPELL_TAG] = @@ -5509,6 +5835,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_DRAGON_FANG] = @@ -5522,6 +5849,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 70, }, [ITEM_BLACK_GLASSES] = @@ -5535,6 +5863,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_METAL_COAT] = @@ -5548,6 +5877,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Choice Items @@ -5562,6 +5892,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHOICE_SPECS] = @@ -5574,6 +5905,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHOICE_SCARF] = @@ -5586,6 +5918,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // Status Orbs @@ -5600,6 +5933,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_TOXIC_ORB] = @@ -5612,6 +5946,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Weather Rocks @@ -5626,6 +5961,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_HEAT_ROCK] = @@ -5638,6 +5974,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_SMOOTH_ROCK] = @@ -5650,6 +5987,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ICY_ROCK] = @@ -5662,6 +6000,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 40, }, // Terrain Seeds @@ -5677,6 +6016,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PSYCHIC_SEED] = @@ -5690,6 +6030,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MISTY_SEED] = @@ -5703,6 +6044,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_GRASSY_SEED] = @@ -5716,6 +6058,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // Type-activated Stat Modifiers @@ -5731,6 +6074,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_CELL_BATTERY] = @@ -5744,6 +6088,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LUMINOUS_MOSS] = @@ -5757,6 +6102,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SNOWBALL] = @@ -5770,6 +6116,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Misc. Held Items @@ -5785,6 +6132,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WHITE_HERB] = @@ -5797,6 +6145,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_EXP_SHARE] = @@ -5809,6 +6158,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_QUICK_CLAW] = @@ -5822,6 +6172,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SOOTHE_BELL] = @@ -5834,6 +6185,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MENTAL_HERB] = @@ -5846,6 +6198,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_KINGS_ROCK] = @@ -5859,6 +6212,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_AMULET_COIN] = @@ -5872,6 +6226,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_CLEANSE_TAG] = @@ -5884,6 +6239,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SMOKE_BALL] = @@ -5896,6 +6252,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_FOCUS_BAND] = @@ -5909,6 +6266,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LUCKY_EGG] = @@ -5921,6 +6279,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SCOPE_LENS] = @@ -5933,6 +6292,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LEFTOVERS] = @@ -5946,6 +6306,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SHELL_BELL] = @@ -5959,6 +6320,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_WIDE_LENS] = @@ -5972,6 +6334,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MUSCLE_BAND] = @@ -5985,6 +6348,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WISE_GLASSES] = @@ -5998,6 +6362,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_EXPERT_BELT] = @@ -6011,6 +6376,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LIGHT_CLAY] = @@ -6023,6 +6389,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LIFE_ORB] = @@ -6035,6 +6402,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_POWER_HERB] = @@ -6047,6 +6415,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_FOCUS_SASH] = @@ -6059,6 +6428,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ZOOM_LENS] = @@ -6072,6 +6442,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_METRONOME] = @@ -6085,6 +6456,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_IRON_BALL] = @@ -6097,6 +6469,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 130, }, [ITEM_LAGGING_TAIL] = @@ -6109,6 +6482,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_DESTINY_KNOT] = @@ -6121,6 +6495,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BLACK_SLUDGE] = @@ -6133,6 +6508,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_GRIP_CLAW] = @@ -6145,6 +6521,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 90, }, [ITEM_STICKY_BARB] = @@ -6157,6 +6534,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SHED_SHELL] = @@ -6169,6 +6547,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BIG_ROOT] = @@ -6182,6 +6561,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RAZOR_CLAW] = @@ -6194,6 +6574,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_RAZOR_FANG] = @@ -6207,6 +6588,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EVIOLITE] = @@ -6220,6 +6602,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 40, }, [ITEM_FLOAT_STONE] = @@ -6232,6 +6615,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_ROCKY_HELMET] = @@ -6245,6 +6629,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_AIR_BALLOON] = @@ -6258,6 +6643,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RED_CARD] = @@ -6271,6 +6657,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RING_TARGET] = @@ -6284,6 +6671,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BINDING_BAND] = @@ -6296,6 +6684,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EJECT_BUTTON] = @@ -6309,6 +6698,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_WEAKNESS_POLICY] = @@ -6322,6 +6712,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ASSAULT_VEST] = @@ -6335,6 +6726,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SAFETY_GOGGLES] = @@ -6347,6 +6739,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ADRENALINE_ORB] = @@ -6359,6 +6752,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_TERRAIN_EXTENDER] = @@ -6371,6 +6765,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_PROTECTIVE_PADS] = @@ -6383,6 +6778,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_THROAT_SPRAY] = // Todo @@ -6394,6 +6790,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EJECT_PACK] = // Todo @@ -6405,6 +6802,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 50, }, [ITEM_HEAVY_DUTY_BOOTS] = // Todo @@ -6416,6 +6814,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BLUNDER_POLICY] = // Todo @@ -6427,6 +6826,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ROOM_SERVICE] = // Todo @@ -6438,6 +6838,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_UTILITY_UMBRELLA] = // Todo @@ -6449,6 +6850,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, // Berries @@ -6465,6 +6867,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_CHESTO_BERRY] = @@ -6479,6 +6882,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_PECHA_BERRY] = @@ -6493,6 +6897,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_RAWST_BERRY] = @@ -6507,6 +6912,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_ASPEAR_BERRY] = @@ -6521,6 +6927,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_LEPPA_BERRY] = @@ -6536,6 +6943,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 10, }, [ITEM_ORAN_BERRY] = @@ -6551,6 +6959,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_PERSIM_BERRY] = @@ -6565,6 +6974,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_LUM_BERRY] = @@ -6579,6 +6989,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_SITRUS_BERRY] = @@ -6599,6 +7010,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_FIGY_BERRY] = @@ -6612,6 +7024,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WIKI_BERRY] = @@ -6625,6 +7038,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MAGO_BERRY] = @@ -6638,6 +7052,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_AGUAV_BERRY] = @@ -6651,6 +7066,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_IAPAPA_BERRY] = @@ -6664,6 +7080,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RAZZ_BERRY] = @@ -6675,6 +7092,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BLUK_BERRY] = @@ -6686,6 +7104,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_NANAB_BERRY] = @@ -6697,6 +7116,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WEPEAR_BERRY] = @@ -6708,6 +7128,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PINAP_BERRY] = @@ -6719,6 +7140,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_POMEG_BERRY] = @@ -6730,6 +7152,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_KELPSY_BERRY] = @@ -6741,6 +7164,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_QUALOT_BERRY] = @@ -6752,6 +7176,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_HONDEW_BERRY] = @@ -6763,6 +7188,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_GREPA_BERRY] = @@ -6774,6 +7200,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_TAMATO_BERRY] = @@ -6785,6 +7212,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_CORNN_BERRY] = @@ -6796,6 +7224,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MAGOST_BERRY] = @@ -6807,6 +7236,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RABUTA_BERRY] = @@ -6818,6 +7248,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_NOMEL_BERRY] = @@ -6829,6 +7260,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SPELON_BERRY] = @@ -6840,6 +7272,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PAMTRE_BERRY] = @@ -6851,6 +7284,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WATMEL_BERRY] = @@ -6862,6 +7296,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_DURIN_BERRY] = @@ -6873,6 +7308,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BELUE_BERRY] = @@ -6884,6 +7320,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHILAN_BERRY] = @@ -6897,6 +7334,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_OCCA_BERRY] = @@ -6910,6 +7348,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PASSHO_BERRY] = @@ -6923,6 +7362,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WACAN_BERRY] = @@ -6936,6 +7376,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RINDO_BERRY] = @@ -6949,6 +7390,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_YACHE_BERRY] = @@ -6962,6 +7404,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHOPLE_BERRY] = @@ -6975,6 +7418,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_KEBIA_BERRY] = @@ -6988,6 +7432,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SHUCA_BERRY] = @@ -7001,6 +7446,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_COBA_BERRY] = @@ -7009,11 +7455,12 @@ const struct Item gItems[] = .itemId = ITEM_COBA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = TYPE_FLYING, + .holdEffectParam = TYPE_FIGHTING, .description = sCobaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PAYAPA_BERRY] = @@ -7027,6 +7474,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_TANGA_BERRY] = @@ -7040,6 +7488,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHARTI_BERRY] = @@ -7053,6 +7502,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_KASIB_BERRY] = @@ -7066,6 +7516,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_HABAN_BERRY] = @@ -7079,6 +7530,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_COLBUR_BERRY] = @@ -7092,6 +7544,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BABIRI_BERRY] = @@ -7105,6 +7558,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ROSELI_BERRY] = @@ -7118,6 +7572,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LIECHI_BERRY] = @@ -7131,6 +7586,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_GANLON_BERRY] = @@ -7144,6 +7600,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SALAC_BERRY] = @@ -7157,6 +7614,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PETAYA_BERRY] = @@ -7170,6 +7628,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_APICOT_BERRY] = @@ -7183,6 +7642,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LANSAT_BERRY] = @@ -7196,6 +7656,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_STARF_BERRY] = @@ -7209,6 +7670,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ENIGMA_BERRY] = // Todo @@ -7220,6 +7682,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MICLE_BERRY] = @@ -7233,6 +7696,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CUSTAP_BERRY] = @@ -7246,6 +7710,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_JABOCA_BERRY] = @@ -7258,6 +7723,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ROWAP_BERRY] = @@ -7270,6 +7736,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_KEE_BERRY] = @@ -7282,6 +7749,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MARANGA_BERRY] = @@ -7294,6 +7762,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ENIGMA_BERRY_E_READER] = @@ -7307,6 +7776,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_EnigmaBerry, + .flingPower = 10, }, // TMs/HMs @@ -7320,6 +7790,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 150, }, [ITEM_TM02_DRAGON_CLAW] = @@ -7331,6 +7802,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 80, }, [ITEM_TM03_WATER_PULSE] = @@ -7342,6 +7814,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 60, }, [ITEM_TM04_CALM_MIND] = @@ -7353,6 +7826,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM05_ROAR] = @@ -7364,6 +7838,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM06_TOXIC] = @@ -7375,6 +7850,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM07_HAIL] = @@ -7386,6 +7862,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM08_BULK_UP] = @@ -7397,6 +7874,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM09_BULLET_SEED] = @@ -7408,6 +7886,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_5) + .flingPower = 25, + #else + .flingPower = 10, + #endif }, [ITEM_TM10_HIDDEN_POWER] = @@ -7419,6 +7902,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 60, + #else + .flingPower = 10, + #endif }, [ITEM_TM11_SUNNY_DAY] = @@ -7430,6 +7918,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM12_TAUNT] = @@ -7441,6 +7930,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM13_ICE_BEAM] = @@ -7452,6 +7942,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 90, + #else + .flingPower = 95, + #endif }, [ITEM_TM14_BLIZZARD] = @@ -7463,6 +7958,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 110, + #else + .flingPower = 120, + #endif }, [ITEM_TM15_HYPER_BEAM] = @@ -7474,6 +7974,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 150, }, [ITEM_TM16_LIGHT_SCREEN] = @@ -7485,6 +7986,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM17_PROTECT] = @@ -7496,6 +7998,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM18_RAIN_DANCE] = @@ -7507,6 +8010,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM19_GIGA_DRAIN] = @@ -7518,6 +8022,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_5) + .flingPower = 75, + #else + .flingPower = 60, + #endif }, [ITEM_TM20_SAFEGUARD] = @@ -7529,6 +8038,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM21_FRUSTRATION] = @@ -7540,6 +8050,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM22_SOLARBEAM] = @@ -7551,6 +8062,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 120, }, [ITEM_TM23_IRON_TAIL] = @@ -7562,6 +8074,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 100, }, [ITEM_TM24_THUNDERBOLT] = @@ -7573,6 +8086,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 90, + #else + .flingPower = 95, + #endif }, [ITEM_TM25_THUNDER] = @@ -7584,6 +8102,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 110, + #else + .flingPower = 120, + #endif }, [ITEM_TM26_EARTHQUAKE] = @@ -7595,6 +8118,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 100, }, [ITEM_TM27_RETURN] = @@ -7606,6 +8130,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM28_DIG] = @@ -7617,6 +8142,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4) + .flingPower = 80, + #else + .flingPower = 60, + #endif }, [ITEM_TM29_PSYCHIC] = @@ -7628,6 +8158,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 90, }, [ITEM_TM30_SHADOW_BALL] = @@ -7639,6 +8170,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 80, }, [ITEM_TM31_BRICK_BREAK] = @@ -7650,6 +8182,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 75, }, [ITEM_TM32_DOUBLE_TEAM] = @@ -7661,6 +8194,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM33_REFLECT] = @@ -7672,6 +8206,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM34_SHOCK_WAVE] = @@ -7683,6 +8218,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 60, }, [ITEM_TM35_FLAMETHROWER] = @@ -7694,6 +8230,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 90, + #else + .flingPower = 95, + #endif }, [ITEM_TM36_SLUDGE_BOMB] = @@ -7705,6 +8246,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 90, }, [ITEM_TM37_SANDSTORM] = @@ -7716,6 +8258,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM38_FIRE_BLAST] = @@ -7727,6 +8270,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 110, + #else + .flingPower = 120, + #endif }, [ITEM_TM39_ROCK_TOMB] = @@ -7738,6 +8286,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 60, + #else + .flingPower = 50, + #endif }, [ITEM_TM40_AERIAL_ACE] = @@ -7749,6 +8302,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 60, }, [ITEM_TM41_TORMENT] = @@ -7760,6 +8314,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM42_FACADE] = @@ -7771,6 +8326,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM43_SECRET_POWER] = @@ -7782,6 +8338,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 70, }, [ITEM_TM44_REST] = @@ -7793,6 +8350,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM45_ATTRACT] = @@ -7804,6 +8362,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM46_THIEF] = @@ -7815,6 +8374,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 60, + #else + .flingPower = 40, + #endif }, [ITEM_TM47_STEEL_WING] = @@ -7826,6 +8390,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 70, }, [ITEM_TM48_SKILL_SWAP] = @@ -7837,6 +8402,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM49_SNATCH] = @@ -7848,6 +8414,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM50_OVERHEAT] = @@ -7859,6 +8426,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 130, + #else + .flingPower = 140, + #endif }, [ITEM_TM51] = @@ -8421,6 +8993,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 50, }, [ITEM_HM02_FLY] = @@ -8433,6 +9006,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4) + .flingPower = 90, + #else + .flingPower = 70, + #endif }, [ITEM_HM03_SURF] = @@ -8445,6 +9023,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 90, + #else + .flingPower = 95, + #endif }, [ITEM_HM04_STRENGTH] = @@ -8457,6 +9040,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 80, }, [ITEM_HM05_FLASH] = @@ -8469,6 +9053,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_HM06_ROCK_SMASH] = @@ -8481,6 +9066,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4) + .flingPower = 20, + #else + .flingPower = 40, + #endif }, [ITEM_HM07_WATERFALL] = @@ -8493,6 +9083,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 80, }, [ITEM_HM08_DIVE] = @@ -8505,6 +9096,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4) + .flingPower = 80, + #else + .flingPower = 60, + #endif }, diff --git a/src/item.c b/src/item.c index d62c7d0862..1aafd8dfee 100644 --- a/src/item.c +++ b/src/item.c @@ -947,3 +947,8 @@ u8 ItemId_GetSecondaryId(u16 itemId) { return gItems[SanitizeItemId(itemId)].secondaryId; } + +u8 ItemId_GetFlingPower(u16 itemId) +{ + return gItems[SanitizeItemId(itemId)].flingPower; +}