Add Teal Mask item, move, and ability data

data/battle_anim_scripts.s

@@ -856,6 +856,10 @@ gBattleAnims_Moves::
 	.4byte Move_MAGICAL_TORQUE
 	.4byte Move_PSYBLADE
 	.4byte Move_HYDRO_STEAM
+	.4byte Move_BLOOD_MOON
+	.4byte Move_MATCHA_GOTCHA
+	.4byte Move_SYRUP_BOMB
+	.4byte Move_IVY_CUDGEL
 @@@@ Z MOVES
 	.4byte Move_BREAKNECK_BLITZ
 	.4byte Move_ALL_OUT_PUMMELING
@@ -16505,6 +16509,10 @@ Move_COMBAT_TORQUE::
 Move_MAGICAL_TORQUE::
 Move_PSYBLADE::
 Move_HYDRO_STEAM::
+Move_BLOOD_MOON::
+Move_MATCHA_GOTCHA::
+Move_SYRUP_BOMB::
+Move_IVY_CUDGEL::
 	end @to do
 
 @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@

include/constants/abilities.h

@@ -324,8 +324,16 @@
 #define ABILITY_ARMOR_TAIL 296
 #define ABILITY_EARTH_EATER 297
 #define ABILITY_MYCELIUM_MIGHT 298
+#define ABILITY_HOSPITALITY 299
+#define ABILITY_MINDS_EYE 300
+#define ABILITY_EMBODY_ASPECT_TEAL 301
+#define ABILITY_EMBODY_ASPECT_HEARTHFLAME 302
+#define ABILITY_EMBODY_ASPECT_WELLSPRING 303
+#define ABILITY_EMBODY_ASPECT_CORNERSTONE 304
+#define ABILITY_TOXIC_CHAIN 305
+#define ABILITY_SUPERSWEET_SYRUP 306
 
-#define ABILITIES_COUNT_GEN9 299
+#define ABILITIES_COUNT_GEN9 307
 
 #define ABILITIES_COUNT ABILITIES_COUNT_GEN9
 

include/constants/item_effects.h

@@ -66,6 +66,7 @@
 #define ITEM6_ADD_EV       10
 #define ITEM6_SUBTRACT_EV -10
 #define ITEM6_ADD_ONE_EV    1
+#define ITEM6_RESET_EV      0
 
 // Used for GetItemEffectType.
 #define ITEM_EFFECT_X_ITEM 0

include/constants/items.h

@@ -914,7 +914,23 @@
 #define ITEM_PEAT_BLOCK 797
 #define ITEM_BERSERK_GENE 798
 
-#define ITEMS_COUNT 799
+#define ITEM_FAIRY_FEATHER 799
+#define ITEM_SYRUPY_APPLE 800
+#define ITEM_UNREMARKABLE_TEACUP 801
+#define ITEM_MASTERPIECE_TEACUP 802
+#define ITEM_CORNERSTONE_MASK 803
+#define ITEM_WELLSPRING_MASK 804
+#define ITEM_HEARTHFLAME_MASK 805
+#define ITEM_HEALTH_MOCHI 806
+#define ITEM_MUSCLE_MOCHI 807
+#define ITEM_RESIST_MOCHI 808
+#define ITEM_GENIUS_MOCHI 809
+#define ITEM_CLEVER_MOCHI 810
+#define ITEM_SWIFT_MOCHI 811
+#define ITEM_FRESH_START_MOCHI 812
+#define ITEM_GLIMMERING_CHARM 813
+
+#define ITEMS_COUNT 814
 #define ITEM_FIELD_ARROW ITEMS_COUNT
 
 // A special item id associated with "Cancel"/"Exit" etc. in a list of items or decorations

include/constants/moves.h

@@ -860,8 +860,12 @@
 #define MOVE_MAGICAL_TORQUE 826
 #define MOVE_PSYBLADE 827
 #define MOVE_HYDRO_STEAM 828
+#define MOVE_BLOOD_MOON 829
+#define MOVE_MATCHA_GOTCHA 830
+#define MOVE_SYRUP_BOMB 831
+#define MOVE_IVY_CUDGEL 832
 
-#define MOVES_COUNT_GEN9 829
+#define MOVES_COUNT_GEN9 833
 
 #define MOVES_COUNT         MOVES_COUNT_GEN9
 

include/item_use.h

@@ -13,6 +13,7 @@ void ItemUseOutOfBattle_WailmerPail(u8);
 void ItemUseOutOfBattle_Medicine(u8);
 void ItemUseOutOfBattle_AbilityCapsule(u8);
 void ItemUseOutOfBattle_AbilityPatch(u8);
+void ItemUseOutOfBattle_ResetEVs(u8);
 void ItemUseOutOfBattle_ReduceEV(u8);
 void ItemUseOutOfBattle_SacredAsh(u8);
 void ItemUseOutOfBattle_PPRecovery(u8);

include/party_menu.h

@@ -53,6 +53,7 @@ void ItemUseCB_BattleChooseMove(u8 taskId, TaskFunc task);
 void ItemUseCB_Medicine(u8 taskId, TaskFunc task);
 void ItemUseCB_AbilityCapsule(u8 taskId, TaskFunc task);
 void ItemUseCB_AbilityPatch(u8 taskId, TaskFunc task);
+void ItemUseCB_ResetEVs(u8 taskId, TaskFunc task);
 void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task);
 void ItemUseCB_PPRecovery(u8 taskId, TaskFunc task);
 void ItemUseCB_PPUp(u8 taskId, TaskFunc task);

include/strings.h

@@ -3166,4 +3166,6 @@ extern const u8 gText_TellHimTheWords[];
 extern const u8 gText_ExpShareOn[];
 extern const u8 gText_ExpShareOff[];
 
+extern const u8 gText_BasePointsResetToZero[];
+
 #endif // GUARD_STRINGS_H

src/data/battle_moves.h

@@ -13813,6 +13813,68 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
         .zMoveEffect = Z_EFFECT_NONE,
     },
 
+    [MOVE_BLOOD_MOON] =
+    {
+        .effect = EFFECT_GIGATON_HAMMER,
+        .power = 140,
+        .type = TYPE_NORMAL,
+        .accuracy = 100,
+        .pp = 5,
+        .secondaryEffectChance = 0,
+        .target = MOVE_TARGET_SELECTED,
+        .priority = 0,
+        .split = SPLIT_SPECIAL,
+        .zMoveEffect = Z_EFFECT_NONE,
+    },
+
+    [MOVE_MATCHA_GOTCHA] =
+    {
+        .effect = EFFECT_PLACEHOLDER, // EFFECT_MATCHA_GOTCHA
+        .power = 80,
+        .type = TYPE_GRASS,
+        .accuracy = 90,
+        .pp = 15,
+        .secondaryEffectChance = 20, //burn
+        .target = MOVE_TARGET_BOTH,
+        .priority = 0,
+        .split = SPLIT_SPECIAL,
+        .zMoveEffect = Z_EFFECT_NONE,
+        .thawsUser = TRUE,
+        .metronomeBanned = TRUE,
+    },
+
+    [MOVE_SYRUP_BOMB] =
+    {
+        .effect = EFFECT_PLACEHOLDER, // EFFECT_SYRUP_BOMB
+        .power = 60,
+        .type = TYPE_GRASS,
+        .accuracy = 85,
+        .pp = 10,
+        .secondaryEffectChance = 100, // syrup bomb volatile status
+        .target = MOVE_TARGET_SELECTED,
+        .priority = 0,
+        .split = SPLIT_SPECIAL,
+        .zMoveEffect = Z_EFFECT_NONE,
+        .ballisticMove = TRUE,
+        .metronomeBanned = TRUE,
+    },
+
+    [MOVE_IVY_CUDGEL] =
+    {
+        .effect = EFFECT_PLACEHOLDER, // EFFECT_IVY_CUDGEL
+        .power = 100,
+        .type = TYPE_GRASS,
+        .accuracy = 100,
+        .pp = 10,
+        .secondaryEffectChance = 0,
+        .target = MOVE_TARGET_SELECTED,
+        .priority = 0,
+        .split = SPLIT_PHYSICAL,
+        .zMoveEffect = Z_EFFECT_NONE,
+        .highCritRatio = TRUE,
+        .metronomeBanned = TRUE,
+    },
+
     // Z-Moves
     [MOVE_BREAKNECK_BLITZ] =
     {

src/data/contest_moves.h

@@ -6066,6 +6066,14 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
     [MOVE_PSYBLADE] = {0}, // TODO
 
     [MOVE_HYDRO_STEAM] = {0}, // TODO
+
+    [MOVE_BLOOD_MOON] = {0}, // TODO
+
+    [MOVE_MATCHA_GOTCHA] = {0}, // TODO
+
+    [MOVE_SYRUP_BOMB] = {0}, // TODO
+
+    [MOVE_IVY_CUDGEL] = {0}, // TODO
 };
 
 const struct ContestEffect gContestEffects[] =

src/data/item_icon_table.h

@@ -844,6 +844,21 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
     [ITEM_LINKING_CORD] = {gItemIcon_LinkingCord, gItemIconPalette_LinkingCord},
     [ITEM_PEAT_BLOCK] = {gItemIcon_PeatBlock, gItemIconPalette_PeatBlock},
     [ITEM_BERSERK_GENE] = {gItemIcon_BerserkGene, gItemIconPalette_BerserkGene},
+    [ITEM_FAIRY_FEATHER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FairyFeather, gItemIconPalette_FairyFeather},
+    [ITEM_SYRUPY_APPLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_SyrupyApple, gItemIconPalette_SyrupyApple},
+    [ITEM_UNREMARKABLE_TEACUP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_UnremarkableTeacup, gItemIconPalette_UnremarkableTeacup},
+    [ITEM_MASTERPIECE_TEACUP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_MasterpieceTeacup, gItemIconPalette_MasterpieceTeacup},
+    [ITEM_CORNERSTONE_MASK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_CornerstoneMask, gItemIconPalette_CornerstoneMask},
+    [ITEM_WELLSPRING_MASK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_WellspringMask, gItemIconPalette_WellspringMask},
+    [ITEM_HEARTHFLAME_MASK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_HearthflameMask, gItemIconPalette_HearthflameMask},
+    [ITEM_HEALTH_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_HealthMochi},
+    [ITEM_MUSCLE_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_MuscleMochi},
+    [ITEM_RESIST_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_ResistMochi},
+    [ITEM_GENIUS_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_GeniusMochi},
+    [ITEM_CLEVER_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_CleverMochi},
+    [ITEM_SWIFT_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_SwiftMochi},
+    [ITEM_FRESH_START_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_FreshStartMochi},
+    [ITEM_GLIMMERING_CHARM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},  // {gItemIcon_GlimmeringCharm, gItemIconPalette_GlimmeringCharm},
     // Return to field arrow
     [ITEMS_COUNT] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
 };

src/data/items.h

@@ -9649,4 +9649,168 @@ const struct Item gItems[] =
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
         .flingPower = 10,
     },
+
+    [ITEM_FAIRY_FEATHER] =
+    {
+        .name = _("Fairy Feather"),
+        .price = 1000,
+        .holdEffect = HOLD_EFFECT_FAIRY_POWER,
+        .holdEffectParam = TYPE_BOOST_PARAM,
+        .description = sFairyFeatherDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_BAG_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
+        .flingPower = 10,
+    },
+
+    [ITEM_SYRUPY_APPLE] =
+    {
+        .name = _("Syrupy Apple"),
+        .price = 2200,
+        .description = sSyrupyAppleDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
+        .flingPower = 30,
+    },
+
+    [ITEM_UNREMARKABLE_TEACUP] =
+    {
+        .name = _("UnrmkblTeacup"),
+        .price = 1600,
+        .description = sUnremarkableTeacupDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
+        .flingPower = 80,
+    },
+
+    [ITEM_MASTERPIECE_TEACUP] =
+    {
+        .name = _("MstrpceTeacup"),
+        .price = 38000,
+        .description = sMasterpieceTeacupDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
+        .flingPower = 80,
+    },
+
+    [ITEM_CORNERSTONE_MASK] =
+    {
+        .name = _("CornrstneMask"),
+        .price = 0,
+        .description = sCornerstoneMaskDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_BAG_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
+    },
+
+    [ITEM_WELLSPRING_MASK] =
+    {
+        .name = _("WellsprngMask"),
+        .price = 0,
+        .description = sWellspringMaskDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_BAG_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
+    },
+
+    [ITEM_HEARTHFLAME_MASK] =
+    {
+        .name = _("HrthflameMask"),
+        .price = 0,
+        .description = sHearthflameMaskDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_BAG_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
+    },
+
+    [ITEM_HEALTH_MOCHI] =
+    {
+        .name = _("Health Mochi"),
+        .price = 500,
+        .description = sHealthMochiDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
+        .flingPower = 30,
+    },
+
+    [ITEM_MUSCLE_MOCHI] =
+    {
+        .name = _("Muscle Mochi"),
+        .price = 500,
+        .description = sMuscleMochiDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
+        .flingPower = 30,
+    },
+
+    [ITEM_RESIST_MOCHI] =
+    {
+        .name = _("Resist Mochi"),
+        .price = 500,
+        .description = sResistMochiDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
+        .flingPower = 30,
+    },
+
+    [ITEM_GENIUS_MOCHI] =
+    {
+        .name = _("Genius Mochi"),
+        .price = 500,
+        .description = sGeniusMochiDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
+        .flingPower = 30,
+    },
+
+    [ITEM_CLEVER_MOCHI] =
+    {
+        .name = _("Clever Mochi"),
+        .price = 500,
+        .description = sCleverMochiDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
+        .flingPower = 30,
+    },
+
+    [ITEM_SWIFT_MOCHI] =
+    {
+        .name = _("Swift Mochi"),
+        .price = 500,
+        .description = sSwiftMochiDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
+        .flingPower = 30,
+    },
+
+    [ITEM_FRESH_START_MOCHI] =
+    {
+        .name = _("FrshStrtMochi"),
+        .price = 300,
+        .description = sFreshStartMochiDesc,
+        .pocket = POCKET_ITEMS,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_ResetEVs,
+        .flingPower = 30,
+    },
+
+    [ITEM_GLIMMERING_CHARM] =
+    {
+        .name = _("GlmmringCharm"),
+        .price = 0,
+        .importance = 1,
+        .description = sGlimmeringCharmDesc,
+        .pocket = POCKET_KEY_ITEMS,
+        .type = ITEM_USE_BAG_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
+    },
 };