From c4f3feec2eee7a022cf6ffea723cceae1b8ee8f3 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 9 Jan 2024 22:42:39 -0300 Subject: [PATCH 01/30] Made gBattleMoves handle the InGame name and description of battle moves No more multiple arrays in separate, individual files. Note: -Keep an eye on Task_LearnedMove. --- include/data.h | 3 - include/pokemon.h | 3 + src/apprentice.c | 8 +- src/battle_ai_main.c | 2 +- src/battle_controller_player.c | 4 +- src/battle_debug.c | 6 +- src/battle_dome.c | 2 +- src/battle_dynamax.c | 4 +- src/battle_message.c | 8 +- src/battle_tower.c | 2 +- src/battle_z_move.c | 6 +- src/contest.c | 12 +- src/data.c | 1 - src/data/battle_moves.h | 1886 ++++++++++++- src/data/party_menu.h | 28 +- src/data/text/move_descriptions.h | 4193 ----------------------------- src/data/text/move_names.h | 2000 -------------- src/debug.c | 6 +- src/easy_chat.c | 2 +- src/field_specials.c | 4 +- src/item_menu.c | 2 +- src/item_use.c | 2 +- src/menu_specialized.c | 2 +- src/move_relearner.c | 10 +- src/party_menu.c | 26 +- src/pokedex_plus_hgss.c | 6 +- src/pokemon.c | 6 + src/pokemon_summary_screen.c | 11 +- src/rom_header_gf.c | 1 - src/scrcmd.c | 2 +- src/shop.c | 2 +- src/trade.c | 2 +- src/tv.c | 32 +- test/test_runner_battle.c | 26 +- 34 files changed, 1996 insertions(+), 6314 deletions(-) delete mode 100644 src/data/text/move_descriptions.h delete mode 100644 src/data/text/move_names.h diff --git a/include/data.h b/include/data.h index cce5f77503cc..efc5e6297ce8 100644 --- a/include/data.h +++ b/include/data.h @@ -126,8 +126,5 @@ extern const struct Trainer gTrainers[]; extern const struct Trainer gBattlePartners[]; extern const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT]; -extern const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1]; -extern const u8 *const gZMoveNames[]; -extern const u8 *const gMaxMoveNames[]; #endif // GUARD_DATA_H diff --git a/include/pokemon.h b/include/pokemon.h index c5f6f51cb60f..cd15832cb346 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -443,6 +443,8 @@ struct SpeciesInfo /*0x8C*/ struct BattleMove { + u8 name[MOVE_NAME_LENGTH + 1]; + const u8 *description; u16 effect; u8 power; u8 type:5; @@ -774,5 +776,6 @@ u16 GetCryIdBySpecies(u16 species); u16 GetSpeciesPreEvolution(u16 species); void HealPokemon(struct Pokemon *mon); void HealBoxPokemon(struct BoxPokemon *boxMon); +const u8 *GetBattleMoveName(u16 moveId); #endif // GUARD_POKEMON_H diff --git a/src/apprentice.c b/src/apprentice.c index 8c9128b71864..ddba9c097e17 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -584,8 +584,8 @@ static void CreateApprenticeMenu(u8 menu) case APPRENTICE_ASK_MOVES: left = 17; top = 8; - strings[0] = gMoveNames[gApprenticeQuestionData->moveId1]; - strings[1] = gMoveNames[gApprenticeQuestionData->moveId2]; + strings[0] = GetBattleMoveName(gApprenticeQuestionData->moveId1); + strings[1] = GetBattleMoveName(gApprenticeQuestionData->moveId2); break; case APPRENTICE_ASK_GIVE: left = 18; @@ -1041,10 +1041,10 @@ static void ApprenticeBufferString(void) StringCopy(stringDst, GetSpeciesName(gApprenticeQuestionData->speciesId)); break; case APPRENTICE_BUFF_MOVE1: - StringCopy(stringDst, gMoveNames[gApprenticeQuestionData->moveId1]); + StringCopy(stringDst, GetBattleMoveName(gApprenticeQuestionData->moveId1)); break; case APPRENTICE_BUFF_MOVE2: - StringCopy(stringDst, gMoveNames[gApprenticeQuestionData->moveId2]); + StringCopy(stringDst, GetBattleMoveName(gApprenticeQuestionData->moveId2)); break; case APPRENTICE_BUFF_ITEM: StringCopy(stringDst, ItemId_GetName(PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data)); diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index ae06cdfb5155..25f63995fc1e 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -3164,7 +3164,7 @@ static s32 AI_CompareDamagingMoves(u32 battlerAtk, u32 battlerDef, u32 currId) isChargingMoveEffect[i] = FALSE; } /* - MgbaPrintf_("%S: required hits: %d Dmg: %d", gMoveNames[moves[i]], noOfHits[i], AI_DATA->simulatedDmg[battlerAtk][battlerDef][i]); + MgbaPrintf_("%S: required hits: %d Dmg: %d", GetBattleMoveName(moves[i]), noOfHits[i], AI_DATA->simulatedDmg[battlerAtk][battlerDef][i]); */ } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index ba16ef2dbbba..a7ff61fce8c4 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1694,9 +1694,9 @@ static void MoveSelectionDisplayMoveNames(u32 battler) MoveSelectionDestroyCursorAt(i); if ((gBattleStruct->dynamax.playerSelect && CanDynamax(battler)) || IsDynamaxed(battler)) - StringCopy(gDisplayedStringBattle, gMoveNames[GetMaxMove(battler, moveInfo->moves[i])]); + StringCopy(gDisplayedStringBattle, GetBattleMoveName(GetMaxMove(battler, moveInfo->moves[i]))); else - StringCopy(gDisplayedStringBattle, gMoveNames[moveInfo->moves[i]]); + StringCopy(gDisplayedStringBattle, GetBattleMoveName(moveInfo->moves[i])); // Prints on windows B_WIN_MOVE_NAME_1, B_WIN_MOVE_NAME_2, B_WIN_MOVE_NAME_3, B_WIN_MOVE_NAME_4 BattlePutTextOnWindow(gDisplayedStringBattle, i + B_WIN_MOVE_NAME_1); if (moveInfo->moves[i] != MOVE_NONE) diff --git a/src/battle_debug.c b/src/battle_debug.c index ddbed79ddaba..df9d1ce3c509 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -739,7 +739,7 @@ static void PutMovesPointsText(struct BattleDebugMenu *data) for (i = 0; i < MAX_MON_MOVES; i++) { text[0] = CHAR_SPACE; - StringCopy(text + 1, gMoveNames[gBattleMons[data->aiBattlerId].moves[i]]); + StringCopy(text + 1, GetBattleMoveName(gBattleMons[data->aiBattlerId].moves[i])); AddTextPrinterParameterized(data->aiMovesWindowId, FONT_NORMAL, text, 0, i * 15, 0, NULL); for (count = 0, j = 0; j < MAX_BATTLERS_COUNT; j++) { @@ -907,7 +907,7 @@ static void PutAiPartyText(struct BattleDebugMenu *data) for (j = 0; j < MAX_MON_MOVES; j++) { - txtPtr = StringCopyN(text, gMoveNames[aiMons[i].moves[j]], 8); + txtPtr = StringCopyN(text, GetBattleMoveName(aiMons[i].moves[j]), 8); *txtPtr = EOS; AddTextPrinterParameterized5(data->aiMovesWindowId, FONT_SMALL_NARROW, text, i * 41, 35 + j * 15, 0, NULL, 0, 0); } @@ -1428,7 +1428,7 @@ static void PrintSecondaryEntries(struct BattleDebugMenu *data) case LIST_ITEM_PP: for (i = 0; i < 4; i++) { - PadString(gMoveNames[gBattleMons[data->battlerId].moves[i]], text); + PadString(GetBattleMoveName(gBattleMons[data->battlerId].moves[i]), text); printer.currentY = printer.y = (i * yMultiplier) + sSecondaryListTemplate.upText_Y; AddTextPrinter(&printer, 0, NULL); } diff --git a/src/battle_dome.c b/src/battle_dome.c index e6fe9a40854f..1968f0da19e2 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -4657,7 +4657,7 @@ static int BufferDomeWinString(u8 matchNum, u8 *tournamentIds) if (DOME_TRAINERS[tournamentId].eliminatedAt == sCompetitorRangeByMatch[matchNum][2]) { // Set initial winStringId offset - StringCopy(gStringVar2, gMoveNames[gSaveBlock2Ptr->frontier.domeWinningMoves[tournamentId]]); + StringCopy(gStringVar2, GetBattleMoveName(gSaveBlock2Ptr->frontier.domeWinningMoves[tournamentId])); winStringId = DOME_TRAINERS[tournamentId].forfeited * 2; // (DOME_TEXT_WON_USING_MOVE - 1) or (DOME_TEXT_WON_ON_FORFEIT - 1) if (gSaveBlock2Ptr->frontier.domeWinningMoves[tournamentId] == MOVE_NONE && DOME_TRAINERS[tournamentId].forfeited == FALSE) diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index bf223e50023d..e7385d60e3f0 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -491,9 +491,9 @@ bool32 IsMaxMove(u16 move) const u8 *GetMaxMoveName(u16 move) { if (IsMaxMove(move)) - return gMaxMoveNames[move - FIRST_MAX_MOVE]; + return GetBattleMoveName(move); else - return gMaxMoveNames[0]; // Failsafe + return GetBattleMoveName(MOVE_NONE); // Failsafe } // Assigns the multistring to use for the "Damage Non- Types" G-Max effect. diff --git a/src/battle_message.c b/src/battle_message.c index 90d86f649539..ca64937260e9 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2932,7 +2932,7 @@ void BufferStringBattle(u16 stringID, u32 battler) else if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) StringCopy(gBattleTextBuff3, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else - StringCopy(gBattleTextBuff3, gMoveNames[gBattleMsgDataPtr->currentMove]); + StringCopy(gBattleTextBuff3, GetBattleMoveName(gBattleMsgDataPtr->currentMove)); stringPtr = sText_AttackerUsedX; break; @@ -3356,7 +3356,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) else if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else - toCpy = gMoveNames[gBattleMsgDataPtr->currentMove]; + toCpy = GetBattleMoveName(gBattleMsgDataPtr->currentMove); break; case B_TXT_LAST_MOVE: // originally used move name if (gBattleStruct->zmove.active) @@ -3364,7 +3364,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) else if (gBattleMsgDataPtr->originallyUsedMove >= MOVES_COUNT) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else - toCpy = gMoveNames[gBattleMsgDataPtr->originallyUsedMove]; + toCpy = GetBattleMoveName(gBattleMsgDataPtr->originallyUsedMove); break; case B_TXT_LAST_ITEM: // last used item if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) @@ -3725,7 +3725,7 @@ void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) srcID += src[srcID + 1] + 3; break; case B_BUFF_MOVE: // move name - StringAppend(dst, gMoveNames[T1_READ_16(&src[srcID + 1])]); + StringAppend(dst, GetBattleMoveName(T1_READ_16(&src[srcID + 1]))); srcID += 3; break; case B_BUFF_TYPE: // type name diff --git a/src/battle_tower.c b/src/battle_tower.c index bc0970e7b0ee..fa29676eb261 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -2435,7 +2435,7 @@ static void GetPotentialPartnerMoveAndSpecies(u16 trainerId, u16 monId) } } - StringCopy(gStringVar1, gMoveNames[move]); + StringCopy(gStringVar1, GetBattleMoveName(move)); StringCopy(gStringVar2, GetSpeciesName(species)); } diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 7a5457583658..c2a9c9a30286 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -486,7 +486,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove, u32 battler) BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3); gDisplayedStringBattle[0] = CHAR_Z; gDisplayedStringBattle[1] = CHAR_HYPHEN; - StringCopy(gDisplayedStringBattle + 2, gMoveNames[move]); + StringCopy(gDisplayedStringBattle + 2, GetBattleMoveName(move)); } else if (zmove == MOVE_EXTREME_EVOBOOST) { @@ -560,9 +560,9 @@ static void ZMoveSelectionDisplayMoveType(u16 zMove, u32 battler) const u8 *GetZMoveName(u16 move) { if (IsZMove(move)) - return gZMoveNames[move - FIRST_Z_MOVE]; + return GetBattleMoveName(move); else - return gZMoveNames[0]; // Failsafe + return GetBattleMoveName(MOVE_NONE); // Failsafe } #define Z_EFFECT_BS_LENGTH 5 diff --git a/src/contest.c b/src/contest.c index e0c5969a0609..e206aec2df18 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1542,7 +1542,7 @@ static void Task_ShowMoveSelectScreen(u8 taskId) // Gray the text because it's a repeated move moveNameBuffer = StringCopy(moveName, gText_ColorBlue); } - moveNameBuffer = StringCopy(moveNameBuffer, gMoveNames[move]); + moveNameBuffer = StringCopy(moveNameBuffer, GetBattleMoveName(move)); FillWindowPixelBuffer(i + MOVE_WINDOWS_START, PIXEL_FILL(0)); Contest_PrintTextToBg0WindowAt(i + MOVE_WINDOWS_START, moveName, 5, 1, FONT_NARROW); @@ -1810,7 +1810,7 @@ static void Task_DoAppeals(u8 taskId) ContestClearGeneralTextWindow(); StringCopy(gStringVar1, gContestMons[contestant].nickname); if (eContestantStatus[contestant].currMove < MOVES_COUNT) - StringCopy(gStringVar2, gMoveNames[eContestantStatus[contestant].currMove]); + StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); else StringCopy(gStringVar2, sInvalidContestMoveNames[eContestantStatus[contestant].moveCategory]); StringExpandPlaceholders(gStringVar4, gText_MonAppealedWithMove); @@ -2204,7 +2204,7 @@ static void Task_DoAppeals(u8 taskId) if (eContestantStatus[contestant].overrideCategoryExcitementMod) { r3 = 1; - StringCopy(gStringVar3, gMoveNames[eContestantStatus[contestant].currMove]); + StringCopy(gStringVar3, GetBattleMoveName(eContestantStatus[contestant].currMove)); } else { @@ -2339,7 +2339,7 @@ static void Task_DoAppeals(u8 taskId) ContestClearGeneralTextWindow(); StringCopy(gStringVar3, gContestMons[eContestExcitement.freezer].nickname); StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringCopy(gStringVar2, gMoveNames[eContestantStatus[contestant].currMove]); + StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); StringExpandPlaceholders(gStringVar4, gText_CrowdContinuesToWatchMon); Contest_StartTextPrinter(gStringVar4, TRUE); gTasks[taskId].tState = APPEALSTATE_PRINT_MON_MOVE_IGNORED_MSG; @@ -2365,7 +2365,7 @@ static void Task_DoAppeals(u8 taskId) eContestantStatus[contestant].hasJudgesAttention = FALSE; StartStopFlashJudgeAttentionEye(contestant); StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringCopy(gStringVar2, gMoveNames[eContestantStatus[contestant].currMove]); + StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); StringExpandPlaceholders(gStringVar4, gText_MonWasTooNervousToMove); Contest_StartTextPrinter(gStringVar4, TRUE); gTasks[taskId].tState = APPEALSTATE_WAIT_TOO_NERVOUS_MSG; @@ -4558,7 +4558,7 @@ void SetStartledString(u8 contestant, u8 jam) static void PrintAppealMoveResultText(u8 contestant, u8 stringId) { StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringCopy(gStringVar2, gMoveNames[eContestantStatus[contestant].currMove]); + StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); if (gContestMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_COOL) StringCopy(gStringVar3, gText_Contest_Shyness); else if (gContestMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) diff --git a/src/data.c b/src/data.c index 5b8dc6148d74..3f14ec44a22c 100644 --- a/src/data.c +++ b/src/data.c @@ -221,4 +221,3 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] = #include "data/trainer_parties.h" #include "data/trainers.h" -#include "data/text/move_names.h" diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 1462f86262bc..21c1f37bf02b 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -1,7 +1,13 @@ +const u8 gNotDoneYetDescription[] = _( + "This move can't be used. Its\n" + "effect is in development."); + const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 0, .type = TYPE_NORMAL, @@ -18,6 +24,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -33,6 +41,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KARATE_CHOP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_FIGHTING, @@ -48,6 +58,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SLAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -62,6 +74,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMET_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -77,6 +91,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -92,6 +108,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAY_DAY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PAY_DAY, .power = 40, .type = TYPE_NORMAL, @@ -105,6 +123,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 75, .type = TYPE_FIRE, @@ -121,6 +141,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_USE_FROSTBITE == TRUE .effect = EFFECT_FROSTBITE_HIT, #else @@ -141,6 +163,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 75, .type = TYPE_ELECTRIC, @@ -157,6 +181,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCRATCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -171,6 +197,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VISE_GRIP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_NORMAL, @@ -185,6 +213,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUILLOTINE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -199,6 +229,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_WIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -217,6 +249,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWORDS_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -237,6 +271,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_NORMAL, @@ -252,6 +288,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GUST, .power = 40, .type = TYPE_FLYING, @@ -268,6 +306,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WING_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -282,6 +322,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLWIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 0, #else @@ -306,6 +348,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 90, #else @@ -329,6 +373,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 85, #else @@ -348,6 +394,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -363,6 +411,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VINE_WHIP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 45, .pp = 25, @@ -385,6 +435,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 65, .type = TYPE_NORMAL, @@ -402,6 +454,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_FIGHTING, @@ -417,6 +471,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -431,6 +487,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUMP_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 100, .pp = 10, @@ -454,6 +512,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLING_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -470,6 +530,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_GROUND, @@ -485,6 +547,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADBUTT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 70, .type = TYPE_NORMAL, @@ -500,6 +564,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_NORMAL, @@ -514,6 +580,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -528,6 +596,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_DRILL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -542,6 +612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACKLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 40, .accuracy = 100, @@ -564,6 +636,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_SLAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 85, .type = TYPE_NORMAL, @@ -581,6 +655,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 90, #else @@ -599,6 +675,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_DOWN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 90, .type = TYPE_NORMAL, @@ -614,6 +692,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THRASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, .pp = 10, @@ -634,6 +714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_EDGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_NORMAL, @@ -649,6 +731,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_WHIP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -664,6 +748,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_STING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 15, .type = TYPE_POISON, @@ -678,6 +764,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWINEEDLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 25, .type = TYPE_BUG, @@ -694,6 +782,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIN_MISSILE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 25, .accuracy = 95, @@ -712,6 +802,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -727,6 +819,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_DARK, @@ -743,6 +837,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -760,6 +856,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 0, #else @@ -784,6 +882,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -801,6 +901,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERSONIC] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_NORMAL, @@ -818,6 +920,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SONIC_BOOM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SONICBOOM, .power = 1, .type = TYPE_NORMAL, @@ -831,6 +935,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISABLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -853,6 +959,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, #else @@ -871,6 +979,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 40, .type = TYPE_FIRE, @@ -885,6 +995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAMETHROWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -903,6 +1015,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MIST, .power = 0, .type = TYPE_ICE, @@ -920,6 +1034,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_GUN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -933,6 +1049,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_PUMP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -950,6 +1068,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURF] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, .target = MOVE_TARGET_FOES_AND_ALLY, @@ -973,6 +1093,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -997,6 +1119,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLIZZARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -1020,6 +1144,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 65, .type = TYPE_PSYCHIC, @@ -1034,6 +1160,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 65, .type = TYPE_WATER, @@ -1048,6 +1176,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 65, .type = TYPE_ICE, @@ -1062,6 +1192,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_NORMAL, @@ -1076,6 +1208,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PECK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_FLYING, @@ -1090,6 +1224,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_PECK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FLYING, @@ -1104,6 +1240,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBMISSION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -1123,6 +1261,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_FIGHTING, @@ -1137,6 +1277,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COUNTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COUNTER, .power = 1, .type = TYPE_FIGHTING, @@ -1156,6 +1298,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEISMIC_TOSS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_FIGHTING, @@ -1171,6 +1315,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -1185,6 +1331,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ABSORB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .pp = 25, #else @@ -1204,6 +1352,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_DRAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .pp = 15, #else @@ -1223,6 +1373,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_SEED] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LEECH_SEED, .power = 0, .type = TYPE_GRASS, @@ -1238,6 +1390,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWTH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -1263,6 +1417,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_LEAF] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_GRASS, @@ -1278,6 +1434,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SOLAR_BEAM, .power = 120, .type = TYPE_GRASS, @@ -1294,6 +1452,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_POWDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON, .power = 0, .type = TYPE_POISON, @@ -1310,6 +1470,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUN_SPORE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_GRASS, @@ -1326,6 +1488,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_POWDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -1342,6 +1506,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, .pp = 10, @@ -1366,6 +1532,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRING_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .effect = EFFECT_SPEED_DOWN_2, #else @@ -1385,6 +1553,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DRAGON_RAGE, .power = 1, .type = TYPE_DRAGON, @@ -1399,6 +1569,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_SPIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 35, .accuracy = 85, @@ -1418,6 +1590,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_SHOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 40, .type = TYPE_ELECTRIC, @@ -1432,6 +1606,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERBOLT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -1450,6 +1626,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_WAVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .accuracy = 90, #else @@ -1469,6 +1647,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -1488,6 +1668,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_THROW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_ROCK, @@ -1501,6 +1683,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTHQUAKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EARTHQUAKE, .power = 100, .type = TYPE_GROUND, @@ -1517,6 +1701,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISSURE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_GROUND, @@ -1532,6 +1718,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 80, #else @@ -1555,6 +1743,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 90, #else @@ -1574,6 +1764,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 50, .type = TYPE_PSYCHIC, @@ -1588,6 +1780,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_PSYCHIC, @@ -1602,6 +1796,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPNOSIS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_PSYCHIC, @@ -1617,6 +1813,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEDITATE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_PSYCHIC, @@ -1634,6 +1832,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AGILITY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -1651,6 +1851,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -1665,6 +1867,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RAGE, .power = 20, .type = TYPE_NORMAL, @@ -1679,6 +1883,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEPORT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TELEPORT, .power = 0, .type = TYPE_PSYCHIC, @@ -1695,6 +1901,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SHADE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_GHOST, @@ -1708,6 +1916,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIMIC] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MIMIC, .power = 0, .type = TYPE_NORMAL, @@ -1730,6 +1940,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCREECH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -1747,6 +1959,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_TEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EVASION_UP, .power = 0, .type = TYPE_NORMAL, @@ -1764,6 +1978,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECOVER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -1788,6 +2004,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARDEN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_NORMAL, @@ -1805,6 +2023,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MINIMIZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 10, #else @@ -1826,6 +2046,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOKESCREEN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -1841,6 +2063,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSE_RAY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_GHOST, @@ -1856,6 +2080,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WITHDRAW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_WATER, @@ -1873,6 +2099,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFENSE_CURL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_CURL, .power = 0, .type = TYPE_NORMAL, @@ -1890,6 +2118,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRIER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -1911,6 +2141,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_SCREEN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LIGHT_SCREEN, .power = 0, .type = TYPE_PSYCHIC, @@ -1928,6 +2160,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HAZE, .power = 0, .type = TYPE_ICE, @@ -1945,6 +2179,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_REFLECT, .power = 0, .type = TYPE_PSYCHIC, @@ -1962,6 +2198,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_ENERGY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FOCUS_ENERGY, .power = 0, .type = TYPE_NORMAL, @@ -1979,6 +2217,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIDE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, .priority = 1, @@ -2001,6 +2241,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METRONOME] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_METRONOME, .power = 0, .type = TYPE_NORMAL, @@ -2023,6 +2265,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_MOVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MIRROR_MOVE, .power = 0, .type = TYPE_FLYING, @@ -2044,6 +2288,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SELF_DESTRUCT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EXPLOSION, .power = 200, .type = TYPE_NORMAL, @@ -2058,6 +2304,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EGG_BOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -2072,6 +2320,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 30, #else @@ -2091,6 +2341,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 30, #else @@ -2109,6 +2361,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 65, .type = TYPE_POISON, @@ -2123,6 +2377,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_CLUB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 65, .type = TYPE_GROUND, @@ -2137,6 +2393,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_BLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -2155,6 +2413,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATERFALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_FLINCH_HIT, #else @@ -2174,6 +2434,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLAMP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 85, .pp = 15, @@ -2194,6 +2456,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWIFT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_NORMAL, @@ -2207,6 +2471,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKULL_BASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 130, .pp = 10, @@ -2229,6 +2495,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKE_CANNON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 20, .type = TYPE_NORMAL, @@ -2242,6 +2510,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONSTRICT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 10, .type = TYPE_NORMAL, @@ -2257,6 +2527,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AMNESIA] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -2274,6 +2546,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINESIS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_PSYCHIC, @@ -2289,6 +2563,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOFT_BOILED] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -2311,6 +2587,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_JUMP_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 130, .pp = 10, @@ -2334,6 +2612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_5 @@ -2355,6 +2635,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DREAM_EATER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DREAM_EATER, .power = 100, .type = TYPE_PSYCHIC, @@ -2369,6 +2651,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_GAS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 90, .target = MOVE_TARGET_BOTH, @@ -2392,6 +2676,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -2406,6 +2692,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_LIFE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 80, .pp = 10, @@ -2427,6 +2715,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOVELY_KISS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -2442,6 +2732,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_FLYING, @@ -2460,6 +2752,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRANSFORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRANSFORM, .power = 0, .type = TYPE_NORMAL, @@ -2482,6 +2776,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 40, #else @@ -2500,6 +2796,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIZZY_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 70, .type = TYPE_NORMAL, @@ -2516,6 +2814,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPORE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -2532,6 +2832,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 100, #else @@ -2551,6 +2853,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYWAVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, #else @@ -2568,6 +2872,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -2585,6 +2891,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_ARMOR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -2606,6 +2914,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRABHAMMER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 100, .accuracy = 90, @@ -2629,6 +2939,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPLOSION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EXPLOSION, .power = 250, .type = TYPE_NORMAL, @@ -2643,6 +2955,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_SWIPES] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -2657,6 +2971,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONEMERANG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_GROUND, @@ -2671,6 +2987,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -2693,6 +3011,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SLIDE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 75, .type = TYPE_ROCK, @@ -2707,6 +3027,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_FANG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_NORMAL, @@ -2723,6 +3045,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHARPEN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -2740,6 +3064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONVERSION, .power = 0, .type = TYPE_NORMAL, @@ -2757,6 +3083,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRI_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRI_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -2771,6 +3099,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPER_FANG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_NORMAL, @@ -2786,6 +3116,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -2802,6 +3134,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBSTITUTE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SUBSTITUTE, .power = 0, .type = TYPE_NORMAL, @@ -2820,6 +3154,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, .effect = EFFECT_RECOIL_HP_25, @@ -2850,6 +3186,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKETCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SKETCH, .power = 0, .type = TYPE_NORMAL, @@ -2875,6 +3213,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRIPLE_KICK, .power = 10, .type = TYPE_FIGHTING, @@ -2890,6 +3230,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THIEF] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, .pp = 25, @@ -2914,6 +3256,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIDER_WEB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_BUG, @@ -2930,6 +3274,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_READER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, #else @@ -2948,6 +3294,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHTMARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 100, #else @@ -2967,6 +3315,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_WHEEL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 60, .type = TYPE_FIRE, @@ -2983,6 +3333,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNORE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 50, #else @@ -3004,6 +3356,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CURSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_TYPES >= GEN_5 .type = TYPE_GHOST, #else @@ -3025,6 +3379,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_NORMAL, @@ -3039,6 +3395,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION_2] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONVERSION_2, .power = 0, .type = TYPE_NORMAL, @@ -3056,6 +3414,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AEROBLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FLYING, @@ -3071,6 +3431,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_SPORE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, .target = MOVE_TARGET_BOTH, @@ -3095,6 +3457,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVERSAL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_FIGHTING, @@ -3109,6 +3473,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPITE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPITE, .power = 0, .type = TYPE_GHOST, @@ -3125,6 +3491,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER_SNOW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_USE_FROSTBITE == TRUE .effect = EFFECT_FROSTBITE_HIT, #else @@ -3143,6 +3511,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PROTECT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 4, #else @@ -3165,6 +3535,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MACH_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -3180,6 +3552,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCARY_FACE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 100, #else @@ -3199,6 +3573,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .makesContact = TRUE, #endif @@ -3215,6 +3591,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_KISS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_TYPES >= GEN_6 .type = TYPE_FAIRY, #else @@ -3234,6 +3612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELLY_DRUM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BELLY_DRUM, .power = 0, .type = TYPE_NORMAL, @@ -3251,6 +3631,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_BOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 90, .type = TYPE_POISON, @@ -3266,6 +3648,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SLAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 20, .type = TYPE_GROUND, @@ -3280,6 +3664,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTAZOOKA] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_WATER, @@ -3295,6 +3681,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKES] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPIKES, .power = 0, .type = TYPE_GROUND, @@ -3314,6 +3702,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZAP_CANNON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 120, #else @@ -3333,6 +3723,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESIGHT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 0, #else @@ -3353,6 +3745,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DESTINY_BOND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DESTINY_BOND, .power = 0, .type = TYPE_GHOST, @@ -3373,6 +3767,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PERISH_SONG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PERISH_SONG, .power = 0, .type = TYPE_NORMAL, @@ -3391,6 +3787,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICY_WIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 55, .type = TYPE_ICE, @@ -3406,6 +3804,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DETECT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 4, #else @@ -3430,6 +3830,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_RUSH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 90, #else @@ -3447,6 +3849,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOCK_ON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, #else @@ -3465,6 +3869,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OUTRAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, .pp = 10, @@ -3488,6 +3894,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSTORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SANDSTORM, .power = 0, .type = TYPE_ROCK, @@ -3505,6 +3913,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_DRAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 75, .pp = 10, @@ -3528,6 +3938,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDURE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 4, #else @@ -3552,6 +3964,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_TYPES >= GEN_6 .type = TYPE_FAIRY, #else @@ -3571,6 +3985,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLOUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ROCK, @@ -3587,6 +4003,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SWIPE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FALSE_SWIPE, .power = 40, .type = TYPE_NORMAL, @@ -3601,6 +4019,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWAGGER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .accuracy = 85, #else @@ -3620,6 +4040,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MILK_DRINK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -3642,6 +4064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 65, .type = TYPE_ELECTRIC, @@ -3657,6 +4081,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_CUTTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 40, #elif B_UPDATED_MOVE_DATA == GEN_5 @@ -3678,6 +4104,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_WING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_UP_HIT, .power = 70, .type = TYPE_STEEL, @@ -3693,6 +4121,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEAN_LOOK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -3709,6 +4139,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTRACT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTRACT, .power = 0, .type = TYPE_NORMAL, @@ -3725,6 +4157,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_TALK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SLEEP_TALK, .power = 0, .type = TYPE_NORMAL, @@ -3748,6 +4182,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BELL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_NORMAL, @@ -3767,6 +4203,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETURN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -3781,6 +4219,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRESENT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PRESENT, .power = 1, .type = TYPE_NORMAL, @@ -3795,6 +4235,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRUSTRATION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FRUSTRATION, .power = 1, .type = TYPE_NORMAL, @@ -3809,6 +4251,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAFEGUARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SAFEGUARD, .power = 0, .type = TYPE_NORMAL, @@ -3826,6 +4270,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAIN_SPLIT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PAIN_SPLIT, .power = 0, .type = TYPE_NORMAL, @@ -3840,6 +4286,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_FIRE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 100, .type = TYPE_FIRE, @@ -3855,6 +4303,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNITUDE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAGNITUDE, .power = 1, .type = TYPE_GROUND, @@ -3870,6 +4320,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMIC_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -3886,6 +4338,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGAHORN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_BUG, @@ -3900,6 +4354,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_BREATH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 60, .type = TYPE_DRAGON, @@ -3915,6 +4371,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BATON_PASS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BATON_PASS, .power = 0, .type = TYPE_NORMAL, @@ -3931,6 +4389,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENCORE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ENCORE, .power = 0, .type = TYPE_NORMAL, @@ -3948,6 +4408,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURSUIT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PURSUIT, .power = 40, .type = TYPE_DARK, @@ -3963,6 +4425,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAPID_SPIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 50, #else @@ -3981,6 +4445,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_SCENT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .effect = EFFECT_EVASION_DOWN_2, #else @@ -4000,6 +4466,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_TAIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 100, .type = TYPE_STEEL, @@ -4015,6 +4483,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_CLAW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_UP_HIT, .power = 50, .type = TYPE_STEEL, @@ -4030,6 +4500,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VITAL_THROW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_VITAL_THROW, .power = 70, .type = TYPE_FIGHTING, @@ -4044,6 +4516,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORNING_SUN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MORNING_SUN, .power = 0, .type = TYPE_NORMAL, @@ -4062,6 +4536,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNTHESIS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SYNTHESIS, .power = 0, .type = TYPE_GRASS, @@ -4080,6 +4556,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONLIGHT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_TYPES >= GEN_6 .type = TYPE_FAIRY, #else @@ -4102,6 +4580,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIDDEN_POWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .power = B_HIDDEN_POWER_DMG >= GEN_6 ? 60 : 1, .effect = EFFECT_HIDDEN_POWER, .type = TYPE_NORMAL, @@ -4115,6 +4595,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_CHOP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -4130,6 +4612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWISTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 40, .type = TYPE_DRAGON, @@ -4146,6 +4630,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAIN_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RAIN_DANCE, .power = 0, .type = TYPE_WATER, @@ -4162,6 +4648,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNNY_DAY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SUNNY_DAY, .power = 0, .type = TYPE_FIRE, @@ -4178,6 +4666,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_DEFENSE_DOWN_HIT, #else @@ -4198,6 +4688,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_COAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MIRROR_COAT, .power = 1, .type = TYPE_PSYCHIC, @@ -4215,6 +4707,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCH_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PSYCH_UP, .power = 0, .type = TYPE_NORMAL, @@ -4233,6 +4727,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_SPEED] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 2, #else @@ -4251,6 +4747,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCIENT_POWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA < GEN_4 .makesContact = TRUE, #endif @@ -4268,6 +4766,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_GHOST, @@ -4283,6 +4783,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUTURE_SIGHT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, .accuracy = 100, @@ -4308,6 +4810,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SMASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 40, #else @@ -4327,6 +4831,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLPOOL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 35, .accuracy = 85, @@ -4346,6 +4852,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAT_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 1, #else @@ -4363,6 +4871,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_OUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 3, .makesContact = TRUE, @@ -4385,6 +4895,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPROAR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 90, #else @@ -4406,6 +4918,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOCKPILE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .pp = 20, #else @@ -4427,6 +4941,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIT_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 1, #else @@ -4445,6 +4961,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWALLOW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SWALLOW, .power = 0, .type = TYPE_NORMAL, @@ -4463,6 +4981,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_WAVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 95, #else @@ -4482,6 +5002,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HAIL, .power = 0, .type = TYPE_ICE, @@ -4498,6 +5020,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORMENT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TORMENT, .power = 0, .type = TYPE_DARK, @@ -4513,6 +5037,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLATTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLATTER, .power = 0, .type = TYPE_DARK, @@ -4528,6 +5054,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILL_O_WISP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 85, #else @@ -4547,6 +5075,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEMENTO] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MEMENTO, .power = 0, .type = TYPE_DARK, @@ -4561,6 +5091,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FACADE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FACADE, .power = 70, .type = TYPE_NORMAL, @@ -4575,6 +5107,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FOCUS_PUNCH, .power = 150, .type = TYPE_FIGHTING, @@ -4597,6 +5131,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMELLING_SALTS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 70, #else @@ -4616,6 +5152,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOLLOW_ME] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .priority = 2, #else @@ -4639,6 +5177,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURE_POWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_NATURE_POWER, .power = 1, .type = TYPE_NORMAL, @@ -4659,6 +5199,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CHARGE, .power = 0, .type = TYPE_ELECTRIC, @@ -4676,6 +5218,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAUNT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TAUNT, .power = 0, .type = TYPE_DARK, @@ -4692,6 +5236,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HELPING_HAND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .target = MOVE_TARGET_ALLY, #else @@ -4716,6 +5262,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -4733,6 +5281,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLE_PLAY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ROLE_PLAY, .power = 0, .type = TYPE_PSYCHIC, @@ -4750,6 +5300,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WISH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_WISH, .power = 0, .type = TYPE_NORMAL, @@ -4768,6 +5320,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSIST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ASSIST, .power = 0, .type = TYPE_NORMAL, @@ -4790,6 +5344,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INGRAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_INGRAIN, .power = 0, .type = TYPE_GRASS, @@ -4808,6 +5364,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERPOWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SUPERPOWER, .power = 120, .type = TYPE_FIGHTING, @@ -4822,6 +5380,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_COAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAGIC_COAT, .power = 0, .type = TYPE_PSYCHIC, @@ -4838,6 +5398,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECYCLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECYCLE, .power = 0, .type = TYPE_NORMAL, @@ -4855,6 +5417,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVENGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_REVENGE, .power = 60, .type = TYPE_FIGHTING, @@ -4869,6 +5433,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRICK_BREAK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BRICK_BREAK, .power = 75, .type = TYPE_FIGHTING, @@ -4883,6 +5449,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_YAWN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_YAWN, .power = 0, .type = TYPE_NORMAL, @@ -4898,6 +5466,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KNOCK_OFF] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 65, #else @@ -4916,6 +5486,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDEAVOR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ENDEAVOR, .power = 1, .type = TYPE_NORMAL, @@ -4931,6 +5503,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ERUPTION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_FIRE, @@ -4944,6 +5518,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKILL_SWAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SKILL_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -4959,6 +5535,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IMPRISON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_IMPRISON, .power = 0, .type = TYPE_PSYCHIC, @@ -4978,6 +5556,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFRESH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_REFRESH, .power = 0, .type = TYPE_NORMAL, @@ -4995,6 +5575,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRUDGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GRUDGE, .power = 0, .type = TYPE_GHOST, @@ -5012,6 +5594,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNATCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SNATCH, .power = 0, .type = TYPE_DARK, @@ -5031,6 +5615,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_POWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SECRET_POWER, .power = 70, .type = TYPE_NORMAL, @@ -5045,6 +5631,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 80, #else @@ -5068,6 +5656,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARM_THRUST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_FIGHTING, @@ -5082,6 +5672,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAMOUFLAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CAMOUFLAGE, .power = 0, .type = TYPE_NORMAL, @@ -5099,6 +5691,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_GLOW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .effect = EFFECT_SPECIAL_ATTACK_UP_3, #else @@ -5120,6 +5714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUSTER_PURGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, @@ -5134,6 +5730,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST_BALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, @@ -5149,6 +5747,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEATHER_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN_2, .power = 0, .type = TYPE_FLYING, @@ -5165,6 +5765,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEETER_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TEETER_DANCE, .power = 0, .type = TYPE_NORMAL, @@ -5181,6 +5783,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZE_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 85, .type = TYPE_FIRE, @@ -5197,6 +5801,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SPORT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MUD_SPORT, .power = 0, .type = TYPE_GROUND, @@ -5214,6 +5820,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ICE, @@ -5231,6 +5839,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NEEDLE_ARM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_GRASS, @@ -5247,6 +5857,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLACK_OFF] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -5269,6 +5881,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_VOICE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -5284,6 +5898,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_FANG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .secondaryEffectChance = 50, #else @@ -5304,6 +5920,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_CLAW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 75, .type = TYPE_NORMAL, @@ -5319,6 +5937,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAST_BURN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_FIRE, @@ -5332,6 +5952,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_CANNON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_WATER, @@ -5345,6 +5967,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_MASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, .accuracy = 90, @@ -5366,6 +5990,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTONISH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 30, .type = TYPE_GHOST, @@ -5382,6 +6008,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WEATHER_BALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_WEATHER_BALL, .power = 50, .type = TYPE_NORMAL, @@ -5396,6 +6024,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATHERAPY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_GRASS, @@ -5413,6 +6043,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_TEARS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_DARK, @@ -5428,6 +6060,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_CUTTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -5448,6 +6082,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERHEAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 130, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -5468,6 +6104,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ODOR_SLEUTH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, #else @@ -5488,6 +6126,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_TOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, .accuracy = 95, @@ -5508,6 +6148,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILVER_WIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ALL_STATS_UP_HIT, .power = 60, .type = TYPE_BUG, @@ -5523,6 +6165,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_SOUND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_STEEL, @@ -5540,6 +6184,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_WHISTLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -5557,6 +6203,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TICKLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TICKLE, .power = 0, .type = TYPE_NORMAL, @@ -5572,6 +6220,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COSMIC_POWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_PSYCHIC, @@ -5589,6 +6239,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPOUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_WATER, @@ -5602,6 +6254,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIGNAL_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 75, .type = TYPE_BUG, @@ -5616,6 +6270,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GHOST, @@ -5631,6 +6287,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTRASENSORY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -5650,6 +6308,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_UPPERCUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SKY_UPPERCUT, .power = 85, .type = TYPE_FIGHTING, @@ -5666,6 +6326,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_TOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 35, .accuracy = 85, @@ -5684,6 +6346,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHEER_COLD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_ICE, @@ -5697,6 +6361,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUDDY_WATER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -5716,6 +6382,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_SEED] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 25, #else @@ -5734,6 +6402,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AERIAL_ACE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -5749,6 +6419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_SPEAR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 25, #else @@ -5766,6 +6438,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_DEFENSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -5783,6 +6457,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -5799,6 +6475,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOWL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .effect = EFFECT_ATTACK_UP_USER_ALLY, #else @@ -5821,6 +6499,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CLAW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DRAGON, @@ -5835,6 +6515,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRENZY_PLANT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_GRASS, @@ -5849,6 +6531,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULK_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BULK_UP, .power = 0, .type = TYPE_FIGHTING, @@ -5866,6 +6550,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 85, .type = TYPE_FLYING, @@ -5887,6 +6573,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 55, .type = TYPE_GROUND, @@ -5901,6 +6589,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_TAIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 50, .type = TYPE_POISON, @@ -5917,6 +6607,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COVET] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, .pp = 25, @@ -5948,6 +6640,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_TACKLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .argument = STATUS1_PARALYSIS, #endif @@ -5967,6 +6661,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_LEAF] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GRASS, @@ -5980,6 +6676,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPORT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_WATER_SPORT, .power = 0, .type = TYPE_WATER, @@ -5997,6 +6695,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CALM_MIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CALM_MIND, .power = 0, .type = TYPE_PSYCHIC, @@ -6014,6 +6714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_BLADE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 90, #else @@ -6034,6 +6736,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DRAGON_DANCE, .power = 0, .type = TYPE_DRAGON, @@ -6052,6 +6756,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_BLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 90, #else @@ -6070,6 +6776,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHOCK_WAVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_ELECTRIC, @@ -6083,6 +6791,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PULSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 60, .type = TYPE_WATER, @@ -6098,6 +6808,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOOM_DESIRE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 140, .accuracy = 100, @@ -6118,6 +6830,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_BOOST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_OVERHEAT, .power = 140, .type = TYPE_PSYCHIC, @@ -6131,6 +6845,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROOST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -6153,6 +6869,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAVITY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GRAVITY, .power = 0, .type = TYPE_PSYCHIC, @@ -6170,6 +6888,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRACLE_EYE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MIRACLE_EYE, .power = 0, .type = TYPE_PSYCHIC, @@ -6186,6 +6906,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAKE_UP_SLAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 70, #else @@ -6205,6 +6927,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAMMER_ARM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HAMMER_ARM, .power = 100, .type = TYPE_FIGHTING, @@ -6220,6 +6944,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GYRO_BALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GYRO_BALL, .power = 1, .type = TYPE_STEEL, @@ -6235,6 +6961,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEALING_WISH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEALING_WISH, .power = 0, .type = TYPE_PSYCHIC, @@ -6252,6 +6980,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRINE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BRINE, .power = 65, .type = TYPE_WATER, @@ -6265,6 +6995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURAL_GIFT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_NATURAL_GIFT, .power = 1, .type = TYPE_NORMAL, @@ -6278,6 +7010,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 30, #else @@ -6300,6 +7034,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLUCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BUG_BITE, .power = 60, .type = TYPE_FLYING, @@ -6314,6 +7050,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAILWIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 15, #else @@ -6336,6 +7074,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACUPRESSURE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACUPRESSURE, .power = 0, .type = TYPE_NORMAL, @@ -6353,6 +7093,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_BURST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_METAL_BURST, .power = 1, .type = TYPE_STEEL, @@ -6367,6 +7109,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_U_TURN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_ESCAPE, .power = 70, .type = TYPE_BUG, @@ -6381,6 +7125,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLOSE_COMBAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CLOSE_COMBAT, .power = 120, .type = TYPE_FIGHTING, @@ -6395,6 +7141,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAYBACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PAYBACK, .power = 50, .type = TYPE_DARK, @@ -6409,6 +7157,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSURANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -6427,6 +7177,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBARGO] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EMBARGO, .power = 0, .type = TYPE_DARK, @@ -6442,6 +7194,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLING, .power = 1, .type = TYPE_DARK, @@ -6456,6 +7210,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_SHIFT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, #else @@ -6474,6 +7230,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRUMP_CARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRUMP_CARD, .power = 1, .type = TYPE_NORMAL, @@ -6488,6 +7246,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BLOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEAL_BLOCK, .power = 0, .type = TYPE_PSYCHIC, @@ -6503,6 +7263,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRING_OUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_NORMAL, @@ -6517,6 +7279,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POWER_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -6534,6 +7298,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GASTRO_ACID] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GASTRO_ACID, .power = 0, .type = TYPE_POISON, @@ -6549,6 +7315,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUCKY_CHANT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LUCKY_CHANT, .power = 0, .type = TYPE_NORMAL, @@ -6566,6 +7334,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ME_FIRST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ME_FIRST, .power = 0, .type = TYPE_NORMAL, @@ -6590,6 +7360,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COPYCAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COPYCAT, .power = 0, .type = TYPE_NORMAL, @@ -6613,6 +7385,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SWAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POWER_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -6628,6 +7402,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SWAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GUARD_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -6643,6 +7419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PUNISHMENT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PUNISHMENT, .power = 60, .type = TYPE_DARK, @@ -6657,6 +7435,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESORT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 140, #else @@ -6675,6 +7455,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORRY_SEED] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_WORRY_SEED, .power = 0, .type = TYPE_GRASS, @@ -6690,6 +7472,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUCKER_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 70, #else @@ -6708,6 +7492,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_SPIKES] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TOXIC_SPIKES, .power = 0, .type = TYPE_POISON, @@ -6727,6 +7513,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_SWAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEART_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -6742,6 +7530,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_RING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_AQUA_RING, .power = 0, .type = TYPE_WATER, @@ -6759,6 +7549,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_RISE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAGNET_RISE, .power = 0, .type = TYPE_ELECTRIC, @@ -6777,6 +7569,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLARE_BLITZ] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_FIRE, @@ -6795,6 +7589,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORCE_PALM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -6810,6 +7606,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_SPHERE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -6829,6 +7627,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_POLISH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_ROCK, @@ -6846,6 +7646,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_JAB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 80, .type = TYPE_POISON, @@ -6861,6 +7663,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_PULSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_DARK, @@ -6876,6 +7680,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SLASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_DARK, @@ -6892,6 +7698,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_TAIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -6906,6 +7714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_BOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GRASS, @@ -6920,6 +7730,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_SLASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 15, #else @@ -6939,6 +7751,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_X_SCISSOR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_BUG, @@ -6954,6 +7768,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BUZZ] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_BUG, @@ -6970,6 +7786,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_PULSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 85, #else @@ -6988,6 +7806,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RUSH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 100, .type = TYPE_DRAGON, @@ -7004,6 +7824,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_GEM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -7021,6 +7843,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAIN_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 75, .pp = 10, @@ -7042,6 +7866,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VACUUM_WAVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -7055,6 +7881,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_BLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 120, .type = TYPE_FIGHTING, @@ -7070,6 +7898,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENERGY_BALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -7089,6 +7919,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRAVE_BIRD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_FLYING, @@ -7104,6 +7936,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTH_POWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_GROUND, @@ -7119,6 +7953,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWITCHEROO] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRICK, .power = 0, .type = TYPE_DARK, @@ -7136,6 +7972,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_IMPACT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_NORMAL, @@ -7150,6 +7988,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NASTY_PLOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, .type = TYPE_DARK, @@ -7167,6 +8007,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_STEEL, @@ -7182,6 +8024,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AVALANCHE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_REVENGE, .power = 60, .type = TYPE_ICE, @@ -7196,6 +8040,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SHARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ICE, @@ -7209,6 +8055,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_CLAW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GHOST, @@ -7224,6 +8072,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_FANG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_STATUS, .power = 65, .type = TYPE_ELECTRIC, @@ -7241,6 +8091,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_FANG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_USE_FROSTBITE == TRUE .argument = STATUS1_FROSTBITE, #else @@ -7262,6 +8114,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_FANG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_STATUS, .power = 65, .type = TYPE_FIRE, @@ -7279,6 +8133,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_SNEAK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GHOST, @@ -7293,6 +8149,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_BOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_GROUND, @@ -7308,6 +8166,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_CUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -7323,6 +8183,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZEN_HEADBUTT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -7338,6 +8200,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_STEEL, @@ -7352,6 +8216,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH_CANNON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_STEEL, @@ -7366,6 +8232,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_CLIMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 90, .type = TYPE_NORMAL, @@ -7381,6 +8249,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFOG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFOG, .power = 0, .type = TYPE_FLYING, @@ -7397,6 +8267,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_ROOM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRICK_ROOM, .power = 0, .type = TYPE_PSYCHIC, @@ -7412,6 +8284,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRACO_METEOR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 130, #else @@ -7429,6 +8303,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISCHARGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -7443,6 +8319,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAVA_PLUME] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 80, .type = TYPE_FIRE, @@ -7457,6 +8335,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_STORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 130, #else @@ -7474,6 +8354,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_WHIP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GRASS, @@ -7488,6 +8370,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_WRECKER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_ROCK, @@ -7502,6 +8386,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_POISON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 70, .type = TYPE_POISON, @@ -7519,6 +8405,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUNK_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 80, #else @@ -7537,6 +8425,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_HEAD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_STEEL, @@ -7552,6 +8442,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_BOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_STEEL, @@ -7566,6 +8458,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_EDGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_ROCK, @@ -7580,6 +8474,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAPTIVATE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CAPTIVATE, .power = 0, .type = TYPE_NORMAL, @@ -7595,6 +8491,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEALTH_ROCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STEALTH_ROCK, .power = 0, .type = TYPE_ROCK, @@ -7613,6 +8511,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_KNOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_GRASS, @@ -7628,6 +8528,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHATTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 65, .secondaryEffectChance = 100, @@ -7659,6 +8561,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUDGMENT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = 100, .type = TYPE_NORMAL, @@ -7673,6 +8577,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BITE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BUG_BITE, .power = 60, .type = TYPE_BUG, @@ -7687,6 +8593,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SP_ATTACK_UP_HIT, .power = 50, .type = TYPE_ELECTRIC, @@ -7701,6 +8609,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WOOD_HAMMER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_GRASS, @@ -7716,6 +8626,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_JET] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -7730,6 +8642,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTACK_ORDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_BUG, @@ -7744,6 +8658,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFEND_ORDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_BUG, @@ -7761,6 +8677,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_ORDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_BUG, @@ -7779,6 +8697,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_SMASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 150, .type = TYPE_ROCK, @@ -7794,6 +8714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_HIT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_NORMAL, @@ -7809,6 +8731,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR_OF_TIME] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_DRAGON, @@ -7822,6 +8746,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPACIAL_REND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -7836,6 +8762,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEALING_WISH, .power = 0, .type = TYPE_PSYCHIC, @@ -7854,6 +8782,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_GRIP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_NORMAL, @@ -7868,6 +8798,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGMA_STORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 100, .accuracy = 75, @@ -7889,6 +8821,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_VOID] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .accuracy = 50, #else @@ -7909,6 +8843,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_FLARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2, .power = 120, .type = TYPE_GRASS, @@ -7923,6 +8859,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OMINOUS_WIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ALL_STATS_UP_HIT, .power = 60, .type = TYPE_GHOST, @@ -7938,6 +8876,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_FORCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 120, .type = TYPE_GHOST, @@ -7959,6 +8899,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HONE_CLAWS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_ACCURACY_UP, .power = 0, .type = TYPE_DARK, @@ -7976,6 +8918,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WIDE_GUARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_ROCK, @@ -7996,6 +8940,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SPLIT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GUARD_SPLIT, .power = 0, .type = TYPE_PSYCHIC, @@ -8011,6 +8957,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SPLIT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POWER_SPLIT, .power = 0, .type = TYPE_PSYCHIC, @@ -8026,6 +8974,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WONDER_ROOM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .priority = 0, #else @@ -8045,6 +8995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PSYSHOCK, .power = 80, .type = TYPE_PSYCHIC, @@ -8058,6 +9010,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOSHOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_VENOSHOCK, .power = 65, .type = TYPE_POISON, @@ -8071,6 +9025,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AUTOTOMIZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_AUTOTOMIZE, .power = 0, .type = TYPE_STEEL, @@ -8088,6 +9044,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_POWDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .priority = 2, #else @@ -8112,6 +9070,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEKINESIS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TELEKINESIS, .power = 0, .type = TYPE_PSYCHIC, @@ -8128,6 +9088,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_ROOM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .priority = 0, #else @@ -8147,6 +9109,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMACK_DOWN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SMACK_DOWN, .power = 50, .type = TYPE_ROCK, @@ -8162,6 +9126,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORM_THROW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -8181,6 +9147,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_BURST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLAME_BURST, .power = 70, .type = TYPE_FIRE, @@ -8194,6 +9162,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_WAVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 95, .type = TYPE_POISON, @@ -8208,6 +9178,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUIVER_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_QUIVER_DANCE, .power = 0, .type = TYPE_BUG, @@ -8226,6 +9198,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAVY_SLAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEAT_CRASH, .power = 1, .type = TYPE_STEEL, @@ -8242,6 +9216,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNCHRONOISE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, .pp = 10, @@ -8260,6 +9236,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_BALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ELECTRO_BALL, .power = 1, .type = TYPE_ELECTRIC, @@ -8274,6 +9252,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOAK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_WATER, @@ -8289,6 +9269,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_CHARGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_UP_HIT, .power = 50, .type = TYPE_FIRE, @@ -8304,6 +9286,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COIL, .power = 0, .type = TYPE_POISON, @@ -8321,6 +9305,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_SWEEP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 65, #else @@ -8340,6 +9326,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_SPRAY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2, .power = 40, .type = TYPE_POISON, @@ -8355,6 +9343,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOUL_PLAY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FOUL_PLAY, .power = 95, .type = TYPE_DARK, @@ -8369,6 +9359,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIMPLE_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SIMPLE_BEAM, .power = 0, .type = TYPE_NORMAL, @@ -8384,6 +9376,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENTRAINMENT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ENTRAINMENT, .power = 0, .type = TYPE_NORMAL, @@ -8399,6 +9393,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AFTER_YOU] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_AFTER_YOU, .power = 0, .type = TYPE_NORMAL, @@ -8417,6 +9413,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROUND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ROUND, .power = 60, .type = TYPE_NORMAL, @@ -8432,6 +9430,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ECHOED_VOICE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ECHOED_VOICE, .power = 40, .type = TYPE_NORMAL, @@ -8447,6 +9447,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHIP_AWAY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -8462,6 +9464,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLEAR_SMOG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CLEAR_SMOG, .power = 50, .type = TYPE_POISON, @@ -8475,6 +9479,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORED_POWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STORED_POWER, .power = 20, .type = TYPE_PSYCHIC, @@ -8488,6 +9494,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_GUARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIGHTING, @@ -8508,6 +9516,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLY_SWITCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .priority = 2, #else @@ -8528,6 +9538,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 80, .type = TYPE_WATER, @@ -8543,6 +9555,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SMASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SHELL_SMASH, .power = 0, .type = TYPE_NORMAL, @@ -8560,6 +9574,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_PULSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEAL_PULSE, .power = 0, .type = TYPE_PSYCHIC, @@ -8578,6 +9594,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEX] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 65, #else @@ -8595,6 +9613,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_DROP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SKY_DROP, .power = 60, .type = TYPE_FLYING, @@ -8614,6 +9634,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHIFT_GEAR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SHIFT_GEAR, .power = 0, .type = TYPE_STEEL, @@ -8631,6 +9653,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CIRCLE_THROW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, .type = TYPE_FIGHTING, @@ -8647,6 +9671,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INCINERATE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -8664,6 +9690,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_QUASH, .power = 0, .type = TYPE_DARK, @@ -8679,6 +9707,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACROBATICS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACROBATICS, .power = 55, .type = TYPE_FLYING, @@ -8693,6 +9723,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT_TYPE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_REFLECT_TYPE, .power = 0, .type = TYPE_NORMAL, @@ -8709,6 +9741,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETALIATE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RETALIATE, .power = 70, .type = TYPE_NORMAL, @@ -8723,6 +9757,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FINAL_GAMBIT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FINAL_GAMBIT, .power = 1, .type = TYPE_FIGHTING, @@ -8738,6 +9774,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BESTOW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BESTOW, .power = 0, .type = TYPE_NORMAL, @@ -8757,6 +9795,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNO] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 100, .type = TYPE_FIRE, @@ -8771,6 +9811,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PLEDGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -8789,6 +9831,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PLEDGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -8807,6 +9851,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_PLEDGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -8825,6 +9871,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_SWITCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_ESCAPE, .power = 70, .type = TYPE_ELECTRIC, @@ -8838,6 +9886,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE_BUG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 50, #else @@ -8856,6 +9906,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLDOZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BULLDOZE, .power = 60, .type = TYPE_GROUND, @@ -8871,6 +9923,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FROST_BREATH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -8889,6 +9943,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_TAIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, .type = TYPE_DRAGON, @@ -8905,6 +9961,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORK_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_SPATK_UP, .power = 0, .type = TYPE_NORMAL, @@ -8922,6 +9980,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTROWEB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 55, .type = TYPE_ELECTRIC, @@ -8936,6 +9996,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILD_CHARGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 90, .type = TYPE_ELECTRIC, @@ -8951,6 +10013,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_RUN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GROUND, @@ -8966,6 +10030,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_CHOP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_DRAGON, @@ -8981,6 +10047,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_STAMP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_PSYCHIC, @@ -8996,6 +10064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_LEECH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ABSORB, .power = 75, .type = TYPE_GRASS, @@ -9011,6 +10081,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_SWORD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 15, #else @@ -9031,6 +10103,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_SHELL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 75, .type = TYPE_WATER, @@ -9047,6 +10121,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_CRASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEAT_CRASH, .power = 1, .type = TYPE_FIRE, @@ -9062,6 +10138,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_TORNADO] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_GRASS, @@ -9077,6 +10155,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAMROLLER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 65, .type = TYPE_BUG, @@ -9093,6 +10173,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_GUARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_UP_3, .power = 0, .type = TYPE_GRASS, @@ -9110,6 +10192,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_DAZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 85, .type = TYPE_DARK, @@ -9124,6 +10208,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSTRIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PSYSHOCK, .power = 100, .type = TYPE_PSYCHIC, @@ -9137,6 +10223,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_SLAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_NORMAL, @@ -9151,6 +10239,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HURRICANE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -9171,6 +10261,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_CHARGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_NORMAL, @@ -9186,6 +10278,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_GRIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -9201,6 +10295,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEARING_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 100, .type = TYPE_FIRE, @@ -9216,6 +10312,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TECHNO_BLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, #else @@ -9235,6 +10333,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RELIC_SONG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RELIC_SONG, .power = 75, .type = TYPE_NORMAL, @@ -9253,6 +10353,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_SWORD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PSYSHOCK, .power = 85, .type = TYPE_FIGHTING, @@ -9268,6 +10370,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIATE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 65, .type = TYPE_ICE, @@ -9282,6 +10386,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_STRIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 130, .type = TYPE_ELECTRIC, @@ -9297,6 +10403,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLUE_FLARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 130, .type = TYPE_FIRE, @@ -9311,6 +10419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SP_ATTACK_UP_HIT, .power = 80, .type = TYPE_FIRE, @@ -9326,6 +10436,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_SHOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_ICE, @@ -9345,6 +10457,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BURN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_ICE, @@ -9364,6 +10478,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNARL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 55, .type = TYPE_DARK, @@ -9381,6 +10497,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_CRASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 85, .type = TYPE_ICE, @@ -9395,6 +10513,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_V_CREATE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_V_CREATE, .power = 180, .type = TYPE_FIRE, @@ -9410,6 +10530,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_FLARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FUSION_COMBO, .power = 100, .type = TYPE_FIRE, @@ -9424,6 +10546,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_BOLT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FUSION_COMBO, .power = 100, .type = TYPE_ELECTRIC, @@ -9437,6 +10561,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLYING_PRESS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 100, #else @@ -9459,6 +10585,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAT_BLOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAT_BLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -9481,6 +10609,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BELCH, .power = 120, .type = TYPE_POISON, @@ -9502,6 +10632,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROTOTILLER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ROTOTILLER, .power = 0, .type = TYPE_GROUND, @@ -9519,6 +10651,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STICKY_WEB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STICKY_WEB, .power = 0, .type = TYPE_BUG, @@ -9537,6 +10671,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FELL_STINGER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 50, #else @@ -9555,6 +10691,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PHANTOM_FORCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 90, .type = TYPE_GHOST, @@ -9576,6 +10714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_OR_TREAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GHOST, @@ -9592,6 +10732,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOBLE_ROAR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_NOBLE_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -9609,6 +10751,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ION_DELUGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ION_DELUGE, .power = 0, .type = TYPE_ELECTRIC, @@ -9625,6 +10769,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARABOLIC_CHARGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 65, #else @@ -9643,6 +10789,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESTS_CURSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GRASS, @@ -9659,6 +10807,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_BLIZZARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GRASS, @@ -9673,6 +10823,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_DRY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FREEZE_DRY, .power = 70, .type = TYPE_ICE, @@ -9687,6 +10839,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISARMING_VOICE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FAIRY, @@ -9702,6 +10856,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARTING_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARTING_SHOT, .power = 0, .type = TYPE_DARK, @@ -9719,6 +10875,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOPSY_TURVY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .accuracy = 0, #else @@ -9738,6 +10896,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAINING_KISS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ABSORB, .power = 50, .type = TYPE_FAIRY, @@ -9754,6 +10914,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRAFTY_SHIELD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FAIRY, @@ -9772,6 +10934,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_SHIELD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLOWER_SHIELD, .power = 0, .type = TYPE_FAIRY, @@ -9788,6 +10952,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_TERRAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GRASSY_TERRAIN, .power = 0, .type = TYPE_GRASS, @@ -9805,6 +10971,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_TERRAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MISTY_TERRAIN, .power = 0, .type = TYPE_FAIRY, @@ -9822,6 +10990,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIFY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ELECTRIFY, .power = 0, .type = TYPE_ELECTRIC, @@ -9836,6 +11006,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_ROUGH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 90, .type = TYPE_FAIRY, @@ -9851,6 +11023,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_WIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FAIRY, @@ -9865,6 +11039,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONBLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 95, .type = TYPE_FAIRY, @@ -9879,6 +11055,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOOMBURST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_NORMAL, @@ -9894,6 +11072,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_LOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FAIRY_LOCK, .power = 0, .type = TYPE_FAIRY, @@ -9910,6 +11090,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINGS_SHIELD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_STEEL, @@ -9931,6 +11113,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_NICE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -9948,6 +11132,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFIDE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -9966,6 +11152,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIAMOND_STORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .effect = EFFECT_DEFENSE_UP2_HIT, #else @@ -9985,6 +11173,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAM_ERUPTION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 110, .type = TYPE_WATER, @@ -10001,6 +11191,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_HOLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FEINT, .power = 80, .type = TYPE_PSYCHIC, @@ -10017,6 +11209,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SHURIKEN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .category = BATTLE_CATEGORY_SPECIAL, #else @@ -10035,6 +11229,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_FIRE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 75, #else @@ -10053,6 +11249,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKY_SHIELD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_GRASS, @@ -10073,6 +11271,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATIC_MIST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_AROMATIC_MIST, .power = 0, .type = TYPE_FAIRY, @@ -10090,6 +11290,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_IMPULSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_2, .power = 0, .type = TYPE_ELECTRIC, @@ -10105,6 +11307,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOM_DRENCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_VENOM_DRENCH, .power = 0, .type = TYPE_POISON, @@ -10120,6 +11324,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POWDER, .power = 0, .type = TYPE_BUG, @@ -10136,6 +11342,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEOMANCY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GEOMANCY, .power = 0, .type = TYPE_FAIRY, @@ -10154,6 +11362,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNETIC_FLUX] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAGNETIC_FLUX, .power = 0, .type = TYPE_ELECTRIC, @@ -10172,6 +11382,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAPPY_HOUR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -10188,6 +11400,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIC_TERRAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ELECTRIC_TERRAIN, .power = 0, .type = TYPE_ELECTRIC, @@ -10205,6 +11419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DAZZLING_GLEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FAIRY, @@ -10218,6 +11434,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CELEBRATE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -10240,6 +11458,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_HANDS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -10262,6 +11482,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BABY_DOLL_EYES] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_FAIRY, @@ -10277,6 +11499,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NUZZLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 20, .type = TYPE_ELECTRIC, @@ -10292,6 +11516,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_BACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FALSE_SWIPE, .power = 40, .type = TYPE_NORMAL, @@ -10306,6 +11532,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFESTATION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRAP, .power = 20, .type = TYPE_BUG, @@ -10320,6 +11548,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_UP_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_UP_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -10336,6 +11566,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBLIVION_WING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ABSORB, .power = 80, .type = TYPE_FLYING, @@ -10351,6 +11583,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_ARROWS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SMACK_DOWN, .power = 90, .type = TYPE_GROUND, @@ -10368,6 +11602,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_WAVES] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_PREVENT_ESCAPE, .power = 90, .type = TYPE_GROUND, @@ -10383,6 +11619,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LANDS_WRATH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -10397,6 +11635,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_OF_RUIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL, .power = 140, .type = TYPE_FAIRY, @@ -10412,6 +11652,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORIGIN_PULSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 110, .type = TYPE_WATER, @@ -10427,6 +11669,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRECIPICE_BLADES] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GROUND, @@ -10441,6 +11685,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ASCENT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CLOSE_COMBAT, .power = 120, .type = TYPE_FLYING, @@ -10456,6 +11702,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_FURY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HYPERSPACE_FURY, .power = 100, .type = TYPE_DARK, @@ -10473,6 +11721,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHORE_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -10495,6 +11745,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRST_IMPRESSION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FAKE_OUT, .power = 90, .type = TYPE_BUG, @@ -10509,6 +11761,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BANEFUL_BUNKER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_POISON, @@ -10529,6 +11783,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_SHACKLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_PREVENT_ESCAPE, .power = 80, .type = TYPE_GHOST, @@ -10543,6 +11799,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARKEST_LARIAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -10558,6 +11816,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLING_ARIA] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPARKLING_ARIA, .power = 90, .type = TYPE_WATER, @@ -10575,6 +11835,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_HAMMER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HAMMER_ARM, .power = 100, .type = TYPE_ICE, @@ -10590,6 +11852,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLORAL_HEALING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HEAL_PULSE, .power = 0, .type = TYPE_FAIRY, @@ -10608,6 +11872,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_HORSEPOWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 95, .type = TYPE_GROUND, @@ -10622,6 +11888,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH_SAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STRENGTH_SAP, .power = 0, .type = TYPE_GRASS, @@ -10638,6 +11906,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BLADE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SOLAR_BEAM, .power = 125, .type = TYPE_GRASS, @@ -10656,6 +11926,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAFAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GRASS, @@ -10669,6 +11941,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPOTLIGHT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_NORMAL, @@ -10688,6 +11962,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_THREAD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TOXIC_THREAD, .power = 0, .type = TYPE_POISON, @@ -10703,6 +11979,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASER_FOCUS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LASER_FOCUS, .power = 0, .type = TYPE_NORMAL, @@ -10720,6 +11998,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GEAR_UP, .power = 0, .type = TYPE_STEEL, @@ -10738,6 +12018,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THROAT_CHOP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_THROAT_CHOP, .power = 80, .type = TYPE_DARK, @@ -10753,6 +12035,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLLEN_PUFF] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_ENEMY_HEAL_ALLY, .power = 90, .type = TYPE_BUG, @@ -10767,6 +12051,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCHOR_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_PREVENT_ESCAPE, .power = 80, .type = TYPE_STEEL, @@ -10782,6 +12068,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_TERRAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PSYCHIC_TERRAIN, .power = 0, .type = TYPE_PSYCHIC, @@ -10798,6 +12086,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 80, .type = TYPE_BUG, @@ -10813,6 +12103,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_LASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_FIRE, @@ -10828,6 +12120,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRIP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STORED_POWER, .power = 20, .type = TYPE_DARK, @@ -10842,6 +12136,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURN_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_UP, .power = 130, .type = TYPE_FIRE, @@ -10856,6 +12152,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPEED_SWAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -10871,6 +12169,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMART_STRIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_STEEL, @@ -10885,6 +12185,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURIFY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PURIFY, .power = 0, .type = TYPE_POISON, @@ -10902,6 +12204,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVELATION_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_REVELATION_DANCE, .power = 90, .type = TYPE_NORMAL, @@ -10916,6 +12220,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORE_ENFORCER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CORE_ENFORCER, .power = 100, .type = TYPE_DRAGON, @@ -10930,6 +12236,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TROP_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 70, .type = TYPE_GRASS, @@ -10945,6 +12253,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INSTRUCT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_INSTRUCT, .power = 0, .type = TYPE_PSYCHIC, @@ -10963,6 +12273,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAK_BLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BEAK_BLAST, .power = 100, .type = TYPE_FLYING, @@ -10984,6 +12296,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGING_SCALES] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACKER_DEFENSE_DOWN_HIT, .power = 110, .type = TYPE_DRAGON, @@ -10999,6 +12313,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_HAMMER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_DRAGON, @@ -11013,6 +12329,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRUTAL_SWING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DARK, @@ -11027,6 +12345,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_VEIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_AURORA_VEIL, .power = 0, .type = TYPE_ICE, @@ -11044,6 +12364,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_TRAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SHELL_TRAP, .power = 150, .type = TYPE_FIRE, @@ -11064,6 +12386,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLEUR_CANNON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_OVERHEAT, .power = 130, .type = TYPE_FAIRY, @@ -11078,6 +12402,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_FANGS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BRICK_BREAK, .power = 85, .type = TYPE_PSYCHIC, @@ -11093,6 +12419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMPING_TANTRUM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, .type = TYPE_GROUND, @@ -11108,6 +12436,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BONE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 85, .type = TYPE_GHOST, @@ -11122,6 +12452,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACCELEROCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ROCK, @@ -11136,6 +12468,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIQUIDATION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 85, .type = TYPE_WATER, @@ -11151,6 +12485,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRISMATIC_LASER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 160, .type = TYPE_PSYCHIC, @@ -11164,6 +12500,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPECTRAL_THIEF] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECTRAL_THIEF, .power = 90, .type = TYPE_GHOST, @@ -11180,6 +12518,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNSTEEL_STRIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_STEEL, @@ -11196,6 +12536,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONGEIST_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_GHOST, @@ -11211,6 +12553,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEARFUL_LOOK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_NOBLE_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -11227,6 +12571,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZING_ZAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -11241,6 +12587,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURES_MADNESS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_FAIRY, @@ -11255,6 +12603,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MULTI_ATTACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 120, #else @@ -11274,6 +12624,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_BLOWN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MIND_BLOWN, .power = 150, .type = TYPE_FIRE, @@ -11288,6 +12640,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLASMA_FISTS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLASMA_FISTS, .power = 100, .type = TYPE_ELECTRIC, @@ -11304,6 +12658,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PHOTON_GEYSER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PHOTON_GEYSER, .power = 100, .type = TYPE_PSYCHIC, @@ -11319,6 +12675,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZIPPY_ZAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 80, .effect = EFFECT_EVASION_UP_HIT, @@ -11342,6 +12700,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLISHY_SPLASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 90, .type = TYPE_WATER, @@ -11358,6 +12718,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOATY_FALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 90, .type = TYPE_FLYING, @@ -11376,6 +12738,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIKA_PAPOW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_ELECTRIC, @@ -11391,6 +12755,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCY_BUBBLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 60, .pp = 20, @@ -11413,6 +12779,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUZZY_BUZZ] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 60, .pp = 20, @@ -11433,6 +12801,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIZZLY_SLIDE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 60, .pp = 20, @@ -11455,6 +12825,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLITZY_GLOW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 80, .accuracy = 95, @@ -11475,6 +12847,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BADDY_BAD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 80, .accuracy = 95, @@ -11495,6 +12869,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAPPY_SEED] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 100, .accuracy = 90, @@ -11517,6 +12893,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZY_FROST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 100, .accuracy = 90, @@ -11538,6 +12916,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLY_SWIRL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 120, .accuracy = 85, @@ -11559,6 +12939,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VEEVEE_VOLLEY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -11575,6 +12957,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_IRON_BASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_STEEL, @@ -11594,6 +12978,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMAX_CANNON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_DRAGON, @@ -11616,6 +13002,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNIPE_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SNIPE_SHOT, .power = 80, .type = TYPE_WATER, @@ -11630,6 +13018,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JAW_LOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_JAW_LOCK, .power = 80, .type = TYPE_DARK, @@ -11645,6 +13035,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUFF_CHEEKS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STUFF_CHEEKS, .power = 0, .type = TYPE_NORMAL, @@ -11661,6 +13053,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NO_RETREAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_NO_RETREAT, .power = 0, .type = TYPE_FIGHTING, @@ -11677,6 +13071,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAR_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TAR_SHOT, .power = 0, .type = TYPE_ROCK, @@ -11691,6 +13087,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_POWDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_PSYCHIC, @@ -11707,6 +13105,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DARTS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, //TODO .power = 50, .type = TYPE_DRAGON, @@ -11722,6 +13122,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEATIME] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TEATIME, .power = 0, .type = TYPE_NORMAL, @@ -11738,6 +13140,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTOLOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_OCTOLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -11751,6 +13155,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_BEAK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BOLT_BEAK, .power = 85, .type = TYPE_ELECTRIC, @@ -11765,6 +13171,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISHIOUS_REND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BOLT_BEAK, .power = 85, .type = TYPE_WATER, @@ -11780,6 +13188,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COURT_CHANGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COURT_CHANGE, .power = 0, .type = TYPE_NORMAL, @@ -11794,6 +13204,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGOROUS_SOUL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CLANGOROUS_SOUL, .power = 0, .type = TYPE_DRAGON, @@ -11813,6 +13225,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_PRESS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BODY_PRESS, .power = 80, .type = TYPE_FIGHTING, @@ -11829,6 +13243,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DECORATE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DECORATE, .power = 0, .type = TYPE_FAIRY, @@ -11845,6 +13261,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRUM_BEATING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 80, .type = TYPE_GRASS, @@ -11860,6 +13278,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNAP_TRAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRAP, .power = 35, .type = TYPE_GRASS, @@ -11876,6 +13296,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PYRO_BALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 120, .type = TYPE_FIRE, @@ -11893,6 +13315,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BLADE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_STEEL, @@ -11912,6 +13336,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_STEEL, @@ -11930,6 +13356,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_WHEEL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_AURA_WHEEL, .power = 110, .type = TYPE_ELECTRIC, @@ -11944,6 +13372,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BREAKING_SWIPE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 60, .type = TYPE_DRAGON, @@ -11960,6 +13390,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRANCH_POKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GRASS, @@ -11975,6 +13407,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERDRIVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -11991,6 +13425,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_APPLE_ACID] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_GRASS, @@ -12006,6 +13442,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAV_APPLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GRAV_APPLE, .power = 80, .type = TYPE_GRASS, @@ -12021,6 +13459,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_BREAK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 75, .type = TYPE_FAIRY, @@ -12037,6 +13477,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRANGE_STEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 90, .type = TYPE_FAIRY, @@ -12052,6 +13494,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIFE_DEW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_WATER, @@ -12071,6 +13515,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBSTRUCT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_DARK, @@ -12089,6 +13535,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SURRENDER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -12104,6 +13552,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_ASSAULT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_FIGHTING, @@ -12119,6 +13569,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ETERNABEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECHARGE, .power = 160, .type = TYPE_DRAGON, @@ -12133,6 +13585,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STEEL_BEAM, .power = 140, .type = TYPE_STEEL, @@ -12147,6 +13601,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPANDING_FORCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EXPANDING_FORCE, .power = 80, .type = TYPE_PSYCHIC, @@ -12160,6 +13616,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_ROLLER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 130, .type = TYPE_STEEL, @@ -12176,6 +13634,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALE_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_DRAGON, @@ -12190,6 +13650,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_METEOR_BEAM, .power = 120, .type = TYPE_ROCK, @@ -12205,6 +13667,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SIDE_ARM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SHELL_SIDE_ARM, .power = 90, .type = TYPE_POISON, @@ -12219,6 +13683,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_EXPLOSION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EXPLOSION, .power = 100, .type = TYPE_FAIRY, @@ -12232,6 +13698,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_GLIDE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 55, #else @@ -12251,6 +13719,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RISING_VOLTAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RISING_VOLTAGE, .power = 70, .type = TYPE_ELECTRIC, @@ -12264,6 +13734,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERRAIN_PULSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TERRAIN_PULSE, .power = 50, .type = TYPE_NORMAL, @@ -12278,6 +13750,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKITTER_SMACK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 70, .type = TYPE_BUG, @@ -12293,6 +13767,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_JEALOUSY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 70, .type = TYPE_FIRE, @@ -12307,6 +13783,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASH_OUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_LASH_OUT, .power = 75, .type = TYPE_DARK, @@ -12321,6 +13799,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLTERGEIST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POLTERGEIST, .power = 110, .type = TYPE_GHOST, @@ -12334,6 +13814,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORROSIVE_GAS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CORROSIVE_GAS, .power = 0, .type = TYPE_POISON, @@ -12348,6 +13830,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COACHING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COACHING, .power = 0, .type = TYPE_FIGHTING, @@ -12364,6 +13848,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLIP_TURN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_ESCAPE, .power = 60, .type = TYPE_WATER, @@ -12378,6 +13864,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_AXEL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRIPLE_KICK, .power = 20, .type = TYPE_ICE, @@ -12393,6 +13881,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_WINGBEAT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FLYING, @@ -12408,6 +13898,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCORCHING_SANDS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 70, .type = TYPE_GROUND, @@ -12423,6 +13915,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUNGLE_HEALING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_GRASS, @@ -12441,6 +13935,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_BLOW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 75, #else @@ -12462,6 +13958,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURGING_STRIKES] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 25, .type = TYPE_WATER, @@ -12480,6 +13978,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_CAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TRAP, .power = 80, .type = TYPE_ELECTRIC, @@ -12494,6 +13994,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ENERGY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_DRAGON, @@ -12508,6 +14010,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZING_GLARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .power = 90, #if B_USE_FROSTBITE == TRUE .effect = EFFECT_FROSTBITE_HIT, @@ -12527,6 +14031,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_WRATH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 90, .type = TYPE_DARK, @@ -12541,6 +14047,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDEROUS_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_FIGHTING, @@ -12557,6 +14065,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIAL_LANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 120, #else @@ -12575,6 +14085,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTRAL_BARRAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GHOST, @@ -12589,6 +14101,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_SPELL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EERIE_SPELL, .power = 80, .type = TYPE_PSYCHIC, @@ -12605,6 +14119,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIRE_CLAW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 80, #else @@ -12624,6 +14140,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHIELD_BASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_UP_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -12639,6 +14157,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SHIFT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POWER_TRICK, .power = 0, .type = TYPE_NORMAL, @@ -12656,6 +14176,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_AXE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_SET_ENTRY_HAZARD, .power = 65, .type = TYPE_ROCK, @@ -12673,6 +14195,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPRINGTIDE_STORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 100, #else @@ -12693,6 +14217,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_POWER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_ATTACK_UP_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -12707,6 +14233,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_FURY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 120, #else @@ -12725,6 +14253,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAVE_CRASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 120, #else @@ -12745,6 +14275,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHLOROBLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 150, #else @@ -12762,6 +14294,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOUNTAIN_GALE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FLINCH_HIT, .power = 100, .type = TYPE_ICE, @@ -12776,6 +14310,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VICTORY_DANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_VICTORY_DANCE, .power = 0, .type = TYPE_FIGHTING, @@ -12793,6 +14329,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADLONG_RUSH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 120, #else @@ -12812,6 +14350,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARB_BARRAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BARB_BARRAGE, .power = 60, .type = TYPE_POISON, @@ -12830,6 +14370,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ESPER_WING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 80, .accuracy = 100, @@ -12850,6 +14392,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_MALICE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 75, #else @@ -12868,6 +14412,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -12884,6 +14430,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_ARROWS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 90, .pp = 10, @@ -12904,6 +14452,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNAL_PARADE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_INFERNAL_PARADE, .power = 60, .type = TYPE_GHOST, @@ -12918,6 +14468,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CEASELESS_EDGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_SET_ENTRY_HAZARD, .power = 65, .type = TYPE_DARK, @@ -12935,6 +14487,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLEAKWIND_STORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 100, .pp = 10, @@ -12955,6 +14509,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILDBOLT_STORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 100, .pp = 10, @@ -12975,6 +14531,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSEAR_STORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 100, .pp = 10, @@ -12995,6 +14553,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_BLESSING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_PSYCHIC, @@ -13012,6 +14572,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_HEART] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_TAKE_HEART, .power = 0, .type = TYPE_PSYCHIC, @@ -13028,6 +14590,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_BLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TERA_BLAST, .power = 80, .type = TYPE_NORMAL, @@ -13043,6 +14607,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILK_TRAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_BUG, @@ -13060,6 +14626,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AXE_KICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_AXE_KICK, .power = 120, .type = TYPE_FIGHTING, @@ -13075,6 +14643,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESPECTS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_LAST_RESPECTS .power = 50, .type = TYPE_GHOST, @@ -13089,6 +14659,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUMINA_CRASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2, .power = 80, .type = TYPE_PSYCHIC, @@ -13103,6 +14675,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORDER_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_ORDER_UP .power = 80, .type = TYPE_DRAGON, @@ -13119,6 +14693,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JET_PUNCH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_WATER, @@ -13136,6 +14712,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPICY_EXTRACT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SPICY_EXTRACT .power = 0, .type = TYPE_GRASS, @@ -13151,6 +14729,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIN_OUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPIN_OUT, .power = 100, .type = TYPE_STEEL, @@ -13166,6 +14746,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POPULATION_BOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POPULATION_BOMB, .power = 20, .type = TYPE_NORMAL, @@ -13183,6 +14765,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SPINNER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 80, .type = TYPE_ICE, @@ -13199,6 +14783,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLAIVE_RUSH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_GLAIVE_RUSH, .power = 120, .type = TYPE_DRAGON, @@ -13214,6 +14800,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVIVAL_BLESSING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_REVIVAL_BLESSING, .power = 0, .type = TYPE_NORMAL, @@ -13232,6 +14820,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SALT_CURE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SALT_CURE, .power = 40, .type = TYPE_ROCK, @@ -13247,6 +14837,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_DIVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_WATER, @@ -13262,6 +14854,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORTAL_SPIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MORTAL_SPIN, .power = 30, .type = TYPE_POISON, @@ -13277,6 +14871,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOODLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DOODLE, .power = 0, .type = TYPE_NORMAL, @@ -13293,6 +14889,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FILLET_AWAY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FILLET_AWAY, .power = 0, .type = TYPE_NORMAL, @@ -13311,6 +14909,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KOWTOW_CLEAVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -13326,6 +14926,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_TRICK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GRASS, @@ -13340,6 +14942,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORCH_SONG] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SP_ATTACK_UP_HIT, .power = 80, .type = TYPE_FIRE, @@ -13356,6 +14960,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_STEP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_UP_HIT, .power = 80, .type = TYPE_WATER, @@ -13372,6 +14978,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_BULL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RAGING_BULL, .power = 90, .type = TYPE_NORMAL, @@ -13387,6 +14995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAKE_IT_RAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAKE_IT_RAIN, .power = 120, .type = TYPE_STEEL, @@ -13401,6 +15011,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RUINATION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_DARK, @@ -13415,6 +15027,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COLLISION_COURSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COLLISION_COURSE, .power = 100, .type = TYPE_FIGHTING, @@ -13430,6 +15044,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_DRIFT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_COLLISION_COURSE, .power = 100, .type = TYPE_ELECTRIC, @@ -13445,6 +15061,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHED_TAIL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SHED_TAIL .power = 0, .type = TYPE_NORMAL, @@ -13462,6 +15080,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLY_RECEPTION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CHILLY_RECEPTION, .power = 0, .type = TYPE_ICE, @@ -13479,6 +15099,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TIDY_UP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TIDY_UP .power = 0, .type = TYPE_NORMAL, @@ -13495,6 +15117,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNOWSCAPE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SNOWSCAPE, .power = 0, .type = TYPE_ICE, @@ -13512,6 +15136,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUNCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 50, .type = TYPE_BUG, @@ -13527,6 +15153,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRAILBLAZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SPEED_UP_HIT, .power = 50, .type = TYPE_GRASS, @@ -13542,6 +15170,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLING_WATER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 50, .type = TYPE_WATER, @@ -13556,6 +15186,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_DRILL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -13572,6 +15204,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWIN_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_PSYCHIC, @@ -13587,6 +15221,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_FIST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RAGE_FIST, .power = 50, .type = TYPE_GHOST, @@ -13603,6 +15239,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARMOR_CANNON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CLOSE_COMBAT, .power = 120, .type = TYPE_FIRE, @@ -13617,6 +15255,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_BLADE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ABSORB, .power = 90, .type = TYPE_FIRE, @@ -13633,6 +15273,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SHOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_DOUBLE_SHOCK, .power = 120, .type = TYPE_ELECTRIC, @@ -13648,6 +15290,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGATON_HAMMER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 160, .type = TYPE_STEEL, @@ -13662,6 +15306,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMEUPPANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_METAL_BURST, .power = 1, .type = TYPE_DARK, @@ -13678,6 +15324,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_CUTTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_WATER, @@ -13693,6 +15341,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZING_TORQUE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_BURN_HIT, .power = 80, .type = TYPE_FIRE, @@ -13717,6 +15367,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_TORQUE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SLEEP_HIT, .power = 80, .type = TYPE_DARK, @@ -13741,6 +15393,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOXIOUS_TORQUE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_HIT, .power = 100, .type = TYPE_POISON, @@ -13765,6 +15419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMBAT_TORQUE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -13789,6 +15445,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_TORQUE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 100, .type = TYPE_FAIRY, @@ -13813,6 +15471,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBLADE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PSYBLADE, .power = 80, .type = TYPE_PSYCHIC, @@ -13828,6 +15488,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_STEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HYDRO_STEAM, .power = 80, .type = TYPE_WATER, @@ -13842,6 +15504,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOOD_MOON] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_NORMAL, @@ -13856,6 +15520,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MATCHA_GOTCHA] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MATCHA_GOTCHA, .power = 80, .type = TYPE_GRASS, @@ -13872,6 +15538,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYRUP_BOMB] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SYRUP_BOMB, .power = 60, .type = TYPE_GRASS, @@ -13887,6 +15555,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IVY_CUDGEL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_IVY_CUDGEL, .power = 100, .type = TYPE_GRASS, @@ -13902,6 +15572,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_SHOT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_METEOR_BEAM, .power = 130, .type = TYPE_ELECTRIC, @@ -13916,6 +15588,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_STARSTORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_TERA_STARSTORM .power = 120, .type = TYPE_NORMAL, // Stellar type if used by Terapagos-Stellar @@ -13933,6 +15607,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FICKLE_BEAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FICKLE_BEAM, .power = 80, .type = TYPE_DRAGON, @@ -13946,6 +15622,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_BULWARK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIRE, @@ -13966,6 +15644,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERCLAP] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SUCKER_PUNCH, .power = 70, .type = TYPE_ELECTRIC, @@ -13979,6 +15659,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIGHTY_CLEAVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_FEINT, .power = 95, .type = TYPE_ROCK, @@ -13994,6 +15676,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACHYON_CUTTER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -14009,6 +15693,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARD_PRESS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_STEEL, @@ -14023,6 +15709,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CHEER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_DRAGON_CHEER .power = 0, .type = TYPE_DRAGON, @@ -14037,6 +15725,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLURING_VOICE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_CONFUSE_HIT, .power = 80, .type = TYPE_FAIRY, @@ -14053,6 +15743,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEMPER_FLARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, .type = TYPE_FIRE, @@ -14067,6 +15759,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERCELL_SLAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_RECOIL_IF_MISS, .power = 100, .type = TYPE_ELECTRIC, @@ -14081,6 +15775,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_NOISE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_PSYCHIC_NOISE .power = 75, .type = TYPE_PSYCHIC, @@ -14096,6 +15792,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPPER_HAND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_UPPER_HAND .power = 65, .type = TYPE_FIGHTING, @@ -14110,6 +15808,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MALIGNANT_CHAIN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_POISON_FANG, .power = 100, .type = TYPE_POISON, @@ -14124,6 +15824,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = // Z-Moves [MOVE_BREAKNECK_BLITZ] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_NORMAL, @@ -14136,6 +15838,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ALL_OUT_PUMMELING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_FIGHTING, @@ -14148,6 +15852,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUPERSONIC_SKYSTRIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_FLYING, @@ -14160,6 +15866,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ACID_DOWNPOUR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_POISON, @@ -14172,6 +15880,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TECTONIC_RAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_GROUND, @@ -14185,6 +15895,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CONTINENTAL_CRUSH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_ROCK, @@ -14197,6 +15909,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SAVAGE_SPIN_OUT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_BUG, @@ -14209,6 +15923,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_NEVER_ENDING_NIGHTMARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_GHOST, @@ -14221,6 +15937,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CORKSCREW_CRASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_STEEL, @@ -14233,6 +15951,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_INFERNO_OVERDRIVE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_FIRE, @@ -14245,6 +15965,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_HYDRO_VORTEX] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_WATER, @@ -14257,6 +15979,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLOOM_DOOM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_GRASS, @@ -14269,6 +15993,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GIGAVOLT_HAVOC] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_ELECTRIC, @@ -14281,6 +16007,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SHATTERED_PSYCHE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_PSYCHIC, @@ -14293,6 +16021,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUBZERO_SLAMMER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_ICE, @@ -14305,6 +16035,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_DEVASTATING_DRAKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_DRAGON, @@ -14317,6 +16049,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLACK_HOLE_ECLIPSE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_DARK, @@ -14329,6 +16063,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TWINKLE_TACKLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_FAIRY, @@ -14341,6 +16077,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CATASTROPIKA] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 210, .type = TYPE_ELECTRIC, @@ -14353,6 +16091,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_10000000_VOLT_THUNDERBOLT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 195, .type = TYPE_ELECTRIC, @@ -14366,6 +16106,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_STOKED_SPARKSURFER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PARALYZE_HIT, .power = 175, .type = TYPE_ELECTRIC, @@ -14378,6 +16120,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_EXTREME_EVOBOOST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, .type = TYPE_NORMAL, @@ -14390,6 +16134,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_PULVERIZING_PANCAKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 210, .type = TYPE_NORMAL, @@ -14402,6 +16148,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GENESIS_SUPERNOVA] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, .type = TYPE_PSYCHIC, @@ -14415,6 +16163,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SINISTER_ARROW_RAID] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 180, .type = TYPE_GHOST, @@ -14427,6 +16177,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MALICIOUS_MOONSAULT] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 180, .type = TYPE_DARK, @@ -14439,6 +16191,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_OCEANIC_OPERETTA] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 195, .type = TYPE_WATER, @@ -14451,6 +16205,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SPLINTERED_STORMSHARDS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, .type = TYPE_ROCK, @@ -14464,6 +16220,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LETS_SNUGGLE_FOREVER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 190, .type = TYPE_FAIRY, @@ -14476,6 +16234,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CLANGOROUS_SOULBLAZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_ALL_STATS_UP_HIT, .power = 185, .type = TYPE_DRAGON, @@ -14490,6 +16250,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GUARDIAN_OF_ALOLA] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_FAIRY, @@ -14502,6 +16264,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SEARING_SUNRAZE_SMASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 200, .type = TYPE_STEEL, @@ -14514,6 +16278,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 200, .type = TYPE_GHOST, @@ -14526,6 +16292,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 200, .type = TYPE_PSYCHIC, @@ -14538,6 +16306,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_HIT, .power = 195, .type = TYPE_GHOST, @@ -14551,6 +16321,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_NORMAL, @@ -14565,6 +16337,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FIRE, @@ -14579,6 +16353,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_BUG, @@ -14593,6 +16369,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ELECTRIC, @@ -14607,6 +16385,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_NORMAL, @@ -14621,6 +16401,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FIGHTING, @@ -14635,6 +16417,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_GHOST, @@ -14649,6 +16433,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ICE, @@ -14663,6 +16449,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_POISON, @@ -14677,6 +16465,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_WATER, @@ -14691,6 +16481,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FLYING, @@ -14705,6 +16497,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FAIRY, @@ -14719,6 +16513,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_DRAGON, @@ -14733,6 +16529,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_PSYCHIC, @@ -14747,6 +16545,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ROCK, @@ -14761,6 +16561,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_GROUND, @@ -14776,6 +16578,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_DARK, @@ -14790,6 +16594,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -14804,6 +16610,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -14817,7 +16625,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_G_MAX_VINE_LASH] = - { //ANIM TODO + { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -14832,6 +16642,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -14845,7 +16657,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_G_MAX_CANNONADE] = - { //ANIM TODO + { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -14860,6 +16674,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_BUG, @@ -14874,6 +16690,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ELECTRIC, @@ -14888,6 +16706,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -14902,6 +16722,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIGHTING, @@ -14916,6 +16738,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GHOST, @@ -14930,6 +16754,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -14944,6 +16770,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ICE, @@ -14958,6 +16786,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -14972,6 +16802,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -14986,6 +16818,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_POISON, @@ -15000,6 +16834,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -15013,7 +16849,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_G_MAX_DRUM_SOLO] = - { //ANIM TODO + { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -15028,7 +16866,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_G_MAX_FIREBALL] = - { //ANIM TODO + { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -15043,7 +16883,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_G_MAX_HYDROSNIPE] = - { //ANIM TODO + { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -15059,6 +16901,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FLYING, @@ -15073,6 +16917,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_PSYCHIC, @@ -15087,6 +16933,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -15101,6 +16949,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ROCK, @@ -15115,6 +16965,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -15129,6 +16981,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -15143,6 +16997,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GROUND, @@ -15157,6 +17013,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ELECTRIC, @@ -15171,6 +17029,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -15185,6 +17045,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FAIRY, @@ -15200,6 +17062,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DARK, @@ -15214,6 +17078,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FAIRY, @@ -15228,6 +17094,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -15242,6 +17110,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DRAGON, @@ -15256,6 +17126,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DARK, @@ -15269,7 +17141,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_G_MAX_RAPID_FLOW] = - { //ANIM TODO + { + .name = _("Dummy"), + .description = COMPOUND_STRING("Dummy description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, diff --git a/src/data/party_menu.h b/src/data/party_menu.h index a053754f46b9..bc2a423efbb7 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -719,20 +719,20 @@ struct [MENU_CATALOG_MOWER] = {gText_LawnMower, CursorCb_CatalogMower}, [MENU_CHANGE_FORM] = {gText_ChangeForm, CursorCb_ChangeForm}, [MENU_CHANGE_ABILITY] = {gText_ChangeAbility, CursorCb_ChangeAbility}, - [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gMoveNames[MOVE_CUT], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gMoveNames[MOVE_FLASH], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gMoveNames[MOVE_ROCK_SMASH], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gMoveNames[MOVE_STRENGTH], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gMoveNames[MOVE_SURF], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gMoveNames[MOVE_FLY], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gMoveNames[MOVE_DIVE], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gMoveNames[MOVE_WATERFALL], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gMoveNames[MOVE_TELEPORT], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gMoveNames[MOVE_DIG], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gMoveNames[MOVE_SECRET_POWER], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gMoveNames[MOVE_MILK_DRINK], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gMoveNames[MOVE_SOFT_BOILED], CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gMoveNames[MOVE_SWEET_SCENT], CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gBattleMoves[MOVE_CUT].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gBattleMoves[MOVE_FLASH].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gBattleMoves[MOVE_ROCK_SMASH].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gBattleMoves[MOVE_STRENGTH].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gBattleMoves[MOVE_SURF].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gBattleMoves[MOVE_FLY].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gBattleMoves[MOVE_DIVE].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gBattleMoves[MOVE_WATERFALL].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gBattleMoves[MOVE_TELEPORT].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gBattleMoves[MOVE_DIG].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gBattleMoves[MOVE_SECRET_POWER].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gBattleMoves[MOVE_MILK_DRINK].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gBattleMoves[MOVE_SOFT_BOILED].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gBattleMoves[MOVE_SWEET_SCENT].name, CursorCb_FieldMove}, }; static const u8 sPartyMenuAction_SummarySwitchCancel[] = {MENU_SUMMARY, MENU_SWITCH, MENU_CANCEL1}; diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h deleted file mode 100644 index 4aa7293036fe..000000000000 --- a/src/data/text/move_descriptions.h +++ /dev/null @@ -1,4193 +0,0 @@ - -#if B_BINDING_TURNS >= GEN_5 -#define BINDING_TURNS "4 or 5" -#else -#define BINDING_TURNS "2 to 5" -#endif - -static const u8 sNullDescription[] = _( - ""); - -static const u8 sPoundDescription[] = _( - "Pounds the foe with\n" - "forelegs or tail."); - -static const u8 sKarateChopDescription[] = _( - "A chopping attack with a\n" - "high critical-hit ratio."); - -static const u8 sDoubleSlapDescription[] = _( - "Repeatedly slaps the foe\n" - "2 to 5 times."); - -static const u8 sCometPunchDescription[] = _( - "Repeatedly punches the foe\n" - "2 to 5 times."); - -static const u8 sMegaPunchDescription[] = _( - "A strong punch thrown with\n" - "incredible power."); - -static const u8 sPayDayDescription[] = _( - "Throws coins at the foe.\n" - "Money is recovered after."); - -static const u8 sFirePunchDescription[] = _( - "A fiery punch that may burn\n" - "the foe."); - -static const u8 sIcePunchDescription[] = _( - "An icy punch that may\n" -#if B_USE_FROSTBITE == TRUE - "leave the foe with frostbite."); -#else - "freeze the foe."); -#endif - -static const u8 sThunderPunchDescription[] = _( - "An electrified punch that\n" - "may paralyze the foe."); - -static const u8 sScratchDescription[] = _( - "Scratches the foe with\n" - "sharp claws."); - -static const u8 sViseGripDescription[] = _( - "Grips the foe with large and\n" - "powerful pincers."); - -static const u8 sGuillotineDescription[] = _( - "A powerful pincer attack\n" - "that may cause fainting."); - -static const u8 sRazorWindDescription[] = _( - "A 2-turn move that strikes\n" - "the foe on the 2nd turn."); - -static const u8 sSwordsDanceDescription[] = _( - "A fighting dance that\n" - "sharply raises Attack."); - -static const u8 sCutDescription[] = _( - "Cuts the foe with sharp\n" - "scythes, claws, etc."); - -static const u8 sGustDescription[] = _( - "Strikes the foe with a gust\n" - "of wind whipped up by wings."); - -static const u8 sWingAttackDescription[] = _( - "Strikes the foe with wings\n" - "spread wide."); - -static const u8 sWhirlwindDescription[] = _( - "Blows away the foe with\n" - "wind and ends the battle."); - -static const u8 sFlyDescription[] = _( - "Flies up on the first turn,\n" - "then strikes the next turn."); - -static const u8 sBindDescription[] = _( - "Binds and squeezes the foe\n" - "for "BINDING_TURNS" turns."); - -static const u8 sSlamDescription[] = _( - "Slams the foe with a long\n" - "tail, vine, etc."); - -static const u8 sVineWhipDescription[] = _( - "Strikes the foe with\n" - "slender, whiplike vines."); - -static const u8 sStompDescription[] = _( - "Stomps the enemy with a big\n" - "foot. May cause flinching."); - -static const u8 sDoubleKickDescription[] = _( - "A double-kicking attack\n" - "that strikes the foe twice."); - -static const u8 sMegaKickDescription[] = _( - "An extremely powerful kick\n" - "with intense force."); - -static const u8 sJumpKickDescription[] = _( - "A strong jumping kick. May\n" - "miss and hurt the kicker."); - -static const u8 sRollingKickDescription[] = _( - "A fast kick delivered from\n" - "a rapid spin."); - -static const u8 sSandAttackDescription[] = _( - "Reduces the foe's accuracy\n" - "by hurling sand in its face."); - -static const u8 sHeadbuttDescription[] = _( - "A ramming attack that may\n" - "cause flinching."); - -static const u8 sHornAttackDescription[] = _( - "Jabs the foe with sharp\n" - "horns."); - -static const u8 sFuryAttackDescription[] = _( - "Jabs the foe 2 to 5 times\n" - "with sharp horns, etc."); - -static const u8 sHornDrillDescription[] = _( - "A one-hit KO attack that\n" - "uses a horn like a drill."); - -static const u8 sTackleDescription[] = _( - "Charges the foe with a full-\n" - "body tackle."); - -static const u8 sBodySlamDescription[] = _( - "A full-body slam that may\n" - "cause paralysis."); - -static const u8 sWrapDescription[] = _( - "Wraps and squeezes the foe\n" - BINDING_TURNS" times with vines, etc."); - -static const u8 sTakeDownDescription[] = _( - "A reckless charge attack\n" - "that also hurts the user."); - -static const u8 sThrashDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); - -static const u8 sDoubleEdgeDescription[] = _( - "A life-risking tackle that\n" - "also hurts the user."); - -static const u8 sTailWhipDescription[] = _( - "Wags the tail to lower the\n" - "foe's Defense."); - -static const u8 sPoisonStingDescription[] = _( - "A toxic attack with barbs,\n" - "etc., that may poison."); - -static const u8 sTwineedleDescription[] = _( - "Stingers on the forelegs\n" - "jab the foe twice."); - -static const u8 sPinMissileDescription[] = _( - "Sharp pins are fired to\n" - "strike 2 to 5 times."); - -static const u8 sLeerDescription[] = _( - "Frightens the foe with a\n" - "leer to lower Defense."); - -static const u8 sBiteDescription[] = _( - "Bites with vicious fangs.\n" - "May cause flinching."); - -static const u8 sGrowlDescription[] = _( - "Growls cutely to reduce the\n" - "foe's Attack."); - -static const u8 sRoarDescription[] = _( - "Makes the foe flee to end\n" - "the battle."); - -static const u8 sSingDescription[] = _( - "A soothing song lulls the\n" - "foe into a deep slumber."); - -static const u8 sSupersonicDescription[] = _( - "Emits bizarre sound waves\n" - "that may confuse the foe."); - -static const u8 sSonicBoomDescription[] = _( - "Launches shock waves that\n" - "always inflict 20 HP damage."); - -static const u8 sDisableDescription[] = _( - "Psychically disables one of\n" - "the foe's moves."); - -static const u8 sAcidDescription[] = _( - "Sprays a hide-melting acid.\n" -#if B_UPDATED_MOVE_DATA >= GEN_4 - "May lower Sp. Def."); -#else - "May lower Defense."); -#endif - -static const u8 sEmberDescription[] = _( - "A weak fire attack that may\n" - "inflict a burn."); - -static const u8 sFlamethrowerDescription[] = _( - "A powerful fire attack that\n" - "may inflict a burn."); - -static const u8 sMistDescription[] = _( - "Creates a mist that stops\n" - "reduction of abilities."); - -static const u8 sWaterGunDescription[] = _( - "Squirts water to attack\n" - "the foe."); - -static const u8 sHydroPumpDescription[] = _( - "Blasts water at high power\n" - "to strike the foe."); - -static const u8 sSurfDescription[] = _( - "Creates a huge wave, then\n" - "crashes it down on the foe."); - -static const u8 sIceBeamDescription[] = _( - "Blasts the foe with an icy\n" -#if B_USE_FROSTBITE == TRUE - "beam. May cause frostbite."); -#else - "beam that may freeze it."); -#endif - -static const u8 sBlizzardDescription[] = _( - "Hits the foe with an icy\n" -#if B_USE_FROSTBITE == TRUE - "storm. May cause frostbite."); -#else - "storm that may freeze it."); -#endif - -static const u8 sPsybeamDescription[] = _( - "Fires a peculiar ray that\n" - "may confuse the foe."); - -static const u8 sBubbleBeamDescription[] = _( - "Forcefully sprays bubbles\n" - "that may lower Speed."); - -static const u8 sAuroraBeamDescription[] = _( - "Fires a rainbow-colored\n" - "beam that may lower Attack."); - -static const u8 sHyperBeamDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); - -static const u8 sPeckDescription[] = _( - "Attacks the foe with a\n" - "jabbing beak, etc."); - -static const u8 sDrillPeckDescription[] = _( - "A corkscrewing attack with\n" - "the beak acting as a drill."); - -static const u8 sSubmissionDescription[] = _( - "A reckless body slam that\n" - "also hurts the user."); - -static const u8 sLowKickDescription[] = _( - "A kick that inflicts more\n" - "damage on heavier foes."); - -static const u8 sCounterDescription[] = _( - "Retaliates any physical hit\n" - "with double the power."); - -static const u8 sSeismicTossDescription[] = _( - "Inflicts damage identical\n" - "to the user's level."); - -static const u8 sStrengthDescription[] = _( - "Builds enormous power,\n" - "then slams the foe."); - -static const u8 sAbsorbDescription[] = _( - "An attack that absorbs\n" - "half the damage inflicted."); - -static const u8 sMegaDrainDescription[] = _( - "An attack that absorbs\n" - "half the damage inflicted."); - -static const u8 sLeechSeedDescription[] = _( - "Plants a seed on the foe to\n" - "steal HP on every turn."); - -static const u8 sGrowthDescription[] = _( - "Forces the body to grow\n" - "and heightens Sp. Atk."); - -static const u8 sRazorLeafDescription[] = _( - "Cuts the enemy with leaves.\n" - "High critical-hit ratio."); - -static const u8 sSolarBeamDescription[] = _( - "Absorbs light in one turn,\n" - "then attacks next turn."); - -static const u8 sPoisonPowderDescription[] = _( - "Scatters a toxic powder\n" - "that may poison the foe."); - -static const u8 sStunSporeDescription[] = _( - "Scatters a powder that may\n" - "paralyze the foe."); - -static const u8 sSleepPowderDescription[] = _( - "Scatters a powder that may\n" - "cause the foe to sleep."); - -static const u8 sPetalDanceDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); - -static const u8 sStringShotDescription[] = _( - "Binds the foe with string\n" - "to reduce its Speed."); - -static const u8 sDragonRageDescription[] = _( - "Launches shock waves that\n" - "always inflict 40 HP damage."); - -static const u8 sFireSpinDescription[] = _( - "Traps the foe in a ring of\n" - "fire for "BINDING_TURNS" turns."); - -static const u8 sThunderShockDescription[] = _( - "An electrical attack that\n" - "may paralyze the foe."); - -static const u8 sThunderboltDescription[] = _( - "A strong electrical attack\n" - "that may paralyze the foe."); - -static const u8 sThunderWaveDescription[] = _( - "A weak jolt of electricity\n" - "that paralyzes the foe."); - -static const u8 sThunderDescription[] = _( - "A lightning attack that may\n" - "cause paralysis."); - -static const u8 sRockThrowDescription[] = _( - "Throws small rocks to\n" - "strike the foe."); - -static const u8 sEarthquakeDescription[] = _( - "A powerful quake, but has\n" - "no effect on flying foes."); - -static const u8 sFissureDescription[] = _( - "A one-hit KO move that\n" - "drops the foe in a fissure."); - -static const u8 sDigDescription[] = _( - "Digs underground the first\n" - "turn and strikes next turn."); - -static const u8 sToxicDescription[] = _( - "Poisons the foe with an\n" - "intensifying toxin."); - -static const u8 sConfusionDescription[] = _( - "A psychic attack that may\n" - "cause confusion."); - -static const u8 sPsychicDescription[] = _( - "A powerful psychic attack\n" - "that may lower Sp. Def."); - -static const u8 sHypnosisDescription[] = _( - "A hypnotizing move that\n" - "may induce sleep."); - -static const u8 sMeditateDescription[] = _( - "Meditates in a peaceful\n" - "fashion to raise Attack."); - -static const u8 sAgilityDescription[] = _( - "Relaxes the body to sharply\n" - "boost Speed."); - -static const u8 sQuickAttackDescription[] = _( - "An extremely fast attack\n" - "that always strikes first."); - -static const u8 sRageDescription[] = _( - "Raises the user's Attack\n" - "every time it is hit."); - -static const u8 sTeleportDescription[] = _( - "A psychic move for fleeing\n" - "from battle instantly."); - -static const u8 sNightShadeDescription[] = _( - "Inflicts damage identical\n" - "to the user's level."); - -static const u8 sMimicDescription[] = _( - "Copies a move used by the\n" - "foe during one battle."); - -static const u8 sScreechDescription[] = _( - "Emits a screech to sharply\n" - "reduce the foe's Defense."); - -static const u8 sDoubleTeamDescription[] = _( - "Creates illusory copies to\n" - "raise evasiveness."); - -static const u8 sRecoverDescription[] = _( - "Recovers up to half the\n" - "user's maximum HP."); - -static const u8 sHardenDescription[] = _( - "Stiffens the body's \n" - "muscles to raise Defense."); - -static const u8 sMinimizeDescription[] = _( - "Minimizes the user's size\n" - "to raise evasiveness."); - -static const u8 sSmokescreenDescription[] = _( - "Lowers the foe's accuracy\n" - "using smoke, ink, etc."); - -static const u8 sConfuseRayDescription[] = _( - "A sinister ray that\n" - "confuses the foe."); - -static const u8 sWithdrawDescription[] = _( - "Withdraws the body into its\n" - "hard shell to raise Defense."); - -static const u8 sDefenseCurlDescription[] = _( - "Curls up to conceal weak\n" - "spots and raise Defense."); - -static const u8 sBarrierDescription[] = _( - "Creates a barrier that\n" - "sharply raises Defense."); - -static const u8 sLightScreenDescription[] = _( - "Creates a wall of light that\n" - "lowers Sp. Atk damage."); - -static const u8 sHazeDescription[] = _( - "Creates a black haze that\n" - "eliminates all stat changes."); - -static const u8 sReflectDescription[] = _( - "Creates a wall of light that\n" - "weakens physical attacks."); - -static const u8 sFocusEnergyDescription[] = _( - "Focuses power to raise the\n" - "critical-hit ratio."); - -static const u8 sBideDescription[] = _( - "Endures attack for 2\n" - "turns to retaliate double."); - -static const u8 sMetronomeDescription[] = _( - "Waggles a finger to use any\n" - "Pokémon move at random."); - -static const u8 sMirrorMoveDescription[] = _( - "Counters the foe's attack\n" - "with the same move."); - -static const u8 sSelfDestructDescription[] = _( - "Inflicts severe damage but\n" - "makes the user faint."); - -static const u8 sEggBombDescription[] = _( - "An egg is forcibly hurled at\n" - "the foe."); - -static const u8 sLickDescription[] = _( - "Licks with a long tongue to\n" - "injure. May also paralyze."); - -static const u8 sSmogDescription[] = _( - "An exhaust-gas attack\n" - "that may also poison."); - -static const u8 sSludgeDescription[] = _( - "Sludge is hurled to inflict\n" - "damage. May also poison."); - -static const u8 sBoneClubDescription[] = _( - "Clubs the foe with a bone.\n" - "May cause flinching."); - -static const u8 sFireBlastDescription[] = _( - "Incinerates everything it\n" - "strikes. May cause a burn."); - -static const u8 sWaterfallDescription[] = _( - "Charges the foe with speed\n" - "to climb waterfalls."); - -static const u8 sClampDescription[] = _( - "Traps and squeezes the\n" - "foe for "BINDING_TURNS" turns."); - -static const u8 sSwiftDescription[] = _( - "Sprays star-shaped rays\n" - "that never miss."); - -static const u8 sSkullBashDescription[] = _( - "Tucks in the head, then\n" - "attacks on the next turn."); - -static const u8 sSpikeCannonDescription[] = _( - "Launches sharp spikes that\n" - "strike 2 to 5 times."); - -static const u8 sConstrictDescription[] = _( - "Constricts to inflict pain.\n" - "May lower Speed."); - -static const u8 sAmnesiaDescription[] = _( - "Forgets about something\n" - "and sharply raises Sp. Def."); - -static const u8 sKinesisDescription[] = _( - "Distracts the foe.\n" - "May lower accuracy."); - -static const u8 sSoftBoiledDescription[] = _( - "Recovers up to half the\n" - "user's maximum HP."); - -static const u8 sHighJumpKickDescription[] = _( - "A jumping knee kick. If it\n" - "misses, the user is hurt."); - -static const u8 sGlareDescription[] = _( - "Intimidates and frightens\n" - "the foe into paralysis."); - -static const u8 sDreamEaterDescription[] = _( - "Takes one half the damage\n" - "inflicted on a sleeping foe."); - -static const u8 sPoisonGasDescription[] = _( - "Envelops the foe in a toxic\n" - "gas that may poison."); - -static const u8 sBarrageDescription[] = _( - "Hurls round objects at the\n" - "foe 2 to 5 times."); - -static const u8 sLeechLifeDescription[] = _( - "An attack that steals half\n" - "the damage inflicted."); - -static const u8 sLovelyKissDescription[] = _( - "Demands a kiss with a scary\n" - "face that induces sleep."); - -static const u8 sSkyAttackDescription[] = _( - "Searches out weak spots,\n" - "then strikes the next turn."); - -static const u8 sTransformDescription[] = _( - "Alters the user's cells to\n" - "become a copy of the foe."); - -static const u8 sBubbleDescription[] = _( - "An attack using bubbles.\n" - "May lower the foe's Speed."); - -static const u8 sDizzyPunchDescription[] = _( - "A rhythmic punch that may\n" - "confuse the foe."); - -static const u8 sSporeDescription[] = _( - "Scatters a cloud of spores\n" - "that always induce sleep."); - -static const u8 sFlashDescription[] = _( - "Looses a powerful blast of\n" - "light that cuts accuracy."); - -static const u8 sPsywaveDescription[] = _( - "Attacks with a psychic\n" - "wave of varying intensity."); - -static const u8 sSplashDescription[] = _( - "It's just a splash...\n" - "Has no effect whatsoever."); - -static const u8 sAcidArmorDescription[] = _( - "Liquifies the user's body\n" - "to sharply raise Defense."); - -static const u8 sCrabhammerDescription[] = _( - "Hammers with a pincer. Has a\n" - "high critical-hit ratio."); - -static const u8 sExplosionDescription[] = _( - "Inflicts severe damage but\n" - "makes the user faint."); - -static const u8 sFurySwipesDescription[] = _( - "Rakes the foe with sharp\n" - "claws, etc., 2 to 5 times."); - -static const u8 sBonemerangDescription[] = _( - "Throws a bone boomerang\n" - "that strikes twice."); - -static const u8 sRestDescription[] = _( - "The user sleeps for 2 turns,\n" - "restoring HP and status."); - -static const u8 sRockSlideDescription[] = _( - "Large boulders are hurled.\n" - "May cause flinching."); - -static const u8 sHyperFangDescription[] = _( - "Attacks with sharp fangs.\n" - "May cause flinching."); - -static const u8 sSharpenDescription[] = _( - "Reduces the polygon count\n" - "and raises Attack."); - -static const u8 sConversionDescription[] = _( - "Changes the user's type\n" - "into a known move's type."); - -static const u8 sTriAttackDescription[] = _( - "Fires three types of beams\n" - "at the same time."); - -static const u8 sSuperFangDescription[] = _( - "Attacks with sharp fangs\n" - "and cuts half the foe's HP."); - -static const u8 sSlashDescription[] = _( - "Slashes with claws, etc. Has\n" - "a high critical-hit ratio."); - -static const u8 sSubstituteDescription[] = _( - "Creates a decoy using 1/4\n" - "of the user's maximum HP."); - -static const u8 sStruggleDescription[] = _( - "Used only if all PP are gone.\n" - "Also hurts the user a little."); - -static const u8 sSketchDescription[] = _( - "Copies the foe's last move\n" - "permanently."); - -static const u8 sTripleKickDescription[] = _( - "Kicks the foe 3 times in a\n" - "row with rising intensity."); - -static const u8 sThiefDescription[] = _( - "While attacking, it may\n" - "steal the foe's held item."); - -static const u8 sSpiderWebDescription[] = _( - "Ensnares the foe to stop it\n" - "from fleeing or switching."); - -static const u8 sMindReaderDescription[] = _( - "Senses the foe's action to\n" - "ensure the next move's hit."); - -static const u8 sNightmareDescription[] = _( - "Inflicts 1/4 damage on a\n" - "sleeping foe every turn."); - -static const u8 sFlameWheelDescription[] = _( - "A fiery charge attack that\n" - "may inflict a burn."); - -static const u8 sSnoreDescription[] = _( - "A loud attack that can be\n" - "used only while asleep."); - -static const u8 sCurseDescription[] = _( - "A move that functions\n" - "differently for GHOSTS."); - -static const u8 sFlailDescription[] = _( - "Inflicts more damage when\n" - "the user's HP is down."); - -static const u8 sConversion2Description[] = _( - "Makes the user resistant\n" - "to the last attack's type."); - -static const u8 sAeroblastDescription[] = _( - "Launches a vacuumed blast.\n" - "High critical-hit ratio."); - -static const u8 sCottonSporeDescription[] = _( - "Spores cling to the foe,\n" - "sharply reducing Speed."); - -static const u8 sReversalDescription[] = _( - "Inflicts more damage when\n" - "the user's HP is down."); - -static const u8 sSpiteDescription[] = _( - "Spitefully cuts the PP\n" - "of the foe's last move."); - -static const u8 sPowderSnowDescription[] = _( - "Blasts the foe with a snowy\n" - "gust. May cause freezing."); - -static const u8 sProtectDescription[] = _( - "Evades attack, but may fail\n" - "if used in succession."); - -static const u8 sMachPunchDescription[] = _( - "A punch is thrown at wicked\n" - "speed to strike first."); - -static const u8 sScaryFaceDescription[] = _( - "Frightens with a scary face\n" - "to sharply reduce Speed."); - -static const u8 sFeintAttackDescription[] = _( - "Draws the foe close, then\n" - "strikes without fail."); - -static const u8 sSweetKissDescription[] = _( - "Demands a kiss with a cute\n" - "look. May cause confusion."); - -static const u8 sBellyDrumDescription[] = _( - "Maximizes Attack while\n" - "sacrificing HP."); - -static const u8 sSludgeBombDescription[] = _( - "Sludge is hurled to inflict\n" - "damage. May also poison."); - -static const u8 sMudSlapDescription[] = _( - "Hurls mud in the foe's face\n" - "to reduce its accuracy."); - -static const u8 sOctazookaDescription[] = _( - "Fires a lump of ink to\n" - "damage and cut accuracy."); - -static const u8 sSpikesDescription[] = _( - "Sets spikes that hurt a \n" - "foe switching in."); - -static const u8 sZapCannonDescription[] = _( - "Powerful and sure to cause\n" - "paralysis, but inaccurate."); - -static const u8 sForesightDescription[] = _( - "Negates the foe's efforts\n" - "to heighten evasiveness."); - -static const u8 sDestinyBondDescription[] = _( - "If the user faints, the foe\n" - "is also made to faint."); - -static const u8 sPerishSongDescription[] = _( - "Any Pokémon hearing this\n" - "song faints in 3 turns."); - -static const u8 sIcyWindDescription[] = _( - "A chilling attack that\n" - "lowers the foe's Speed."); - -static const u8 sDetectDescription[] = _( - "Evades attack, but may fail\n" - "if used in succession."); - -static const u8 sBoneRushDescription[] = _( - "Strikes the foe with a bone\n" - "in hand 2 to 5 times."); - -static const u8 sLockOnDescription[] = _( - "Locks on to the foe to\n" - "ensure the next move hits."); - -static const u8 sOutrageDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); - -static const u8 sSandstormDescription[] = _( - "Causes a sandstorm that\n" - "rages for several turns."); - -static const u8 sGigaDrainDescription[] = _( - "An attack that steals half\n" - "the damage inflicted."); - -static const u8 sEndureDescription[] = _( - "Endures any attack for\n" - "1 turn, leaving at least 1HP."); - -static const u8 sCharmDescription[] = _( - "Charms the foe and sharply\n" - "reduces its Attack."); - -static const u8 sRolloutDescription[] = _( - "An attack lasting 5 turns\n" - "with rising intensity."); - -static const u8 sFalseSwipeDescription[] = _( - "An attack that leaves the\n" - "foe with at least 1 HP."); - -static const u8 sSwaggerDescription[] = _( - "Confuses the foe, but also\n" - "sharply raises Attack."); - -static const u8 sMilkDrinkDescription[] = _( - "Recovers up to half the\n" - "user's maximum HP."); - -static const u8 sSparkDescription[] = _( - "An electrified tackle that\n" - "may paralyze the foe."); - -static const u8 sFuryCutterDescription[] = _( - "An attack that intensifies\n" - "on each successive hit."); - -static const u8 sSteelWingDescription[] = _( - "Strikes the foe with hard\n" - "wings spread wide."); - -static const u8 sMeanLookDescription[] = _( - "Fixes the foe with a mean\n" - "look that prevents escape."); - -static const u8 sAttractDescription[] = _( - "Makes the opposite gender\n" - "less likely to attack."); - -static const u8 sSleepTalkDescription[] = _( - "Uses an available move\n" - "randomly while asleep."); - -static const u8 sHealBellDescription[] = _( - "Chimes soothingly to heal\n" - "all status abnormalities."); - -static const u8 sReturnDescription[] = _( - "An attack that increases\n" - "in power with friendship."); - -static const u8 sPresentDescription[] = _( - "A gift in the form of a\n" - "bomb. May restore HP."); - -static const u8 sFrustrationDescription[] = _( - "An attack that is stronger\n" - "if the Trainer is disliked."); - -static const u8 sSafeguardDescription[] = _( - "A mystical force prevents\n" - "all status problems."); - -static const u8 sPainSplitDescription[] = _( - "Adds the user and foe's HP,\n" - "then shares them equally."); - -static const u8 sSacredFireDescription[] = _( - "A mystical fire attack that\n" - "may inflict a burn."); - -static const u8 sMagnitudeDescription[] = _( - "A ground-shaking attack\n" - "of random intensity."); - -static const u8 sDynamicPunchDescription[] = _( - "Powerful and sure to cause\n" - "confusion, but inaccurate."); - -static const u8 sMegahornDescription[] = _( - "A brutal ramming attack\n" - "using out-thrust horns."); - -static const u8 sDragonBreathDescription[] = _( - "Strikes the foe with an\n" - "incredible blast of breath."); - -static const u8 sBatonPassDescription[] = _( - "Switches out the user while\n" - "keeping effects in play."); - -static const u8 sEncoreDescription[] = _( - "Makes the foe repeat its\n" - "last move over 2 to 6 turns."); - -static const u8 sPursuitDescription[] = _( - "Inflicts bad damage if used\n" - "on a foe switching out."); - -static const u8 sRapidSpinDescription[] = _( - "Spins the body at high\n" - "speed to strike the foe."); - -static const u8 sSweetScentDescription[] = _( - "Allures the foe to reduce\n" - "evasiveness."); - -static const u8 sIronTailDescription[] = _( - "Attacks with a rock-hard\n" - "tail. May lower Defense."); - -static const u8 sMetalClawDescription[] = _( - "A claw attack that may\n" - "raise the user's Attack."); - -static const u8 sVitalThrowDescription[] = _( - "Makes the user's move last,\n" - "but it never misses."); - -static const u8 sMorningSunDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); - -static const u8 sSynthesisDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); - -static const u8 sMoonlightDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); - -static const u8 sHiddenPowerDescription[] = _( - "The effectiveness varies\n" - "with the user."); - -static const u8 sCrossChopDescription[] = _( - "A double-chopping attack.\n" - "High critical-hit ratio."); - -static const u8 sTwisterDescription[] = _( - "Whips up a vicious twister\n" - "to tear at the foe."); - -static const u8 sRainDanceDescription[] = _( - "Boosts the power of Water-\n" - "type moves for 5 turns."); - -static const u8 sSunnyDayDescription[] = _( - "Boosts the power of Fire-\n" - "type moves for 5 turns."); - -static const u8 sCrunchDescription[] = _( - "Crunches with sharp fangs.\n" -#if B_UPDATED_MOVE_DATA >= GEN_4 - "May lower Defense."); -#else - "May lower Sp. Def."); -#endif - -static const u8 sMirrorCoatDescription[] = _( - "Counters the foe's special\n" - "attack at double the power."); - -static const u8 sPsychUpDescription[] = _( - "Copies the foe's effect(s)\n" - "and gives to the user."); - -static const u8 sExtremeSpeedDescription[] = _( - "An extremely fast and\n" - "powerful attack."); - -static const u8 sAncientPowerDescription[] = _( - "An attack that may raise\n" - "all stats."); - -static const u8 sShadowBallDescription[] = _( - "Hurls a black blob that may\n" - "lower the foe's Sp. Def."); - -static const u8 sFutureSightDescription[] = _( - "Heightens inner power to\n" - "strike 2 turns later."); - -static const u8 sRockSmashDescription[] = _( - "A rock-crushing attack\n" - "that may lower Defense."); - -static const u8 sWhirlpoolDescription[] = _( - "Traps and hurts the foe in\n" - "a whirlpool for "BINDING_TURNS" turns."); - -static const u8 sBeatUpDescription[] = _( - "Summons party Pokémon to\n" - "join in the attack."); - -static const u8 sFakeOutDescription[] = _( - "A 1st-turn, 1st-strike move\n" - "that causes flinching."); - -static const u8 sUproarDescription[] = _( -#if B_UPROAR_TURNS >= GEN_5 - "Causes an uproar for 2 to 5\n" -#else - "Causes an uproar for 3\n" -#endif - "turns and prevents sleep."); - -static const u8 sStockpileDescription[] = _( - "Charges up power for up to\n" - "3 turns."); - -static const u8 sSpitUpDescription[] = _( - "Releases stockpiled power\n" - "(the more the better)."); - -static const u8 sSwallowDescription[] = _( - "Absorbs stockpiled power\n" - "and restores HP."); - -static const u8 sHeatWaveDescription[] = _( - "Exhales a hot breath on the\n" - "foe. May inflict a burn."); - -static const u8 sHailDescription[] = _( - "Summons a hailstorm that\n" - "strikes every turn."); - -static const u8 sTormentDescription[] = _( - "Torments the foe and stops\n" - "successive use of a move."); - -static const u8 sFlatterDescription[] = _( - "Confuses the foe, but\n" - "raises its Sp. Atk."); - -static const u8 sWillOWispDescription[] = _( - "Inflicts a burn on the foe\n" - "with intense fire."); - -static const u8 sMementoDescription[] = _( - "The user faints and lowers\n" - "the foe's abilities."); - -static const u8 sFacadeDescription[] = _( - "Boosts Attack when burned,\n" - "paralyzed, or poisoned."); - -static const u8 sFocusPunchDescription[] = _( - "A powerful loyalty attack.\n" - "The user flinches if hit."); - -static const u8 sSmellingSaltsDescription[] = _( - "Powerful against paralyzed\n" - "foes, but also heals them."); - -static const u8 sFollowMeDescription[] = _( - "Draws attention to make\n" - "foes attack only the user."); - -static const u8 sNaturePowerDescription[] = _( - "The type of attack varies\n" - "depending on the location."); - -static const u8 sChargeDescription[] = _( - "Charges power to boost the\n" - "electric move used next."); - -static const u8 sTauntDescription[] = _( - "Taunts the foe into only\n" - "using attack moves."); - -static const u8 sHelpingHandDescription[] = _( - "Boosts the power of the\n" - "recipient's moves."); - -static const u8 sTrickDescription[] = _( - "Tricks the foe into trading\n" - "held items."); - -static const u8 sRolePlayDescription[] = _( - "Mimics the target and\n" - "copies its special ability."); - -static const u8 sWishDescription[] = _( - "A wish that restores HP.\n" - "It takes time to work."); - -static const u8 sAssistDescription[] = _( - "Attacks randomly with one\n" - "of the partner's moves."); - -static const u8 sIngrainDescription[] = _( - "Lays roots that restore HP.\n" - "The user can't switch out."); - -static const u8 sSuperpowerDescription[] = _( - "Boosts strength sharply,\n" - "but lowers abilities."); - -static const u8 sMagicCoatDescription[] = _( - "Reflects special effects\n" - "back to the attacker."); - -static const u8 sRecycleDescription[] = _( - "Recycles a used item for\n" - "one more use."); - -static const u8 sRevengeDescription[] = _( - "An attack that gains power\n" - "if injured by the foe."); - -static const u8 sBrickBreakDescription[] = _( - "Destroys barriers such as\n" - "REFLECT and causes damage."); - -static const u8 sYawnDescription[] = _( - "Lulls the foe into yawning,\n" - "then sleeping next turn."); - -static const u8 sKnockOffDescription[] = _( - "Knocks down the foe's held\n" - "item to prevent its use."); - -static const u8 sEndeavorDescription[] = _( - "Gains power if the user's HP\n" - "is lower than the foe's HP."); - -static const u8 sEruptionDescription[] = _( - "The higher the user's HP,\n" - "the more damage caused."); - -static const u8 sSkillSwapDescription[] = _( - "The user swaps special\n" - "abilities with the target."); - -static const u8 sImprisonDescription[] = _( - "Prevents foes from using\n" - "moves known by the user."); - -static const u8 sRefreshDescription[] = _( - "Heals poisoning, paralysis,\n" - "or a burn."); - -static const u8 sGrudgeDescription[] = _( - "If the user faints, deletes\n" - "all PP of foe's last move."); - -static const u8 sSnatchDescription[] = _( - "Steals the effects of the\n" - "move the target uses next."); - -static const u8 sSecretPowerDescription[] = _( - "An attack with effects\n" - "that vary by location."); - -static const u8 sDiveDescription[] = _( - "Dives underwater the first\n" - "turn and strikes next turn."); - -static const u8 sArmThrustDescription[] = _( - "Straight-arm punches that\n" - "strike the foe 2 to 5 times."); - -static const u8 sCamouflageDescription[] = _( - "Alters the Pokémon's type\n" - "depending on the location."); - -static const u8 sTailGlowDescription[] = _( - "Flashes a light that sharply\n" - "raises Sp. Atk."); - -static const u8 sLusterPurgeDescription[] = _( - "Attacks with a burst of\n" - "light. May lower Sp. Def."); - -static const u8 sMistBallDescription[] = _( - "Attacks with a flurry of\n" - "down. May lower Sp. Atk."); - -static const u8 sFeatherDanceDescription[] = _( - "Envelops the foe with down\n" - "to sharply reduce Attack."); - -static const u8 sTeeterDanceDescription[] = _( - "Confuses all Pokémon on\n" - "the scene."); - -static const u8 sBlazeKickDescription[] = _( - "A kick with a high critical-\n" - "hit ratio. May cause a burn."); - -static const u8 sMudSportDescription[] = _( - "Covers the user in mud to\n" - "raise electrical resistance."); - -static const u8 sIceBallDescription[] = _( - "A 5-turn attack that gains\n" - "power on successive hits."); - -static const u8 sNeedleArmDescription[] = _( - "Attacks with thorny arms.\n" - "May cause flinching."); - -static const u8 sSlackOffDescription[] = _( - "Slacks off and restores\n" - "half the maximum HP."); - -static const u8 sHyperVoiceDescription[] = _( - "A loud attack that uses\n" - "sound waves to injure."); - -static const u8 sPoisonFangDescription[] = _( - "A sharp-fanged attack.\n" - "May badly poison the foe."); - -static const u8 sCrushClawDescription[] = _( - "Tears at the foe with sharp\n" - "claws. May lower Defense."); - -static const u8 sBlastBurnDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); - -static const u8 sHydroCannonDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); - -static const u8 sMeteorMashDescription[] = _( - "Fires a meteor-like punch.\n" - "May raise Attack."); - -static const u8 sAstonishDescription[] = _( - "An attack that may shock\n" - "the foe into flinching."); - -static const u8 sWeatherBallDescription[] = _( - "The move's type and power\n" - "change with the weather."); - -static const u8 sAromatherapyDescription[] = _( - "Heals all status problems\n" - "with a soothing scent."); - -static const u8 sFakeTearsDescription[] = _( - "Feigns crying to sharply\n" - "lower the foe's Sp. Def."); - -static const u8 sAirCutterDescription[] = _( - "Hacks with razorlike wind.\n" - "High critical-hit ratio."); - -static const u8 sOverheatDescription[] = _( - "Allows a full-power attack,\n" - "but sharply lowers Sp. Atk."); - -static const u8 sOdorSleuthDescription[] = _( - "Negates the foe's efforts\n" - "to heighten evasiveness."); - -static const u8 sRockTombDescription[] = _( - "Stops the foe from moving\n" - "with rocks and cuts Speed."); - -static const u8 sSilverWindDescription[] = _( - "A powdery attack that may\n" - "raise abilities."); - -static const u8 sMetalSoundDescription[] = _( - "Emits a horrible screech\n" - "that sharply lowers Sp. Def."); - -static const u8 sGrassWhistleDescription[] = _( - "Lulls the foe into sleep\n" - "with a pleasant melody."); - -static const u8 sTickleDescription[] = _( - "Makes the foe laugh to\n" - "lower Attack and Defense."); - -static const u8 sCosmicPowerDescription[] = _( - "Raises Defense and Sp. Def\n" - "with a mystic power."); - -static const u8 sWaterSpoutDescription[] = _( - "Inflicts more damage if the\n" - "user's HP is high."); - -static const u8 sSignalBeamDescription[] = _( - "A strange beam attack that\n" - "may confuse the foe."); - -static const u8 sShadowPunchDescription[] = _( - "An unavoidable punch that\n" - "is thrown from shadows."); - -static const u8 sExtrasensoryDescription[] = _( - "Attacks with a peculiar\n" - "power. May cause flinching."); - -static const u8 sSkyUppercutDescription[] = _( - "An uppercut thrown as if\n" - "leaping into the sky."); - -static const u8 sSandTombDescription[] = _( - "Traps and hurts the foe in\n" - "quicksand for "BINDING_TURNS" turns."); - -static const u8 sSheerColdDescription[] = _( - "A chilling attack that\n" - "causes fainting if it hits."); - -static const u8 sMuddyWaterDescription[] = _( - "Attacks with muddy water.\n" - "May lower accuracy."); - -static const u8 sBulletSeedDescription[] = _( - "Shoots 2 to 5 seeds in a row\n" - "to strike the foe."); - -static const u8 sAerialAceDescription[] = _( - "An extremely speedy and\n" - "unavoidable attack."); - -static const u8 sIcicleSpearDescription[] = _( - "Attacks the foe by firing\n" - "2 to 5 icicles in a row."); - -static const u8 sIronDefenseDescription[] = _( - "Hardens the body's surface\n" - "to sharply raise Defense."); - -static const u8 sBlockDescription[] = _( - "Blocks the foe's way to\n" - "prevent escape."); - -static const u8 sHowlDescription[] = _( - "Howls to raise the spirit\n" - "and boosts Attack."); - -static const u8 sDragonClawDescription[] = _( - "Slashes the foe with sharp\n" - "claws."); - -static const u8 sFrenzyPlantDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); - -static const u8 sBulkUpDescription[] = _( - "Bulks up the body to boost\n" - "both Attack and Defense."); - -static const u8 sBounceDescription[] = _( - "Bounces up, then down the\n" - "next turn. May paralyze."); - -static const u8 sMudShotDescription[] = _( - "Hurls mud at the foe and\n" - "reduces Speed."); - -static const u8 sPoisonTailDescription[] = _( - "Has a high critical-hit\n" - "ratio. May also poison."); - -static const u8 sCovetDescription[] = _( - "Cutely begs to obtain an\n" - "item held by the foe."); - -static const u8 sVoltTackleDescription[] = _( - "A life-risking tackle that\n" - "slightly hurts the user."); - -static const u8 sMagicalLeafDescription[] = _( - "Attacks with a strange leaf\n" - "that cannot be evaded."); - -static const u8 sWaterSportDescription[] = _( - "The user becomes soaked to\n" - "raise resistance to fire."); - -static const u8 sCalmMindDescription[] = _( - "Raises Sp. Atk and Sp. Def\n" - "by focusing the mind."); - -static const u8 sLeafBladeDescription[] = _( - "Slashes with a sharp leaf.\n" - "High critical-hit ratio."); - -static const u8 sDragonDanceDescription[] = _( - "A mystical dance that ups\n" - "Attack and Speed."); - -static const u8 sRockBlastDescription[] = _( - "Hurls boulders at the foe\n" - "2 to 5 times in a row."); - -static const u8 sShockWaveDescription[] = _( - "A fast and unavoidable\n" - "electric attack."); - -static const u8 sWaterPulseDescription[] = _( - "Attacks with ultrasonic\n" - "waves. May confuse the foe."); - -static const u8 sDoomDesireDescription[] = _( - "Summons strong sunlight to\n" - "attack 2 turns later."); - -static const u8 sPsychoBoostDescription[] = _( - "Allows a full-power attack,\n" - "but sharply lowers Sp. Atk."); - -static const u8 sRoostDescription[] = _( - "Restores the user's HP by\n" - "half of its max HP."); - -static const u8 sGravityDescription[] = _( - "Gravity is intensified\n" - "negating levitation."); - -static const u8 sMiracleEyeDescription[] = _( - "Negate evasiveness and\n" - "Dark-type's immunities."); - -static const u8 sWakeUpSlapDescription[] = _( - "Powerful against sleeping\n" - "foes, but also heals them."); - -static const u8 sHammerArmDescription[] = _( - "A swinging fist attack\n" - "that also lowers Speed."); - -static const u8 sGyroBallDescription[] = _( - "A high-speed spin that does\n" - "more damage to faster foes."); - -static const u8 sHealingWishDescription[] = _( - "The user faints to heal up\n" - "the recipient."); - -static const u8 sBrineDescription[] = _( - "Does double damage to foes\n" - "with half HP."); - -static const u8 sNaturalGiftDescription[] = _( - "The effectiveness varies\n" - "with the held Berry."); - -static const u8 sFeintDescription[] = _( - "An attack that hits foes\n" - "using moves like Protect."); - -static const u8 sPluckDescription[] = _( - "Eats the foe's held Berry\n" - "gaining its effect."); - -static const u8 sTailwindDescription[] = _( - "Whips up a turbulent breeze\n" - "that raises Speed."); - -static const u8 sAcupressureDescription[] = _( - "The user sharply raises\n" - "one of its stats."); - -static const u8 sMetalBurstDescription[] = _( - "Retaliates any hit with\n" - "greater power."); - -static const u8 sUTurnDescription[] = _( - "Does damage then switches\n" - "out the user."); - -static const u8 sCloseCombatDescription[] = _( - "A strong attack but lowers\n" - "the defensive stats."); - -static const u8 sPaybackDescription[] = _( - "An attack that gains power\n" - "if the user moves last."); - -static const u8 sAssuranceDescription[] = _( - "An attack that gains power\n" - "if the foe has been hurt."); - -static const u8 sEmbargoDescription[] = _( - "Prevents the foe from\n" - "using any items."); - -static const u8 sFlingDescription[] = _( - "The effectiveness varies\n" - "with the held item."); - -static const u8 sPsychoShiftDescription[] = _( - "Transfers status problems\n" - "to the foe."); - -static const u8 sTrumpCardDescription[] = _( - "The less PP the move has\n" - "the more damage it does."); - -static const u8 sHealBlockDescription[] = _( - "Prevents the foe from\n" - "recovering any HP."); - -static const u8 sWringOutDescription[] = _( - "The higher the foe's HP\n" - "the more damage caused."); - -static const u8 sPowerTrickDescription[] = _( - "The user swaps its Attack\n" - "and Defense stats."); - -static const u8 sGastroAcidDescription[] = _( - "Stomach acid suppresses\n" - "the foe's ability."); - -static const u8 sLuckyChantDescription[] = _( - "Prevents the foe from\n" - "landing critical hits."); - -static const u8 sMeFirstDescription[] = _( - "Executes the foe's attack\n" - "with greater power."); - -static const u8 sCopycatDescription[] = _( - "The user mimics the last\n" - "move used by a foe."); - -static const u8 sPowerSwapDescription[] = _( - "Swaps changes to Attack\n" - "and Sp. Atk with the foe."); - -static const u8 sGuardSwapDescription[] = _( - "Swaps changes to Defense\n" - "and Sp. Def with the foe."); - -static const u8 sPunishmentDescription[] = _( - "Does more damage if the\n" - "foe has powered up."); - -static const u8 sLastResortDescription[] = _( - "Can only be used if every\n" - "other move has been used."); - -static const u8 sWorrySeedDescription[] = _( - "Plants a seed on the foe\n" - "giving it Insomnia."); - -static const u8 sSuckerPunchDescription[] = _( - "Strikes first if the foe\n" - "is preparing an attack."); - -static const u8 sToxicSpikesDescription[] = _( - "Sets spikes that poison a\n" - "foe switching in."); - -static const u8 sHeartSwapDescription[] = _( - "Swaps any stat changes\n" - "with the foe."); - -static const u8 sAquaRingDescription[] = _( - "Forms a veil of water\n" - "that restores HP."); - -static const u8 sMagnetRiseDescription[] = _( - "The user levitates with\n" - "electromagnetism."); - -static const u8 sFlareBlitzDescription[] = _( - "A charge that may burn the\n" - "foe. Also hurts the user."); - -static const u8 sForcePalmDescription[] = _( - "A shock wave attack that\n" - "may paralyze the foe."); - -static const u8 sAuraSphereDescription[] = _( - "Attacks with an aura blast\n" - "that cannot be evaded."); - -static const u8 sRockPolishDescription[] = _( - "Polishes the body to\n" - "sharply raise Speed."); - -static const u8 sPoisonJabDescription[] = _( - "A stabbing attack that\n" - "may poison the foe."); - -static const u8 sDarkPulseDescription[] = _( - "Attacks with a horrible\n" - "aura. May cause flinching."); - -static const u8 sNightSlashDescription[] = _( - "Hits as soon as possible.\n" - "High critical-hit ratio."); - -static const u8 sAquaTailDescription[] = _( - "The user swings its tail\n" - "like a wave to attack."); - -static const u8 sSeedBombDescription[] = _( - "A barrage of hard seeds\n" - "is fired at the foe."); - -static const u8 sAirSlashDescription[] = _( - "Attacks with a blade of\n" - "air. May cause flinching."); - -static const u8 sXScissorDescription[] = _( - "Slashes the foe with crossed\n" - "scythes, claws, etc."); - -static const u8 sBugBuzzDescription[] = _( - "A damaging sound wave that\n" - "may lower Sp. Def."); - -static const u8 sDragonPulseDescription[] = _( - "Generates a shock wave to\n" - "damage the foe."); - -static const u8 sDragonRushDescription[] = _( - "Tackles the foe with menace.\n" - "May cause flinching."); - -static const u8 sPowerGemDescription[] = _( - "Attacks with rays of light\n" - "that sparkle like diamonds."); - -static const u8 sVacuumWaveDescription[] = _( - "Whirls its fists to send\n" - "a wave that strikes first."); - -static const u8 sFocusBlastDescription[] = _( - "Attacks at full power.\n" - "May lower Sp. Def."); - -static const u8 sEnergyBallDescription[] = _( - "Draws power from nature to\n" - "attack. May lower Sp. Def."); - -static const u8 sBraveBirdDescription[] = _( - "A low altitude charge that\n" - "also hurts the user."); - -static const u8 sEarthPowerDescription[] = _( - "Makes the ground erupt with\n" - "power. May lower Sp. Def."); - -static const u8 sSwitcherooDescription[] = _( - "Swaps items with the foe\n" - "faster than the eye can see."); - -static const u8 sNastyPlotDescription[] = _( - "Thinks bad thoughts to\n" - "sharply boost Sp. Atk."); - -static const u8 sBulletPunchDescription[] = _( - "Punches as fast as a bul-\n" - "let. It always hits first."); - -static const u8 sIceShardDescription[] = _( - "Hurls a chunk of ice that\n" - "always strike first."); - -static const u8 sShadowClawDescription[] = _( - "Strikes with a shadow claw.\n" - "High critical-hit ratio."); - -static const u8 sThunderFangDescription[] = _( - "May cause flinching or\n" - "leave the foe paralyzed."); - -static const u8 sIceFangDescription[] = _( - "May cause flinching or\n" - "leave the foe frozen."); - -static const u8 sFireFangDescription[] = _( - "May cause flinching or\n" - "leave the foe with a burn."); - -static const u8 sShadowSneakDescription[] = _( - "Extends the user's shadow\n" - "to strike first."); - -static const u8 sMudBombDescription[] = _( - "Throws a blob of mud to\n" - "damage and cut accuracy."); - -static const u8 sPsychoCutDescription[] = _( - "Tears with psychic blades.\n" - "High critical-hit ratio."); - -static const u8 sZenHeadbuttDescription[] = _( - "Hits with a strong head-\n" - "butt. May cause flinching."); - -static const u8 sMirrorShotDescription[] = _( - "Emits a flash of energy to\n" - "damage and cut accuracy."); - -static const u8 sFlashCannonDescription[] = _( - "Releases a blast of light\n" - "that may lower Sp. Def."); - -static const u8 sRockClimbDescription[] = _( - "A charging attack that may\n" - "confuse the foe."); - -static const u8 sDefogDescription[] = _( - "Removes obstacles and\n" - "lowers evasion."); - -static const u8 sTrickRoomDescription[] = _( - "Slower Pokémon get to move\n" - "first for 5 turns."); - -static const u8 sDracoMeteorDescription[] = _( - "Casts comets onto the foe.\n" - "Harshly lowers the Sp. Atk."); - -static const u8 sDischargeDescription[] = _( - "Zaps the foes with electri-\n" - "city. May paralyze them."); - -static const u8 sPowerWhipDescription[] = _( - "Violently lashes the foe\n" - "with vines or tentacles."); - -static const u8 sCrossPoisonDescription[] = _( - "A slash that may poison a\n" - "foe and do critical damage."); - -static const u8 sGunkShotDescription[] = _( - "Shoots filthy garbage at\n" - "the foe. May also poison."); - -static const u8 sIronHeadDescription[] = _( - "Slams the foe with a hard\n" - "head. May cause flinching."); - -static const u8 sMagnetBombDescription[] = _( - "Launches a magnet that\n" - "strikes without fail."); - -static const u8 sStoneEdgeDescription[] = _( - "Stabs the foe with stones.\n" - "High critical-hit ratio."); - -static const u8 sCaptivateDescription[] = _( - "Makes the opposite gender\n" - "sharply reduce its Sp. Atk."); - -static const u8 sStealthRockDescription[] = _( - "Sets floating stones that\n" - "hurt a foe switching in."); - -static const u8 sGrassKnotDescription[] = _( - "A snare attack that does\n" - "more damage to heavier foes."); - -static const u8 sChatterDescription[] = _( - "Attacks with a sound wave\n" - "that causes confusion."); - -static const u8 sJudgmentDescription[] = _( - "The type varies with the\n" - "kind of Plate held."); - -static const u8 sChargeBeamDescription[] = _( - "Fires a beam of electricity.\n" - "May raise Sp. Atk."); - -static const u8 sWoodHammerDescription[] = _( - "Slams the body into a foe.\n" - "The user gets hurt too."); - -static const u8 sAquaJetDescription[] = _( - "Strikes first by dashing\n" - "at the foe at a high speed."); - -static const u8 sAttackOrderDescription[] = _( - "Underlings pummel the foe.\n" - "High critical-hit ratio."); - -static const u8 sDefendOrderDescription[] = _( - "Raises Defense and Sp. Def\n" - "with a living shield."); - -static const u8 sHealOrderDescription[] = _( - "The user's underlings show\n" - "up to heal half its max HP."); - -static const u8 sHeadSmashDescription[] = _( - "A life-risking headbutt that\n" - "seriously hurts the user."); - -static const u8 sDoubleHitDescription[] = _( - "Slams the foe with a tail\n" - "etc. Strikes twice."); - -static const u8 sRoarOfTimeDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); - -static const u8 sSpacialRendDescription[] = _( - "Tears the foe, and space.\n" - "High critical-hit ratio."); - -static const u8 sMagmaStormDescription[] = _( - "Traps the foe in a vortex\n" - "of fire for "BINDING_TURNS" turns."); - -static const u8 sDarkVoidDescription[] = _( - "Drags the foe into total\n" - "darkness, inducing Sleep."); - -static const u8 sSeedFlareDescription[] = _( - "Generates a shock wave that\n" - "sharply reduces Sp. Def."); - -static const u8 sOminousWindDescription[] = _( - "A repulsive attack that may\n" - "raise all stats."); - -static const u8 sShadowForceDescription[] = _( - "Vanishes on the first turn\n" - "then strikes the next turn."); - -static const u8 sHoneClawsDescription[] = _( - "Sharpens its claws to raise\n" - "Attack and Accuracy."); - -static const u8 sWideGuardDescription[] = _( - "Evades wide-ranging attacks\n" - "for one turn."); - -static const u8 sGuardSplitDescription[] = _( - "Averages changes to Defense\n" - "and Sp. Def with the foe."); - -static const u8 sPowerSplitDescription[] = _( - "Averages changes to Attack\n" - "and Sp. Atk with the foe."); - -static const u8 sWonderRoomDescription[] = _( - "Defense and Sp. Def stats\n" - "are swapped for 5 turns."); - -static const u8 sPsyshockDescription[] = _( - "Attacks with a psychic wave\n" - "that does physical damage."); - -static const u8 sTailSlapDescription[] = _( - "Strikes the foe with its\n" - "tail 2 to 5 times."); - -static const u8 sVenoshockDescription[] = _( - "Does double damage if the\n" - "foe is poisoned."); - -static const u8 sAutotomizeDescription[] = _( - "Sheds additional weight to\n" - "sharply boost Speed."); - -static const u8 sRagePowderDescription[] = _( - "Scatters powder to make\n" - "foes attack only the user."); - -static const u8 sTelekinesisDescription[] = _( - "Makes the foe float. It is\n" - "easier to hit for 3 turns."); - -static const u8 sMagicRoomDescription[] = _( - "Hold items lose their\n" - "effects for 5 turns."); - -static const u8 sSmackDownDescription[] = _( - "Throws a rock to knock the\n" - "foe down to the ground."); - -static const u8 sStormThrowDescription[] = _( - "This attack always results\n" - "in a critical hit."); - -static const u8 sFlameBurstDescription[] = _( - "A bursting flame that does\n" - "damage to all foes."); - -static const u8 sSludgeWaveDescription[] = _( - "Swamps the foe with a wave\n" - "of sludge. May also poison."); - -static const u8 sQuiverDanceDescription[] = _( - "Dances to raise Sp. Atk\n" - "Sp. Def and Speed."); - -static const u8 sHeavySlamDescription[] = _( - "Does more damage if the\n" - "user outweighs the foe."); - -static const u8 sSynchronoiseDescription[] = _( - "An odd shock wave that only\n" - "damages same-type foes."); - -static const u8 sElectroBallDescription[] = _( - "Hurls an orb that does more\n" - "damage to slower foes."); - -static const u8 sSoakDescription[] = _( - "Sprays water at the foe\n" - "making it Water-type."); - -static const u8 sFlameChargeDescription[] = _( - "Attacks in a cloak of\n" - "flames. Raises Speed."); - -static const u8 sCoilDescription[] = _( - "Coils up to raise Attack\n" - "Defense and Accuracy."); - -static const u8 sLowSweepDescription[] = _( - "Attacks the foe's legs\n" - "lowering its Speed."); - -static const u8 sAcidSprayDescription[] = _( - "Sprays a hide-melting acid.\n" - "Sharply reduces Sp. Def."); - -static const u8 sFoulPlayDescription[] = _( - "The higher the foe's Attack\n" - "the more damage caused."); - -static const u8 sSimpleBeamDescription[] = _( - "A beam that changes the\n" - "foe's ability to Simple."); - -static const u8 sEntrainmentDescription[] = _( - "Makes the foe mimic the\n" - "user, gaining its ability."); - -static const u8 sAfterYouDescription[] = _( - "Helps out the foe, letting\n" - "it move next."); - -static const u8 sRoundDescription[] = _( - "A song that inflicts damage.\n" - "Others can join in too."); - -static const u8 sEchoedVoiceDescription[] = _( - "Does more damage every turn\n" - "it is used."); - -static const u8 sChipAwayDescription[] = _( - "Strikes through the foe's\n" - "stat changes."); - -static const u8 sClearSmogDescription[] = _( - "Attacks with white haze that\n" - "eliminates all stat changes."); - -static const u8 sStoredPowerDescription[] = _( - "The higher the user's stats\n" - "the more damage caused."); - -static const u8 sQuickGuardDescription[] = _( - "Evades priority attacks\n" - "for one turn."); - -static const u8 sAllySwitchDescription[] = _( - "The user switches places\n" - "with its partner."); - -static const u8 sScaldDescription[] = _( - "Shoots boiling water at the\n" - "foe. May inflict a burn."); - -static const u8 sShellSmashDescription[] = _( - "Raises offensive stats, but\n" - "lowers defensive stats."); - -static const u8 sHealPulseDescription[] = _( - "Recovers up to half the\n" - "target's maximum HP."); - -static const u8 sHexDescription[] = _( - "Does double damage if the\n" - "foe has a status problem."); - -static const u8 sSkyDropDescription[] = _( - "Takes the foe into the sky\n" - "then drops it the next turn."); - -static const u8 sShiftGearDescription[] = _( - "Rotates its gears to raise\n" - "Attack and Speed."); - -static const u8 sCircleThrowDescription[] = _( - "Knocks the foe away to end\n" - "the battle."); - -static const u8 sIncinerateDescription[] = _( - "Burns up Berries and Gems\n" - "preventing their use."); - -static const u8 sQuashDescription[] = _( - "Suppresses the foe, making\n" - "it move last."); - -static const u8 sAcrobaticsDescription[] = _( - "Does double damage if the\n" - "user has no item."); - -static const u8 sReflectTypeDescription[] = _( - "The user reflects the foe's\n" - "type, copying it."); - -static const u8 sRetaliateDescription[] = _( - "An attack that does more\n" - "damage if an ally fainted."); - -static const u8 sFinalGambitDescription[] = _( - "The user faints to damage\n" - "the foe equal to its HP."); - -static const u8 sBestowDescription[] = _( - "The user gives its held\n" - "item to the foe."); - -static const u8 sInfernoDescription[] = _( - "Powerful and sure to inflict\n" - "a burn, but inaccurate."); - -static const u8 sWaterPledgeDescription[] = _( - "Attacks with a column of\n" - "water. May make a rainbow."); - -static const u8 sFirePledgeDescription[] = _( - "Attacks with a column of\n" - "fire. May burn the grass."); - -static const u8 sGrassPledgeDescription[] = _( - "Attacks with a column of\n" - "grass. May create a swamp."); - -static const u8 sStruggleBugDescription[] = _( - "Resisting, the user attacks\n" - "the foe. Lowers Sp. Atk."); - -static const u8 sBulldozeDescription[] = _( - "Stomps down on the ground.\n" - "Lowers Speed."); - -static const u8 sWorkUpDescription[] = _( - "The user is roused.\n" - "Ups Attack and Sp. Atk."); - -static const u8 sElectrowebDescription[] = _( - "Snares the foe with an\n" - "electric net. Lowers Speed."); - -static const u8 sWildChargeDescription[] = _( - "An electrical tackle that\n" - "also hurts the user."); - -static const u8 sDrillRunDescription[] = _( - "Spins its body like a drill.\n" - "High critical-hit ratio."); - -static const u8 sDualChopDescription[] = _( - "Attacks with brutal hits\n" - "that strike twice."); - -static const u8 sHeartStampDescription[] = _( - "A sudden blow after a cute\n" - "act. May cause flinching."); - -static const u8 sRazorShellDescription[] = _( - "Tears at the foe with sharp\n" - "shells. May lower Defense."); - -static const u8 sLeafTornadoDescription[] = _( - "Circles the foe with leaves\n" - "to damage and cut accuracy."); - -static const u8 sSteamrollerDescription[] = _( - "Crushes the foe with its\n" - "body. May cause flinching."); - -static const u8 sCottonGuardDescription[] = _( - "Wraps its body in cotton.\n" - "Drastically raises Defense."); - -static const u8 sNightDazeDescription[] = _( - "Looses a pitch-black shock\n" - "wave. May lower accuracy."); - -static const u8 sHurricaneDescription[] = _( - "Traps the foe in a fierce\n" - "wind. May cause confusion."); - -static const u8 sHeadChargeDescription[] = _( - "A charge using guard hair.\n" - "It hurts the user a little."); - -static const u8 sGearGrindDescription[] = _( - "Throws two steel gears\n" - "that strike twice."); - -static const u8 sTechnoBlastDescription[] = _( - "The type varies with the\n" - "kind of Drive held."); - -static const u8 sRelicSongDescription[] = _( - "Attacks with an ancient\n" - "song. May induce sleep."); - -static const u8 sSecretSwordDescription[] = _( - "Cuts with a long horn that\n" - "does physical damage."); - -static const u8 sGlaciateDescription[] = _( - "Blows very cold air at the\n" - "foe. It lowers their Speed."); - -static const u8 sBoltStrikeDescription[] = _( - "Strikes with a great amount\n" - "of lightning. May paralyze."); - -static const u8 sBlueFlareDescription[] = _( - "Engulfs the foe in a blue\n" - "flame. May inflict a burn."); - -static const u8 sFieryDanceDescription[] = _( - "Dances cloaked in flames.\n" - "May raise Sp. Atk."); - -static const u8 sFreezeShockDescription[] = _( - "A powerful 2-turn move that\n" - "may paralyze the foe."); - -static const u8 sIceBurnDescription[] = _( - "A powerful 2-turn move that\n" - "may inflict a burn."); - -static const u8 sSnarlDescription[] = _( - "Yells and rants at the foe\n" - "lowering its Sp. Atk."); - -static const u8 sIcicleCrashDescription[] = _( - "Drops large icicles on the\n" - "foe. May cause flinching."); - -static const u8 sVCreateDescription[] = _( - "Very powerful, but lowers\n" - "Defense, Sp. Def and Speed."); - -static const u8 sFusionFlareDescription[] = _( - "Summons a fireball. Works\n" - "well with a thunderbolt."); - -static const u8 sFusionBoltDescription[] = _( - "Summons a thunderbolt.\n" - "Works well with a fireball."); - -static const u8 sFlyingPressDescription[] = _( - "This attack does Fighting\n" - "and Flying-type damage."); - -static const u8 sMatBlockDescription[] = _( - "Evades damaging moves\n" - "for one turn."); - -static const u8 sBelchDescription[] = _( - "Lets out a loud belch.\n" - "Must eat a Berry to use it."); - -static const u8 sRototillerDescription[] = _( - "Ups the Attack and Sp. Atk\n" - "of Grass-type Pokémon."); - -static const u8 sStickyWebDescription[] = _( - "Weaves a sticky net that\n" - "slows foes switching in."); - -static const u8 sFellStingerDescription[] = _( - "If it knocks out a foe\n" - "the Attack stat is raised."); - -static const u8 sTrickOrTreatDescription[] = _( - "Goes trick-or-treating\n" - "making the foe Ghost-type."); - -static const u8 sNobleRoarDescription[] = _( - "Intimidates the foe, to cut\n" - "Attack and Sp. Atk."); - -static const u8 sIonDelugeDescription[] = _( - "Electrifies Normal-type\n" - "moves with charged atoms."); - -static const u8 sParabolicChargeDescription[] = _( - "Damages adjacent Pokémon and\n" - "heals up by half of it."); - -static const u8 sForestsCurseDescription[] = _( - "Puts a curse on the foe\n" - "making the foe Grass-type."); - -static const u8 sPetalBlizzardDescription[] = _( - "Stirs up a violent storm\n" - "of petals to attack."); - -static const u8 sFreezeDryDescription[] = _( - "Super effective on Water-\n" - "types. May cause freezing."); - -static const u8 sDisarmingVoiceDescription[] = _( - "Lets out a charming cry\n" - "that cannot be evaded."); - -static const u8 sPartingShotDescription[] = _( - "Lowers the foe's Attack and\n" - "Sp. Atk, then switches out."); - -static const u8 sTopsyTurvyDescription[] = _( - "Swaps all stat changes that\n" - "affect the target."); - -static const u8 sDrainingKissDescription[] = _( - "An attack that absorbs over\n" - "half the damage inflicted."); - -static const u8 sCraftyShieldDescription[] = _( - "Evades status moves for\n" - "one turn."); - -static const u8 sFlowerShieldDescription[] = _( - "Raises the Defense of\n" - "Grass-type Pokémon."); - -static const u8 sGrassyTerrainDescription[] = _( - "The ground turns to grass\n" - "for 5 turns. Restores HP."); - -static const u8 sMistyTerrainDescription[] = _( - "Covers the ground with mist\n" - "for 5 turns. Blocks status."); - -static const u8 sElectrifyDescription[] = _( - "Electrifies the foe, making\n" - "its next move Electric-type."); - -static const u8 sPlayRoughDescription[] = _( - "Plays rough with the foe.\n" - "May lower Attack."); - -static const u8 sFairyWindDescription[] = _( - "Stirs up a fairy wind to\n" - "strike the foe."); - -static const u8 sMoonblastDescription[] = _( - "Attacks with the power of\n" - "the moon. May lower Sp. Atk."); - -static const u8 sBoomburstDescription[] = _( - "Attacks everything with a\n" - "destructive sound wave."); - -static const u8 sFairyLockDescription[] = _( - "Locks down the battlefield\n" - "preventing escape next turn."); - -static const u8 sKingsShieldDescription[] = _( - "Evades damage, and sharply\n" - "reduces Attack if struck."); - -static const u8 sPlayNiceDescription[] = _( - "Befriend the foe, lowering\n" - "its Attack without fail."); - -static const u8 sConfideDescription[] = _( - "Shares a secret with the\n" - "foe, lowering Sp. Atk."); - -static const u8 sDiamondStormDescription[] = _( - "Whips up a storm of\n" - "diamonds. May up Defense."); - -static const u8 sSteamEruptionDescription[] = _( - "Immerses the foe in heated\n" - "steam. May inflict a burn."); - -static const u8 sHyperspaceHoleDescription[] = _( - "Uses a warp hole to attack.\n" - "Can't be evaded."); - -static const u8 sWaterShurikenDescription[] = _( - "Throws 2 to 5 stars that\n" - "are sure to strike first."); - -static const u8 sMysticalFireDescription[] = _( - "Breathes a special, hot\n" - "fire. Lowers Sp. Atk."); - -static const u8 sSpikyShieldDescription[] = _( - "Evades attack, and damages\n" - "the foe if struck."); - -static const u8 sAromaticMistDescription[] = _( - "Raises the Sp. Def of a\n" - "partner Pokémon."); - -static const u8 sEerieImpulseDescription[] = _( - "Exposes the foe to a pulse\n" - "that sharply cuts Sp. Atk."); - -static const u8 sVenomDrenchDescription[] = _( - "Lowers the Attack, Sp. Atk\n" - "and Speed of a poisoned foe."); - -static const u8 sPowderDescription[] = _( - "Damages the foe if it uses\n" - "a Fire-type move."); - -static const u8 sGeomancyDescription[] = _( - "Raises Sp. Atk, Sp. Def and\n" - "Speed on the 2nd turn."); - -static const u8 sMagneticFluxDescription[] = _( - "Boosts the defenses of\n" - "those with Plus or Minus."); - -static const u8 sHappyHourDescription[] = _( - "Doubles the amount of\n" - "Prize Money received."); - -static const u8 sElectricTerrainDescription[] = _( - "Electrifies the ground for\n" - "5 turns. Prevents sleep."); - -static const u8 sDazzlingGleamDescription[] = _( - "Damages foes by emitting\n" - "a bright flash."); - -static const u8 sCelebrateDescription[] = _( - "Congratulates you on your\n" - "special day."); - -static const u8 sHoldHandsDescription[] = _( - "The user and ally hold hands\n" - "making them happy."); - -static const u8 sBabyDollEyesDescription[] = _( - "Lowers the foe's Attack\n" - "before it can move."); - -static const u8 sNuzzleDescription[] = _( - "Rubs its cheecks against\n" - "the foe, paralyzing it."); - -static const u8 sInfestationDescription[] = _( - "The foe is infested and\n" - "attacked for "BINDING_TURNS" turns."); - -static const u8 sPowerUpPunchDescription[] = _( - "A hard punch that raises\n" - "the user's Attack."); - -static const u8 sThousandArrowsDescription[] = _( - "Can hit Flying foes, then\n" - "knocks them to the ground."); - -static const u8 sThousandWavesDescription[] = _( - "Those hit by the wave can\n" - "no longer escape."); - -static const u8 sLandsWrathDescription[] = _( - "Gathers the energy of the\n" - "land to attack every foe."); - -static const u8 sLightOfRuinDescription[] = _( - "Fires a great beam of light\n" - "that also hurts the user."); - -static const u8 sOriginPulseDescription[] = _( - "Beams of glowing blue light\n" - "blast both foes."); - -static const u8 sPrecipiceBladesDescription[] = _( - "Fearsome blades of stone\n" - "attack both foes."); - -static const u8 sLavaPlumeDescription[] = _( - "Scarlet flames torch\n" - "everything around the user."); - -static const u8 sLeafStormDescription[] = _( - "Whips up a storm of leaves.\n" - "Harshly lowers the Sp. Atk."); - -static const u8 sShoreUpDescription[] = _( - "Restores the user's HP.\n" - "More HP in a sandstorm."); - -static const u8 sFirstImpressionDescription[] = _( - "Hits hard and first.\n" - "Only works first turn."); - -static const u8 sBanefulBunkerDescription[] = _( - "Protects user and poisons\n" - "foes on contact."); - -static const u8 sSpiritShackleDescription[] = _( - "After being hit, foes can\n" - "no longer escape."); - -static const u8 sDarkestLariatDescription[] = _( - "Swings the arms to strike\n" - "It ignores stat changes."); - -static const u8 sSparklingAriaDescription[] = _( - "Sings with bubbles. Cures\n" - "burns on contact."); - -static const u8 sIceHammerDescription[] = _( - "Swings the fist to strike.\n" - "Lowers the user's Speed."); - -static const u8 sFloralHealingDescription[] = _( - "Restores an ally's HP.\n" - "Heals more on grass."); - -static const u8 sHighHorsepowerDescription[] = _( - "Slams hard into the foe with\n" - "its entire body."); - -static const u8 sStrengthSapDescription[] = _( - "Saps the foe's Attack to\n" - "heal HP, then drops Attack."); - -static const u8 sSolarBladeDescription[] = _( - "Charges first turn, then\n" - "chops with a blade of light."); - -static const u8 sLeafageDescription[] = _( - "Attacks with a flurry of\n" - "small leaves."); - -static const u8 sSpotlightDescription[] = _( - "Makes the foe attack the\n" - "spotlighted Pokémon."); - -static const u8 sToxicThreadDescription[] = _( - "Attacks with a thread that\n" - "poisons and drops Speed."); - -static const u8 sLaserFocusDescription[] = _( - "Guarantees the next move\n" - "will be a critical hit."); - -static const u8 sGearUpDescription[] = _( - "Boosts the attacks of\n" - "those with Plus or Minus."); - -static const u8 sThroatChopDescription[] = _( - "Chops the throat to disable\n" - "sound moves for a while."); - -static const u8 sPollenPuffDescription[] = _( - "Explodes on foes, but\n" - "restores ally's HP."); - -static const u8 sAnchorShotDescription[] = _( - "Strangles the foe with a\n" - "chain. The foe can't escape."); - -static const u8 sPsychicTerrainDescription[] = _( - "The ground turns weird for\n" - "5 turns. Blocks priority."); - -static const u8 sLungeDescription[] = _( - "Lunges at the foe to lower\n" - "its Attack stat."); - -static const u8 sFireLashDescription[] = _( - "Whips the foe with fire\n" - "lowering its Defense."); - -static const u8 sPowerTripDescription[] = _( - "It hits harder the more\n" - "stat boosts the user has."); - -static const u8 sBurnUpDescription[] = _( - "Burns out the user fully\n" - "removing the Fire type."); - -static const u8 sSpeedSwapDescription[] = _( - "Swaps user's Speed with\n" - "the target's."); - -static const u8 sSmartStrikeDescription[] = _( - "Hits with an accurate\n" - "horn that never misses."); - -static const u8 sPurifyDescription[] = _( - "Cures the foe's status\n" - "to restore HP."); - -static const u8 sRevelationDanceDescription[] = _( - "Dances with mystical power.\n" - "Matches user's first type."); - -static const u8 sCoreEnforcerDescription[] = _( - "Hits with a ray that\n" - "nullifies the foe's ability."); - -static const u8 sTropKickDescription[] = _( - "An intense kick from the\n" - "tropics. Lowers Attack."); - -static const u8 sInstructDescription[] = _( - "Orders the target to use\n" - "its last move again."); - -static const u8 sBeakBlastDescription[] = _( - "Heats up beak to attack.\n" - "Burns foe on contact."); - -static const u8 sClangingScalesDescription[] = _( - "Makes a big noise with\n" - "its scales. Drops Defense."); - -static const u8 sDragonHammerDescription[] = _( - "Swings its whole body\n" - "like a hammer to damage."); - -static const u8 sBrutalSwingDescription[] = _( - "Violently swings around\n" - "to hurt everyone nearby."); - -static const u8 sAuroraVeilDescription[] = _( - "Weakens all attacks, but\n" - "only usable with hail."); - -static const u8 sShellTrapDescription[] = _( - "Sets a shell trap that\n" - "damages on contact."); - -static const u8 sFleurCannonDescription[] = _( - "A strong ray that harshly\n" - "lowers Sp. Attack."); - -static const u8 sPsychicFangsDescription[] = _( - "Chomps with psychic fangs.\n" - "Destroys any barriers."); - -static const u8 sStompingTantrumDescription[] = _( - "Stomps around angrily.\n" - "Stronger after a failure."); - -static const u8 sShadowBoneDescription[] = _( - "Strikes with a haunted\n" - "bone. Might drop Defense."); - -static const u8 sAccelerockDescription[] = _( - "Hits with a high-speed\n" - "rock that always goes first."); - -static const u8 sLiquidationDescription[] = _( - "Slams the foe with water.\n" - "Can lower Defense."); - -static const u8 sPrismaticLaserDescription[] = _( - "A high power laser that\n" - "forces recharge next turn."); - -static const u8 sSpectralThiefDescription[] = _( - "Steals the target's stat\n" - "boosts, then attacks."); - -static const u8 sSunsteelStrikeDescription[] = _( - "A sun-fueled strike that\n" - "ignores abilities."); - -static const u8 sMoongeistBeamDescription[] = _( - "A moon-powered beam that\n" - "ignores abilities."); - -static const u8 sTearfulLookDescription[] = _( - "The user tears up, dropping\n" - "Attack and Sp. Attack."); - -static const u8 sZingZapDescription[] = _( - "An electrified impact that\n" - "can cause flinching."); - -static const u8 sNaturesMadnessDescription[] = _( - "Halves the foe's HP with\n" - "the power of nature."); - -static const u8 sMultiAttackDescription[] = _( - "An attack that changes\n" - "with Memories."); - -static const u8 sMindBlownDescription[] = _( - "It explodes the user's head\n" - "to damage everything around."); - -static const u8 sPlasmaFistsDescription[] = _( - "Hits with electrical fists.\n" - "Normal moves become Electric."); - -static const u8 sPhotonGeyserDescription[] = _( - "User's highest attack stat\n" - "determines its category."); - -static const u8 sZippyZapDescription[] = _( - "Electric bursts always go\n" - "first and land a critical hit."); - -static const u8 sSplishySplashDescription[] = _( - "A huge electrified wave that\n" - "may paralyze the foe."); - -static const u8 sFloatyFallDescription[] = _( - "Floats in air and dives at\n" - "angle. May cause flinching."); - -static const u8 sPikaPapowDescription[] = _( - "Pikachu's love increases its\n" - "power. It never misses."); - -static const u8 sBouncyBubbleDescription[] = _( - "An attack that absorbs\n" -#if B_UPDATED_MOVE_DATA >= GEN_8 - "all the damage inflicted."); -#else - "half the damage inflicted."); -#endif - -static const u8 sBuzzyBuzzDescription[] = _( - "Shoots a jolt of electricity\n" - "that always paralyzes."); - -static const u8 sSizzlySlideDescription[] = _( - "User cloaked in fire charges.\n" - "Leaves the foe with a burn."); - -static const u8 sGlitzyGlowDescription[] = _( - "Telekinetic force that sets\n" - "wall, lowering Sp. Atk damage."); - -static const u8 sBaddyBadDescription[] = _( - "Acting badly, attacks. Sets\n" - "wall, lowering Attack damage."); - -static const u8 sSappySeedDescription[] = _( - "Giant stalk scatters seeds\n" - "that drain HP every turn."); - -static const u8 sFreezyFrostDescription[] = _( - "Crystal from cold haze hits.\n" - "Eliminates all stat changes."); - -static const u8 sSparklySwirlDescription[] = _( - "Wrap foe with whirlwind of\n" - "scent. Heals party's status."); - -static const u8 sVeeveeVolleyDescription[] = _( - "Eevee's love increases its\n" - "power. It never misses."); - -static const u8 sDoubleIronBashDescription[] = _( - "The user spins and hits with\n" - "its arms. May cause flinch."); - -// GEN 8 -static const u8 sDynamaxCannonDescription[] = _( - "Fires a strong beam. Deals\n" - "2x damage to Dynamaxed foes."); - -static const u8 sSnipeShotDescription[] = _( - "The user ignores effects\n" - "that draw in moves."); - -static const u8 sJawLockDescription[] = _( - "Prevents the user and\n" - "the target from escaping."); - -static const u8 sStuffCheeksDescription[] = _( - "Consumes the user's Berry,\n" - "then sharply raises Def."); - -static const u8 sNoRetreatDescription[] = _( - "Raises all of the user's\n" - "stats but prevents escape."); - -static const u8 sTarShotDescription[] = _( - "Lowers the foe's Speed and\n" - "makes it weak to Fire."); - -static const u8 sMagicPowderDescription[] = _( - "Magic powder changes the\n" - "target into a Psychic-type."); - -static const u8 sDragonDartsDescription[] = _( - "The user attacks twice. Two\n" - "targets are hit once each."); - -static const u8 sTeatimeDescription[] = _( - "All Pokémon have teatime\n" - "and eat their Berries."); - -static const u8 sOctolockDescription[] = _( - "Traps the foe to lower Def\n" - "and Sp. Def fall each turn."); - -static const u8 sBoltBeakDescription[] = _( - "Double power if the user\n" - "moves before the target."); - -static const u8 sFishiousRendDescription[] = _( - "Double power if the user\n" - "moves before the target."); - -static const u8 sCourtChangeDescription[] = _( - "The user swaps effects on\n" - "either side of the field."); - -static const u8 sClangorousSoulDescription[] = _( - "The user uses some of its\n" - "HP to raise all its stats."); - -static const u8 sBodyPressDescription[] = _( - "Does more damage the\n" - "higher the user's Def."); - -static const u8 sDecorateDescription[] = _( - "The user sharply raises\n" - "the target's Atk and Sp.Atk"); - -static const u8 sDrumBeatingDescription[] = _( - "Plays a drum to attack.\n" - "The foe's Speed is lowered."); - -static const u8 sSnapTrapDescription[] = _( - "Snares the target in a snap\n" - "trap for four to five turns."); - -static const u8 sPyroBallDescription[] = _( - "Launches a fiery ball at the\n" - "target. It may cause a burn."); - -static const u8 sBehemothBladeDescription[] = _( - "Strikes as a sword. Deals 2x\n" - "damage to Dynamaxed foes."); - -static const u8 sBehemothBashDescription[] = _( - "Attacks as a shield. Deals 2x\n" - "damage to Dynamaxed foes."); - -static const u8 sAuraWheelDescription[] = _( - "Raises Speed to attack. The\n" - "Type is based on its form."); - -static const u8 sBreakingSwipeDescription[] = _( - "Swings its tail to attack.\n" - "Lowers the Atk of those hit."); - -static const u8 sBranchPokeDescription[] = _( - "The user pokes the target\n" - "with a pointed branch."); - -static const u8 sOverdriveDescription[] = _( - "The user twangs its guitar,\n" - "causing strong vibrations."); - -static const u8 sAppleAcidDescription[] = _( - "Attacks with tart apple acid\n" - "to lower the foe's Sp. Def."); - -static const u8 sGravAppleDescription[] = _( - "Drops an apple from above.\n" - "Lowers the foe's Defense."); - -static const u8 sSpiritBreakDescription[] = _( - "Attacks with spirit-breaking\n" - "force. Lowers Sp. Atk."); - -static const u8 sStrangeSteamDescription[] = _( - "Emits a strange steam to\n" - "potentially confuse the foe."); - -static const u8 sLifeDewDescription[] = _( - "Scatters water to restore\n" - "the HP of itself and allies."); - -static const u8 sObstructDescription[] = _( - "Protects itself, harshly\n" - "lowering Def on contact."); - -static const u8 sFalseSurrenderDescription[] = _( - "Bows to stab the foe\n" - "with hair. It never misses."); - -static const u8 sMeteorAssaultDescription[] = _( - "Attacks with a thick leek.\n" - "The user must then rest."); - -static const u8 sEternabeamDescription[] = _( - "Eternatus' strongest move.\n" - "The user rests next turn."); - -static const u8 sSteelBeamDescription[] = _( - "Fires a beam of steel from\n" - "its body. It hurts the user."); - -static const u8 sExpandingForceDescription[] = _( - "Power goes up and damages\n" - "all foes on Psychic Terrain."); - -static const u8 sSteelRollerDescription[] = _( - "Destroys terrain. Fails if\n" - "ground isn't terrain."); - -static const u8 sScaleShotDescription[] = _( - "Shoots scales 2 to 5 times.\n" - "Ups Speed, lowers defense."); - -static const u8 sMeteorBeamDescription[] = _( - "A 2-turn move that raises\n" - "Sp. Attack before attacking."); - -static const u8 sShellSideArmDescription[] = _( - "Deals better of physical and\n" - "special damage. May poison."); - -static const u8 sMistyExplosionDescription[] = _( - "Hit everything and faint.\n" - "Powers up on Misty Terrain."); - -static const u8 sGrassyGlideDescription[] = _( - "Gliding on ground, hits. Goes\n" - "first on Grassy Terrain."); - -static const u8 sRisingVoltageDescription[] = _( - "This move's power doubles\n" - "when on Electric Terrain."); - -static const u8 sTerrainPulseDescription[] = _( - "Type and power changes\n" - "depending on the terrain."); - -static const u8 sSkitterSmackDescription[] = _( - "User skitters behind foe to\n" - "attack. Lowers foe's Sp. Atk."); - -static const u8 sBurningJealousyDescription[] = _( - "Foes that have stats upped\n" - "during the turn get burned."); - -static const u8 sLashOutDescription[] = _( - "If stats lowered during this\n" - "turn, power is doubled."); - -static const u8 sPoltergeistDescription[] = _( - "Control foe's item to attack.\n" - "Fails if foe has no item."); - -static const u8 sCorrosiveGasDescription[] = _( - "Highly acidic gas melts items\n" - "held by surrounding Pokémon."); - -static const u8 sCoachingDescription[] = _( - "Properly coaches allies to\n" - "up their Attack and Defense."); - -static const u8 sFlipTurnDescription[] = _( - "Attacks and rushes back to\n" - "switch with a party Pokémon."); - -static const u8 sTripleAxelDescription[] = _( - "A 3-kick attack that gets\n" - "more powerful with each hit."); - -static const u8 sDualWingbeatDescription[] = _( - "User slams the target with\n" - "wings and hits twice in a row."); - -static const u8 sScorchingSandsDescription[] = _( - "Throws scorching sand at\n" - "the target. May leave a burn."); - -static const u8 sJungleHealingDescription[] = _( - "Heals HP and status of\n" - "itself and allies in battle."); - -static const u8 sWickedBlowDescription[] = _( - "Mastering the Dark style,\n" - "strikes with a critical hit."); - -static const u8 sSurgingStrikesDescription[] = _( - "Mastering the Water style,\n" - "strikes with 3 critical hits."); - -static const u8 sThunderCageDescription[] = _( - "Traps the foe in a cage of\n" - "electricity for "BINDING_TURNS" turns."); - -static const u8 sDragonEnergyDescription[] = _( - "The higher the user's HP\n" - "the more damage caused."); - -static const u8 sFreezingGlareDescription[] = _( - "Shoots psychic power from\n" -#if B_USE_FROSTBITE == TRUE - "the eyes. May frostbite."); -#else - "the eyes. May freeze the foe."); -#endif - -static const u8 sFieryWrathDescription[] = _( - "An attack fueled by your\n" - "wrath. May cause flinching."); - -static const u8 sThunderousKickDescription[] = _( - "Uses a lightning-like kick\n" - "to hit. Lowers foe's Defense."); - -static const u8 sGlacialLanceDescription[] = _( - "Strikes by hurling a blizzard-\n" - "cloaked icicle lance at foes."); - -static const u8 sAstralBarrageDescription[] = _( - "Strikes by sending a frightful\n" - "amount of ghosts at foes."); - -static const u8 sEerieSpellDescription[] = _( - "Attacks with psychic power.\n" - "Foe's last move has 3 PP cut."); - -static const u8 sDireClawDescription[] = _( - "High critical hit chance. May\n" - "paralyze, poison or drowse."); - -static const u8 sPsyshieldBashDescription[] = _( - "Hits a foe with psychic\n" - "energy. May raise Defense."); - -static const u8 sPowerShiftDescription[] = _( - "The user swaps its Attack\n" - "and Defense stats."); - -static const u8 sStoneAxeDescription[] = _( - "High critical hit ratio. Sets\n" - "Splinters that hurt the foe."); - -static const u8 sSpringtideStormDescription[] = _( - "Wraps a foe in fierce winds.\n" - "Varies with the user's form."); - -static const u8 sMysticalPowerDescription[] = _( - "A mysterious power strikes,\n" - "raising the user's Sp. Atk."); - -static const u8 sRagingFuryDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); - -static const u8 sWaveCrashDescription[] = _( - "A slam shrouded in water.\n" - "It also hurts the user."); - -static const u8 sChloroblastDescription[] = _( - "A user-hurting blast of\n" - "amassed chlorophyll."); - -static const u8 sMountainGaleDescription[] = _( - "Giant chunks of ice damage\n" - "the foe. It may flinch."); - -static const u8 sVictoryDanceDescription[] = _( - "Dances to raise Attack,\n" - "Defense and Speed."); - -static const u8 sHeadlongRushDescription[] = _( - "Hits with a full-body tackle.\n" - "Lowers the users's defenses."); - -static const u8 sBarbBarrageDescription[] = _( - "Can poison on impact. Powers\n" - "up against poisoned foes."); - -static const u8 sEsperWingDescription[] = _( - "High critical hit ratio.\n" - "Ups the user's Speed."); - -static const u8 sBitterMaliceDescription[] = _( - "A spine-chilling resentment.\n" - "May lower the foe's Attack."); - -static const u8 sShelterDescription[] = _( - "The user hardens their skin,\n" - "sharply raising its Defense."); - -static const u8 sTripleArrowsDescription[] = _( - "High critical hit ratio.\n" - "May lower Defense or flinch."); - -static const u8 sInfernalParadeDescription[] = _( - "Hurts a foe harder if it has\n" - "an ailment. May leave a burn."); - -static const u8 sCeaselessEdgeDescription[] = _( - "High critical hit ratio. Sets\n" - "Splinters that hurt the foe."); - -static const u8 sBleakwindStormDescription[] = _( - "Hits with brutal, cold winds.\n" - "May lower the foe's Speed."); - -static const u8 sWildboltStormDescription[] = _( - "Hits with a brutal tempest.\n" - "May inflict paralysis."); - -static const u8 sSandsearStormDescription[] = _( - "Hits with brutally hot sand.\n" - "May inflict a burn."); - -static const u8 sLunarBlessingDescription[] = _( - "The user heals and cures\n" - "itself and its ally."); - -static const u8 sTakeHeartDescription[] = _( - "The user lifts its spirits to\n" - "heal and strengthen itself."); - -static const u8 sTeraBlastDescription[] = _( - "If the user's Terastallized,\n" - "it hits with its Tera-type."); - -static const u8 sSilkTrapDescription[] =_( - "Protects itself, lowering\n" - "Speed on contact."); - -static const u8 sAxeKickDescription[] = _( - "May miss and hurt the kicker.\n" - "May cause confusion."); - -static const u8 sLastRespectsDescription[] = _( - "This move deals more damage\n" - "for each defeated ally."); - -static const u8 sLuminaCrashDescription[] = _( - "A mind-affecting light\n" - "harshly lowers Sp. Def."); - -static const u8 sOrderUpDescription[] = _( - "Boosts a user's stats\n" - "depending on Tatsugiri."); - -static const u8 sJetPunchDescription[] = _( - "A punch is thrown at blinding\n" - "speed to strike first."); - -static const u8 sSpicyExtractDescription[] = _( - "Sharply ups target's Attack,\n" - "harshly lowers its Defense."); - -static const u8 sSpinOutDescription[] = _( - "Furiously strains its legs.\n" - "Harshly lowers user's Speed."); - -static const u8 sPopulationBombDescription[] = _( - "The user's fellows hit one\n" - "to ten times in a row."); - -static const u8 sIceSpinnerDescription[] = _( - "Ice-covered feet hit a foe\n" - "and destroy the terrain."); - -static const u8 sGlaiveRushDescription[] = _( - "Foe attacks next turn can't\n" - "miss and do double damage."); - -static const u8 sRevivalBlessingDescription[] = _( - "Revives a fainted party {PKMN}\n" - "and restores half of its HP."); - -static const u8 sSaltCureDescription[] = _( - "Hurts foe every turn. Double\n" - "damage to Steel and Water."); - -static const u8 sTripleDiveDescription[] = _( - "Hits target with splashes\n" - "of water 3 times in a row."); - -static const u8 sMortalSpinDescription[] = _( - "Erases trap moves and Leech\n" - "Seed. Poisons adjecent foes."); - -static const u8 sDoodleDescription[] = _( - "Changes user's and ally's\n" - "Ability into the target's."); - -static const u8 sFilletAwayDescription[] = _( - "Sharply boosts offenses and\n" - "Speed by using its own HP."); - -static const u8 sKowtowCleaveDescription[] = _( - "User slashes the foe after\n" - "kowtowing. It never misses."); - -static const u8 sFlowerTrickDescription[] = _( - "Rigged bouquet. Always gets\n" - "a critical hit, never missing."); - -static const u8 sTorchSongDescription[] = _( - "Flames scorch the target.\n" - "Boosts the user's Sp. Atk."); - -static const u8 sAquaStepDescription[] = _( - "Hits with light, fluid dance\n" - "steps. Ups the user's Speed."); - -static const u8 sRagingBullDescription[] = _( - "Tackle that breaks barriers.\n" - "User's form determines type."); - -static const u8 sMakeItRainDescription[] = _( - "Lowers the user's Sp. Atk.\n" - "Money is recovered after."); - -static const u8 sRuinationDescription[] = _( - "Summons a ruinous disaster\n" - "and cuts half the foe's HP."); - -static const u8 sCollisionCourseDescription[] = _( - "Prehistoric explosion that's\n" - "stronger if supereffective."); - -static const u8 sElectroDriftDescription[] = _( - "Futuristic electricity. It's\n" - "stronger if supereffective."); - -static const u8 sShedTailDescription[] = _( - "Creates a Substitute for\n" - "itself before switching out."); - -static const u8 sChillyReceptionDescription[] =_( - "Bad joke summons snowstorm.\n" - "The user also switches out."); - -static const u8 sTidyUpDescription[] = _( - "User tidies up hazards and\n" - "raises its Attack and Speed."); - -static const u8 sSnowscapeDescription[] = _( - "Summons a snowstorm that\n" - "lasts for five turns."); - -static const u8 sPounceDescription[] = _( - "The user pounces on the foe,\n" - "lowering its Speed."); - -static const u8 sTrailblazeDescription[] = _( - "The user attacks suddenly,\n" - "raising its Speed."); - -static const u8 sChillingWaterDescription[] = _( - "A shower with ice-cold water\n" - "lowers the target's Attack."); - -static const u8 sHyperDrillDescription[] = _( - "A spinning pointed part\n" - "bypasses a foe's Protect."); - -static const u8 sTwinBeamDescription[] = _( - "Mystical eye-beams that hit\n" - "the target twice in a row."); - -static const u8 sRageFistDescription[] = _( - "The more the user has been\n" - "hit, the stronger the move."); - -static const u8 sArmorCannonDescription[] = _( - "A strong attack but lowers\n" - "the defensive stats."); - -static const u8 sBitterBladeDescription[] = _( - "An attack that absorbs\n" - "half the damage inflicted."); - -static const u8 sDoubleShockDescription[] = _( - "Discharges all electricity,\n" - "losing the Electric type."); - -static const u8 sGigatonHammerDescription[] = _( - "Swings a huge hammer. Can't\n" - "be used twice in a row."); - -static const u8 sComeuppanceDescription[] = _( - "Retaliates strongly against\n" - "who last hurt the user."); - -static const u8 sAquaCutterDescription[] = _( - "Pressurized water cut with a\n" - "high critical-hit ratio."); - -static const u8 sBlazingTorqueDescription[] = _( - "---"); - -static const u8 sWickedTorqueDescription[] = _( - "---"); - -static const u8 sNoxiousTorqueDescription[] = _( - "---"); - -static const u8 sCombatTorqueDescription[] = _( - "---"); - -static const u8 sMagicalTorqueDescription[] = _( - "---"); - -static const u8 sPsybladeDescription[] = _( - "This move's power increases\n" - "when on Electric Terrain."); - -static const u8 sHydroSteamDescription[] = _( - "This move's power increases\n" - "under harsh sunlight."); - -static const u8 sBloodMoonDescription[] = _( - "Unleashes the blood moon.\n" - "Can't be used twice in a row."); - -static const u8 sMatchaGotchaDescription[] = _( - "Absorbs half the damage\n" - "inflicted. May cause a burn."); - -static const u8 sSyrupBombDescription[] = _( - "Lowers the foe's speed\n" - "each turn for 3 turns."); - -static const u8 sIvyCudgelDescription[] = _( - "Type changes with held mask.\n" - "High critical-hit ratio."); - -static const u8 sElectroShotDescription[] = _( - "Absorbs electricity in one turn,\n" - "then attacks next turn."); - -static const u8 sTeraStarstormDescription[] = _( - "Damages all opponents if user is\n" - "Stellar form Terapagos."); - -static const u8 sFickleBeamDescription[] = _( - "Shoots a beam of light. Sometimes\n" - "twice as strong."); - -static const u8 sBurningBulwarkDescription[] = _( - "Evades attack, and burns\n" - "the foe if struck."); - -static const u8 sTachyonCutterDescription[] = _( - "Launches particle blades at\n" - "the target. Strikes twice."); - -static const u8 sDragonCheerDescription[] = _( - "Increases allies' critical hit\n" - "ration, especially if Dragons."); - -static const u8 sAlluringVoiceDescription[] = _( - "Confuses the target if their\n" - "stats were boosted this turn."); - -static const u8 sTemperFlareDescription[] = _( - "A desperation attack. Power\n" - "doubles if last move failed."); - -static const u8 sSupercellSlamDescription[] = _( - "An electrified slam. If it\n" - "misses, the user is hurt."); - -static const u8 sPsychicNoiseDescription[] = _( - "Unpleasant sound waves that\n" - "damage and prevent healing."); - -static const u8 sUpperHandDescription[] = _( - "Makes the target flinch if\n" - "readying a priority move."); - -static const u8 sMalignantChainDescription[] = _( - "A corrosive chain attack\n" - "that may badly poison."); - -const u8 gNotDoneYetDescription[] = _( - "This move can't be used. Its\n" - "effect is in development."); - -#undef BINDING_TURNS - -// MOVE_NONE is ignored in this table. Make sure to always subtract 1 before getting the right pointer. -const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = -{ - [MOVE_POUND - 1] = sPoundDescription, - [MOVE_KARATE_CHOP - 1] = sKarateChopDescription, - [MOVE_DOUBLE_SLAP - 1] = sDoubleSlapDescription, - [MOVE_COMET_PUNCH - 1] = sCometPunchDescription, - [MOVE_MEGA_PUNCH - 1] = sMegaPunchDescription, - [MOVE_PAY_DAY - 1] = sPayDayDescription, - [MOVE_FIRE_PUNCH - 1] = sFirePunchDescription, - [MOVE_ICE_PUNCH - 1] = sIcePunchDescription, - [MOVE_THUNDER_PUNCH - 1] = sThunderPunchDescription, - [MOVE_SCRATCH - 1] = sScratchDescription, - [MOVE_VISE_GRIP - 1] = sViseGripDescription, - [MOVE_GUILLOTINE - 1] = sGuillotineDescription, - [MOVE_RAZOR_WIND - 1] = sRazorWindDescription, - [MOVE_SWORDS_DANCE - 1] = sSwordsDanceDescription, - [MOVE_CUT - 1] = sCutDescription, - [MOVE_GUST - 1] = sGustDescription, - [MOVE_WING_ATTACK - 1] = sWingAttackDescription, - [MOVE_WHIRLWIND - 1] = sWhirlwindDescription, - [MOVE_FLY - 1] = sFlyDescription, - [MOVE_BIND - 1] = sBindDescription, - [MOVE_SLAM - 1] = sSlamDescription, - [MOVE_VINE_WHIP - 1] = sVineWhipDescription, - [MOVE_STOMP - 1] = sStompDescription, - [MOVE_DOUBLE_KICK - 1] = sDoubleKickDescription, - [MOVE_MEGA_KICK - 1] = sMegaKickDescription, - [MOVE_JUMP_KICK - 1] = sJumpKickDescription, - [MOVE_ROLLING_KICK - 1] = sRollingKickDescription, - [MOVE_SAND_ATTACK - 1] = sSandAttackDescription, - [MOVE_HEADBUTT - 1] = sHeadbuttDescription, - [MOVE_HORN_ATTACK - 1] = sHornAttackDescription, - [MOVE_FURY_ATTACK - 1] = sFuryAttackDescription, - [MOVE_HORN_DRILL - 1] = sHornDrillDescription, - [MOVE_TACKLE - 1] = sTackleDescription, - [MOVE_BODY_SLAM - 1] = sBodySlamDescription, - [MOVE_WRAP - 1] = sWrapDescription, - [MOVE_TAKE_DOWN - 1] = sTakeDownDescription, - [MOVE_THRASH - 1] = sThrashDescription, - [MOVE_DOUBLE_EDGE - 1] = sDoubleEdgeDescription, - [MOVE_TAIL_WHIP - 1] = sTailWhipDescription, - [MOVE_POISON_STING - 1] = sPoisonStingDescription, - [MOVE_TWINEEDLE - 1] = sTwineedleDescription, - [MOVE_PIN_MISSILE - 1] = sPinMissileDescription, - [MOVE_LEER - 1] = sLeerDescription, - [MOVE_BITE - 1] = sBiteDescription, - [MOVE_GROWL - 1] = sGrowlDescription, - [MOVE_ROAR - 1] = sRoarDescription, - [MOVE_SING - 1] = sSingDescription, - [MOVE_SUPERSONIC - 1] = sSupersonicDescription, - [MOVE_SONIC_BOOM - 1] = sSonicBoomDescription, - [MOVE_DISABLE - 1] = sDisableDescription, - [MOVE_ACID - 1] = sAcidDescription, - [MOVE_EMBER - 1] = sEmberDescription, - [MOVE_FLAMETHROWER - 1] = sFlamethrowerDescription, - [MOVE_MIST - 1] = sMistDescription, - [MOVE_WATER_GUN - 1] = sWaterGunDescription, - [MOVE_HYDRO_PUMP - 1] = sHydroPumpDescription, - [MOVE_SURF - 1] = sSurfDescription, - [MOVE_ICE_BEAM - 1] = sIceBeamDescription, - [MOVE_BLIZZARD - 1] = sBlizzardDescription, - [MOVE_PSYBEAM - 1] = sPsybeamDescription, - [MOVE_BUBBLE_BEAM - 1] = sBubbleBeamDescription, - [MOVE_AURORA_BEAM - 1] = sAuroraBeamDescription, - [MOVE_HYPER_BEAM - 1] = sHyperBeamDescription, - [MOVE_PECK - 1] = sPeckDescription, - [MOVE_DRILL_PECK - 1] = sDrillPeckDescription, - [MOVE_SUBMISSION - 1] = sSubmissionDescription, - [MOVE_LOW_KICK - 1] = sLowKickDescription, - [MOVE_COUNTER - 1] = sCounterDescription, - [MOVE_SEISMIC_TOSS - 1] = sSeismicTossDescription, - [MOVE_STRENGTH - 1] = sStrengthDescription, - [MOVE_ABSORB - 1] = sAbsorbDescription, - [MOVE_MEGA_DRAIN - 1] = sMegaDrainDescription, - [MOVE_LEECH_SEED - 1] = sLeechSeedDescription, - [MOVE_GROWTH - 1] = sGrowthDescription, - [MOVE_RAZOR_LEAF - 1] = sRazorLeafDescription, - [MOVE_SOLAR_BEAM - 1] = sSolarBeamDescription, - [MOVE_POISON_POWDER - 1] = sPoisonPowderDescription, - [MOVE_STUN_SPORE - 1] = sStunSporeDescription, - [MOVE_SLEEP_POWDER - 1] = sSleepPowderDescription, - [MOVE_PETAL_DANCE - 1] = sPetalDanceDescription, - [MOVE_STRING_SHOT - 1] = sStringShotDescription, - [MOVE_DRAGON_RAGE - 1] = sDragonRageDescription, - [MOVE_FIRE_SPIN - 1] = sFireSpinDescription, - [MOVE_THUNDER_SHOCK - 1] = sThunderShockDescription, - [MOVE_THUNDERBOLT - 1] = sThunderboltDescription, - [MOVE_THUNDER_WAVE - 1] = sThunderWaveDescription, - [MOVE_THUNDER - 1] = sThunderDescription, - [MOVE_ROCK_THROW - 1] = sRockThrowDescription, - [MOVE_EARTHQUAKE - 1] = sEarthquakeDescription, - [MOVE_FISSURE - 1] = sFissureDescription, - [MOVE_DIG - 1] = sDigDescription, - [MOVE_TOXIC - 1] = sToxicDescription, - [MOVE_CONFUSION - 1] = sConfusionDescription, - [MOVE_PSYCHIC - 1] = sPsychicDescription, - [MOVE_HYPNOSIS - 1] = sHypnosisDescription, - [MOVE_MEDITATE - 1] = sMeditateDescription, - [MOVE_AGILITY - 1] = sAgilityDescription, - [MOVE_QUICK_ATTACK - 1] = sQuickAttackDescription, - [MOVE_RAGE - 1] = sRageDescription, - [MOVE_TELEPORT - 1] = sTeleportDescription, - [MOVE_NIGHT_SHADE - 1] = sNightShadeDescription, - [MOVE_MIMIC - 1] = sMimicDescription, - [MOVE_SCREECH - 1] = sScreechDescription, - [MOVE_DOUBLE_TEAM - 1] = sDoubleTeamDescription, - [MOVE_RECOVER - 1] = sRecoverDescription, - [MOVE_HARDEN - 1] = sHardenDescription, - [MOVE_MINIMIZE - 1] = sMinimizeDescription, - [MOVE_SMOKESCREEN - 1] = sSmokescreenDescription, - [MOVE_CONFUSE_RAY - 1] = sConfuseRayDescription, - [MOVE_WITHDRAW - 1] = sWithdrawDescription, - [MOVE_DEFENSE_CURL - 1] = sDefenseCurlDescription, - [MOVE_BARRIER - 1] = sBarrierDescription, - [MOVE_LIGHT_SCREEN - 1] = sLightScreenDescription, - [MOVE_HAZE - 1] = sHazeDescription, - [MOVE_REFLECT - 1] = sReflectDescription, - [MOVE_FOCUS_ENERGY - 1] = sFocusEnergyDescription, - [MOVE_BIDE - 1] = sBideDescription, - [MOVE_METRONOME - 1] = sMetronomeDescription, - [MOVE_MIRROR_MOVE - 1] = sMirrorMoveDescription, - [MOVE_SELF_DESTRUCT - 1] = sSelfDestructDescription, - [MOVE_EGG_BOMB - 1] = sEggBombDescription, - [MOVE_LICK - 1] = sLickDescription, - [MOVE_SMOG - 1] = sSmogDescription, - [MOVE_SLUDGE - 1] = sSludgeDescription, - [MOVE_BONE_CLUB - 1] = sBoneClubDescription, - [MOVE_FIRE_BLAST - 1] = sFireBlastDescription, - [MOVE_WATERFALL - 1] = sWaterfallDescription, - [MOVE_CLAMP - 1] = sClampDescription, - [MOVE_SWIFT - 1] = sSwiftDescription, - [MOVE_SKULL_BASH - 1] = sSkullBashDescription, - [MOVE_SPIKE_CANNON - 1] = sSpikeCannonDescription, - [MOVE_CONSTRICT - 1] = sConstrictDescription, - [MOVE_AMNESIA - 1] = sAmnesiaDescription, - [MOVE_KINESIS - 1] = sKinesisDescription, - [MOVE_SOFT_BOILED - 1] = sSoftBoiledDescription, - [MOVE_HIGH_JUMP_KICK - 1] = sHighJumpKickDescription, - [MOVE_GLARE - 1] = sGlareDescription, - [MOVE_DREAM_EATER - 1] = sDreamEaterDescription, - [MOVE_POISON_GAS - 1] = sPoisonGasDescription, - [MOVE_BARRAGE - 1] = sBarrageDescription, - [MOVE_LEECH_LIFE - 1] = sLeechLifeDescription, - [MOVE_LOVELY_KISS - 1] = sLovelyKissDescription, - [MOVE_SKY_ATTACK - 1] = sSkyAttackDescription, - [MOVE_TRANSFORM - 1] = sTransformDescription, - [MOVE_BUBBLE - 1] = sBubbleDescription, - [MOVE_DIZZY_PUNCH - 1] = sDizzyPunchDescription, - [MOVE_SPORE - 1] = sSporeDescription, - [MOVE_FLASH - 1] = sFlashDescription, - [MOVE_PSYWAVE - 1] = sPsywaveDescription, - [MOVE_SPLASH - 1] = sSplashDescription, - [MOVE_ACID_ARMOR - 1] = sAcidArmorDescription, - [MOVE_CRABHAMMER - 1] = sCrabhammerDescription, - [MOVE_EXPLOSION - 1] = sExplosionDescription, - [MOVE_FURY_SWIPES - 1] = sFurySwipesDescription, - [MOVE_BONEMERANG - 1] = sBonemerangDescription, - [MOVE_REST - 1] = sRestDescription, - [MOVE_ROCK_SLIDE - 1] = sRockSlideDescription, - [MOVE_HYPER_FANG - 1] = sHyperFangDescription, - [MOVE_SHARPEN - 1] = sSharpenDescription, - [MOVE_CONVERSION - 1] = sConversionDescription, - [MOVE_TRI_ATTACK - 1] = sTriAttackDescription, - [MOVE_SUPER_FANG - 1] = sSuperFangDescription, - [MOVE_SLASH - 1] = sSlashDescription, - [MOVE_SUBSTITUTE - 1] = sSubstituteDescription, - [MOVE_STRUGGLE - 1] = sStruggleDescription, - [MOVE_SKETCH - 1] = sSketchDescription, - [MOVE_TRIPLE_KICK - 1] = sTripleKickDescription, - [MOVE_THIEF - 1] = sThiefDescription, - [MOVE_SPIDER_WEB - 1] = sSpiderWebDescription, - [MOVE_MIND_READER - 1] = sMindReaderDescription, - [MOVE_NIGHTMARE - 1] = sNightmareDescription, - [MOVE_FLAME_WHEEL - 1] = sFlameWheelDescription, - [MOVE_SNORE - 1] = sSnoreDescription, - [MOVE_CURSE - 1] = sCurseDescription, - [MOVE_FLAIL - 1] = sFlailDescription, - [MOVE_CONVERSION_2 - 1] = sConversion2Description, - [MOVE_AEROBLAST - 1] = sAeroblastDescription, - [MOVE_COTTON_SPORE - 1] = sCottonSporeDescription, - [MOVE_REVERSAL - 1] = sReversalDescription, - [MOVE_SPITE - 1] = sSpiteDescription, - [MOVE_POWDER_SNOW - 1] = sPowderSnowDescription, - [MOVE_PROTECT - 1] = sProtectDescription, - [MOVE_MACH_PUNCH - 1] = sMachPunchDescription, - [MOVE_SCARY_FACE - 1] = sScaryFaceDescription, - [MOVE_FEINT_ATTACK - 1] = sFeintAttackDescription, - [MOVE_SWEET_KISS - 1] = sSweetKissDescription, - [MOVE_BELLY_DRUM - 1] = sBellyDrumDescription, - [MOVE_SLUDGE_BOMB - 1] = sSludgeBombDescription, - [MOVE_MUD_SLAP - 1] = sMudSlapDescription, - [MOVE_OCTAZOOKA - 1] = sOctazookaDescription, - [MOVE_SPIKES - 1] = sSpikesDescription, - [MOVE_ZAP_CANNON - 1] = sZapCannonDescription, - [MOVE_FORESIGHT - 1] = sForesightDescription, - [MOVE_DESTINY_BOND - 1] = sDestinyBondDescription, - [MOVE_PERISH_SONG - 1] = sPerishSongDescription, - [MOVE_ICY_WIND - 1] = sIcyWindDescription, - [MOVE_DETECT - 1] = sDetectDescription, - [MOVE_BONE_RUSH - 1] = sBoneRushDescription, - [MOVE_LOCK_ON - 1] = sLockOnDescription, - [MOVE_OUTRAGE - 1] = sOutrageDescription, - [MOVE_SANDSTORM - 1] = sSandstormDescription, - [MOVE_GIGA_DRAIN - 1] = sGigaDrainDescription, - [MOVE_ENDURE - 1] = sEndureDescription, - [MOVE_CHARM - 1] = sCharmDescription, - [MOVE_ROLLOUT - 1] = sRolloutDescription, - [MOVE_FALSE_SWIPE - 1] = sFalseSwipeDescription, - [MOVE_SWAGGER - 1] = sSwaggerDescription, - [MOVE_MILK_DRINK - 1] = sMilkDrinkDescription, - [MOVE_SPARK - 1] = sSparkDescription, - [MOVE_FURY_CUTTER - 1] = sFuryCutterDescription, - [MOVE_STEEL_WING - 1] = sSteelWingDescription, - [MOVE_MEAN_LOOK - 1] = sMeanLookDescription, - [MOVE_ATTRACT - 1] = sAttractDescription, - [MOVE_SLEEP_TALK - 1] = sSleepTalkDescription, - [MOVE_HEAL_BELL - 1] = sHealBellDescription, - [MOVE_RETURN - 1] = sReturnDescription, - [MOVE_PRESENT - 1] = sPresentDescription, - [MOVE_FRUSTRATION - 1] = sFrustrationDescription, - [MOVE_SAFEGUARD - 1] = sSafeguardDescription, - [MOVE_PAIN_SPLIT - 1] = sPainSplitDescription, - [MOVE_SACRED_FIRE - 1] = sSacredFireDescription, - [MOVE_MAGNITUDE - 1] = sMagnitudeDescription, - [MOVE_DYNAMIC_PUNCH - 1] = sDynamicPunchDescription, - [MOVE_MEGAHORN - 1] = sMegahornDescription, - [MOVE_DRAGON_BREATH - 1] = sDragonBreathDescription, - [MOVE_BATON_PASS - 1] = sBatonPassDescription, - [MOVE_ENCORE - 1] = sEncoreDescription, - [MOVE_PURSUIT - 1] = sPursuitDescription, - [MOVE_RAPID_SPIN - 1] = sRapidSpinDescription, - [MOVE_SWEET_SCENT - 1] = sSweetScentDescription, - [MOVE_IRON_TAIL - 1] = sIronTailDescription, - [MOVE_METAL_CLAW - 1] = sMetalClawDescription, - [MOVE_VITAL_THROW - 1] = sVitalThrowDescription, - [MOVE_MORNING_SUN - 1] = sMorningSunDescription, - [MOVE_SYNTHESIS - 1] = sSynthesisDescription, - [MOVE_MOONLIGHT - 1] = sMoonlightDescription, - [MOVE_HIDDEN_POWER - 1] = sHiddenPowerDescription, - [MOVE_CROSS_CHOP - 1] = sCrossChopDescription, - [MOVE_TWISTER - 1] = sTwisterDescription, - [MOVE_RAIN_DANCE - 1] = sRainDanceDescription, - [MOVE_SUNNY_DAY - 1] = sSunnyDayDescription, - [MOVE_CRUNCH - 1] = sCrunchDescription, - [MOVE_MIRROR_COAT - 1] = sMirrorCoatDescription, - [MOVE_PSYCH_UP - 1] = sPsychUpDescription, - [MOVE_EXTREME_SPEED - 1] = sExtremeSpeedDescription, - [MOVE_ANCIENT_POWER - 1] = sAncientPowerDescription, - [MOVE_SHADOW_BALL - 1] = sShadowBallDescription, - [MOVE_FUTURE_SIGHT - 1] = sFutureSightDescription, - [MOVE_ROCK_SMASH - 1] = sRockSmashDescription, - [MOVE_WHIRLPOOL - 1] = sWhirlpoolDescription, - [MOVE_BEAT_UP - 1] = sBeatUpDescription, - [MOVE_FAKE_OUT - 1] = sFakeOutDescription, - [MOVE_UPROAR - 1] = sUproarDescription, - [MOVE_STOCKPILE - 1] = sStockpileDescription, - [MOVE_SPIT_UP - 1] = sSpitUpDescription, - [MOVE_SWALLOW - 1] = sSwallowDescription, - [MOVE_HEAT_WAVE - 1] = sHeatWaveDescription, - [MOVE_HAIL - 1] = sHailDescription, - [MOVE_TORMENT - 1] = sTormentDescription, - [MOVE_FLATTER - 1] = sFlatterDescription, - [MOVE_WILL_O_WISP - 1] = sWillOWispDescription, - [MOVE_MEMENTO - 1] = sMementoDescription, - [MOVE_FACADE - 1] = sFacadeDescription, - [MOVE_FOCUS_PUNCH - 1] = sFocusPunchDescription, - [MOVE_SMELLING_SALTS - 1] = sSmellingSaltsDescription, - [MOVE_FOLLOW_ME - 1] = sFollowMeDescription, - [MOVE_NATURE_POWER - 1] = sNaturePowerDescription, - [MOVE_CHARGE - 1] = sChargeDescription, - [MOVE_TAUNT - 1] = sTauntDescription, - [MOVE_HELPING_HAND - 1] = sHelpingHandDescription, - [MOVE_TRICK - 1] = sTrickDescription, - [MOVE_ROLE_PLAY - 1] = sRolePlayDescription, - [MOVE_WISH - 1] = sWishDescription, - [MOVE_ASSIST - 1] = sAssistDescription, - [MOVE_INGRAIN - 1] = sIngrainDescription, - [MOVE_SUPERPOWER - 1] = sSuperpowerDescription, - [MOVE_MAGIC_COAT - 1] = sMagicCoatDescription, - [MOVE_RECYCLE - 1] = sRecycleDescription, - [MOVE_REVENGE - 1] = sRevengeDescription, - [MOVE_BRICK_BREAK - 1] = sBrickBreakDescription, - [MOVE_YAWN - 1] = sYawnDescription, - [MOVE_KNOCK_OFF - 1] = sKnockOffDescription, - [MOVE_ENDEAVOR - 1] = sEndeavorDescription, - [MOVE_ERUPTION - 1] = sEruptionDescription, - [MOVE_SKILL_SWAP - 1] = sSkillSwapDescription, - [MOVE_IMPRISON - 1] = sImprisonDescription, - [MOVE_REFRESH - 1] = sRefreshDescription, - [MOVE_GRUDGE - 1] = sGrudgeDescription, - [MOVE_SNATCH - 1] = sSnatchDescription, - [MOVE_SECRET_POWER - 1] = sSecretPowerDescription, - [MOVE_DIVE - 1] = sDiveDescription, - [MOVE_ARM_THRUST - 1] = sArmThrustDescription, - [MOVE_CAMOUFLAGE - 1] = sCamouflageDescription, - [MOVE_TAIL_GLOW - 1] = sTailGlowDescription, - [MOVE_LUSTER_PURGE - 1] = sLusterPurgeDescription, - [MOVE_MIST_BALL - 1] = sMistBallDescription, - [MOVE_FEATHER_DANCE - 1] = sFeatherDanceDescription, - [MOVE_TEETER_DANCE - 1] = sTeeterDanceDescription, - [MOVE_BLAZE_KICK - 1] = sBlazeKickDescription, - [MOVE_MUD_SPORT - 1] = sMudSportDescription, - [MOVE_ICE_BALL - 1] = sIceBallDescription, - [MOVE_NEEDLE_ARM - 1] = sNeedleArmDescription, - [MOVE_SLACK_OFF - 1] = sSlackOffDescription, - [MOVE_HYPER_VOICE - 1] = sHyperVoiceDescription, - [MOVE_POISON_FANG - 1] = sPoisonFangDescription, - [MOVE_CRUSH_CLAW - 1] = sCrushClawDescription, - [MOVE_BLAST_BURN - 1] = sBlastBurnDescription, - [MOVE_HYDRO_CANNON - 1] = sHydroCannonDescription, - [MOVE_METEOR_MASH - 1] = sMeteorMashDescription, - [MOVE_ASTONISH - 1] = sAstonishDescription, - [MOVE_WEATHER_BALL - 1] = sWeatherBallDescription, - [MOVE_AROMATHERAPY - 1] = sAromatherapyDescription, - [MOVE_FAKE_TEARS - 1] = sFakeTearsDescription, - [MOVE_AIR_CUTTER - 1] = sAirCutterDescription, - [MOVE_OVERHEAT - 1] = sOverheatDescription, - [MOVE_ODOR_SLEUTH - 1] = sOdorSleuthDescription, - [MOVE_ROCK_TOMB - 1] = sRockTombDescription, - [MOVE_SILVER_WIND - 1] = sSilverWindDescription, - [MOVE_METAL_SOUND - 1] = sMetalSoundDescription, - [MOVE_GRASS_WHISTLE - 1] = sGrassWhistleDescription, - [MOVE_TICKLE - 1] = sTickleDescription, - [MOVE_COSMIC_POWER - 1] = sCosmicPowerDescription, - [MOVE_WATER_SPOUT - 1] = sWaterSpoutDescription, - [MOVE_SIGNAL_BEAM - 1] = sSignalBeamDescription, - [MOVE_SHADOW_PUNCH - 1] = sShadowPunchDescription, - [MOVE_EXTRASENSORY - 1] = sExtrasensoryDescription, - [MOVE_SKY_UPPERCUT - 1] = sSkyUppercutDescription, - [MOVE_SAND_TOMB - 1] = sSandTombDescription, - [MOVE_SHEER_COLD - 1] = sSheerColdDescription, - [MOVE_MUDDY_WATER - 1] = sMuddyWaterDescription, - [MOVE_BULLET_SEED - 1] = sBulletSeedDescription, - [MOVE_AERIAL_ACE - 1] = sAerialAceDescription, - [MOVE_ICICLE_SPEAR - 1] = sIcicleSpearDescription, - [MOVE_IRON_DEFENSE - 1] = sIronDefenseDescription, - [MOVE_BLOCK - 1] = sBlockDescription, - [MOVE_HOWL - 1] = sHowlDescription, - [MOVE_DRAGON_CLAW - 1] = sDragonClawDescription, - [MOVE_FRENZY_PLANT - 1] = sFrenzyPlantDescription, - [MOVE_BULK_UP - 1] = sBulkUpDescription, - [MOVE_BOUNCE - 1] = sBounceDescription, - [MOVE_MUD_SHOT - 1] = sMudShotDescription, - [MOVE_POISON_TAIL - 1] = sPoisonTailDescription, - [MOVE_COVET - 1] = sCovetDescription, - [MOVE_VOLT_TACKLE - 1] = sVoltTackleDescription, - [MOVE_MAGICAL_LEAF - 1] = sMagicalLeafDescription, - [MOVE_WATER_SPORT - 1] = sWaterSportDescription, - [MOVE_CALM_MIND - 1] = sCalmMindDescription, - [MOVE_LEAF_BLADE - 1] = sLeafBladeDescription, - [MOVE_DRAGON_DANCE - 1] = sDragonDanceDescription, - [MOVE_ROCK_BLAST - 1] = sRockBlastDescription, - [MOVE_SHOCK_WAVE - 1] = sShockWaveDescription, - [MOVE_WATER_PULSE - 1] = sWaterPulseDescription, - [MOVE_DOOM_DESIRE - 1] = sDoomDesireDescription, - [MOVE_PSYCHO_BOOST - 1] = sPsychoBoostDescription, - [MOVE_ROOST - 1] = sRoostDescription, - [MOVE_GRAVITY - 1] = sGravityDescription, - [MOVE_MIRACLE_EYE - 1] = sMiracleEyeDescription, - [MOVE_WAKE_UP_SLAP - 1] = sWakeUpSlapDescription, - [MOVE_HAMMER_ARM - 1] = sHammerArmDescription, - [MOVE_GYRO_BALL - 1] = sGyroBallDescription, - [MOVE_HEALING_WISH - 1] = sHealingWishDescription, - [MOVE_BRINE - 1] = sBrineDescription, - [MOVE_NATURAL_GIFT - 1] = sNaturalGiftDescription, - [MOVE_FEINT - 1] = sFeintDescription, - [MOVE_PLUCK - 1] = sPluckDescription, - [MOVE_TAILWIND - 1] = sTailwindDescription, - [MOVE_ACUPRESSURE - 1] = sAcupressureDescription, - [MOVE_METAL_BURST - 1] = sMetalBurstDescription, - [MOVE_U_TURN - 1] = sUTurnDescription, - [MOVE_CLOSE_COMBAT - 1] = sCloseCombatDescription, - [MOVE_PAYBACK - 1] = sPaybackDescription, - [MOVE_ASSURANCE - 1] = sAssuranceDescription, - [MOVE_EMBARGO - 1] = sEmbargoDescription, - [MOVE_FLING - 1] = sFlingDescription, - [MOVE_PSYCHO_SHIFT - 1] = sPsychoShiftDescription, - [MOVE_TRUMP_CARD - 1] = sTrumpCardDescription, - [MOVE_HEAL_BLOCK - 1] = sHealBlockDescription, - [MOVE_WRING_OUT - 1] = sWringOutDescription, - [MOVE_POWER_TRICK - 1] = sPowerTrickDescription, - [MOVE_GASTRO_ACID - 1] = sGastroAcidDescription, - [MOVE_LUCKY_CHANT - 1] = sLuckyChantDescription, - [MOVE_ME_FIRST - 1] = sMeFirstDescription, - [MOVE_COPYCAT - 1] = sCopycatDescription, - [MOVE_POWER_SWAP - 1] = sPowerSwapDescription, - [MOVE_GUARD_SWAP - 1] = sGuardSwapDescription, - [MOVE_PUNISHMENT - 1] = sPunishmentDescription, - [MOVE_LAST_RESORT - 1] = sLastResortDescription, - [MOVE_WORRY_SEED - 1] = sWorrySeedDescription, - [MOVE_SUCKER_PUNCH - 1] = sSuckerPunchDescription, - [MOVE_TOXIC_SPIKES - 1] = sToxicSpikesDescription, - [MOVE_HEART_SWAP - 1] = sHeartSwapDescription, - [MOVE_AQUA_RING - 1] = sAquaRingDescription, - [MOVE_MAGNET_RISE - 1] = sMagnetRiseDescription, - [MOVE_FLARE_BLITZ - 1] = sFlareBlitzDescription, - [MOVE_FORCE_PALM - 1] = sForcePalmDescription, - [MOVE_AURA_SPHERE - 1] = sAuraSphereDescription, - [MOVE_ROCK_POLISH - 1] = sRockPolishDescription, - [MOVE_POISON_JAB - 1] = sPoisonJabDescription, - [MOVE_DARK_PULSE - 1] = sDarkPulseDescription, - [MOVE_NIGHT_SLASH - 1] = sNightSlashDescription, - [MOVE_AQUA_TAIL - 1] = sAquaTailDescription, - [MOVE_SEED_BOMB - 1] = sSeedBombDescription, - [MOVE_AIR_SLASH - 1] = sAirSlashDescription, - [MOVE_X_SCISSOR - 1] = sXScissorDescription, - [MOVE_BUG_BUZZ - 1] = sBugBuzzDescription, - [MOVE_DRAGON_PULSE - 1] = sDragonPulseDescription, - [MOVE_DRAGON_RUSH - 1] = sDragonRushDescription, - [MOVE_POWER_GEM - 1] = sPowerGemDescription, - [MOVE_DRAIN_PUNCH - 1] = sMegaDrainDescription, - [MOVE_VACUUM_WAVE - 1] = sVacuumWaveDescription, - [MOVE_FOCUS_BLAST - 1] = sFocusBlastDescription, - [MOVE_ENERGY_BALL - 1] = sEnergyBallDescription, - [MOVE_BRAVE_BIRD - 1] = sBraveBirdDescription, - [MOVE_EARTH_POWER - 1] = sEarthPowerDescription, - [MOVE_SWITCHEROO - 1] = sSwitcherooDescription, - [MOVE_GIGA_IMPACT - 1] = sHyperBeamDescription, - [MOVE_NASTY_PLOT - 1] = sNastyPlotDescription, - [MOVE_BULLET_PUNCH - 1] = sBulletPunchDescription, - [MOVE_AVALANCHE - 1] = sRevengeDescription, - [MOVE_ICE_SHARD - 1] = sIceShardDescription, - [MOVE_SHADOW_CLAW - 1] = sShadowClawDescription, - [MOVE_THUNDER_FANG - 1] = sThunderFangDescription, - [MOVE_ICE_FANG - 1] = sIceFangDescription, - [MOVE_FIRE_FANG - 1] = sFireFangDescription, - [MOVE_SHADOW_SNEAK - 1] = sShadowSneakDescription, - [MOVE_MUD_BOMB - 1] = sMudBombDescription, - [MOVE_PSYCHO_CUT - 1] = sPsychoCutDescription, - [MOVE_ZEN_HEADBUTT - 1] = sZenHeadbuttDescription, - [MOVE_MIRROR_SHOT - 1] = sMirrorShotDescription, - [MOVE_FLASH_CANNON - 1] = sFlashCannonDescription, - [MOVE_ROCK_CLIMB - 1] = sRockClimbDescription, - [MOVE_DEFOG - 1] = sDefogDescription, - [MOVE_TRICK_ROOM - 1] = sTrickRoomDescription, - [MOVE_DRACO_METEOR - 1] = sDracoMeteorDescription, - [MOVE_DISCHARGE - 1] = sDischargeDescription, - [MOVE_LAVA_PLUME - 1] = sLavaPlumeDescription, - [MOVE_LEAF_STORM - 1] = sLeafStormDescription, - [MOVE_POWER_WHIP - 1] = sPowerWhipDescription, - [MOVE_ROCK_WRECKER - 1] = sHyperBeamDescription, - [MOVE_CROSS_POISON - 1] = sCrossPoisonDescription, - [MOVE_GUNK_SHOT - 1] = sGunkShotDescription, - [MOVE_IRON_HEAD - 1] = sIronHeadDescription, - [MOVE_MAGNET_BOMB - 1] = sMagnetBombDescription, - [MOVE_STONE_EDGE - 1] = sStoneEdgeDescription, - [MOVE_CAPTIVATE - 1] = sCaptivateDescription, - [MOVE_STEALTH_ROCK - 1] = sStealthRockDescription, - [MOVE_GRASS_KNOT - 1] = sGrassKnotDescription, - [MOVE_CHATTER - 1] = sChatterDescription, - [MOVE_JUDGMENT - 1] = sJudgmentDescription, - [MOVE_BUG_BITE - 1] = sPluckDescription, - [MOVE_CHARGE_BEAM - 1] = sChargeBeamDescription, - [MOVE_WOOD_HAMMER - 1] = sWoodHammerDescription, - [MOVE_AQUA_JET - 1] = sAquaJetDescription, - [MOVE_ATTACK_ORDER - 1] = sAttackOrderDescription, - [MOVE_DEFEND_ORDER - 1] = sDefendOrderDescription, - [MOVE_HEAL_ORDER - 1] = sHealOrderDescription, - [MOVE_HEAD_SMASH - 1] = sHeadSmashDescription, - [MOVE_DOUBLE_HIT - 1] = sDoubleHitDescription, - [MOVE_ROAR_OF_TIME - 1] = sRoarOfTimeDescription, - [MOVE_SPACIAL_REND - 1] = sSpacialRendDescription, - [MOVE_LUNAR_DANCE - 1] = sHealingWishDescription, - [MOVE_CRUSH_GRIP - 1] = sWringOutDescription, - [MOVE_MAGMA_STORM - 1] = sMagmaStormDescription, - [MOVE_DARK_VOID - 1] = sDarkVoidDescription, - [MOVE_SEED_FLARE - 1] = sSeedFlareDescription, - [MOVE_OMINOUS_WIND - 1] = sOminousWindDescription, - [MOVE_SHADOW_FORCE - 1] = sShadowForceDescription, - [MOVE_HONE_CLAWS - 1] = sHoneClawsDescription, - [MOVE_WIDE_GUARD - 1] = sWideGuardDescription, - [MOVE_GUARD_SPLIT - 1] = sGuardSplitDescription, - [MOVE_POWER_SPLIT - 1] = sPowerSplitDescription, - [MOVE_WONDER_ROOM - 1] = sWonderRoomDescription, - [MOVE_PSYSHOCK - 1] = sPsyshockDescription, - [MOVE_VENOSHOCK - 1] = sVenoshockDescription, - [MOVE_AUTOTOMIZE - 1] = sAutotomizeDescription, - [MOVE_RAGE_POWDER - 1] = sRagePowderDescription, - [MOVE_TELEKINESIS - 1] = sTelekinesisDescription, - [MOVE_MAGIC_ROOM - 1] = sMagicRoomDescription, - [MOVE_SMACK_DOWN - 1] = sSmackDownDescription, - [MOVE_STORM_THROW - 1] = sStormThrowDescription, - [MOVE_FLAME_BURST - 1] = sFlameBurstDescription, - [MOVE_SLUDGE_WAVE - 1] = sSludgeWaveDescription, - [MOVE_QUIVER_DANCE - 1] = sQuiverDanceDescription, - [MOVE_HEAVY_SLAM - 1] = sHeavySlamDescription, - [MOVE_SYNCHRONOISE - 1] = sSynchronoiseDescription, - [MOVE_ELECTRO_BALL - 1] = sElectroBallDescription, - [MOVE_SOAK - 1] = sSoakDescription, - [MOVE_FLAME_CHARGE - 1] = sFlameChargeDescription, - [MOVE_COIL - 1] = sCoilDescription, - [MOVE_LOW_SWEEP - 1] = sLowSweepDescription, - [MOVE_ACID_SPRAY - 1] = sAcidSprayDescription, - [MOVE_FOUL_PLAY - 1] = sFoulPlayDescription, - [MOVE_SIMPLE_BEAM - 1] = sSimpleBeamDescription, - [MOVE_ENTRAINMENT - 1] = sEntrainmentDescription, - [MOVE_AFTER_YOU - 1] = sAfterYouDescription, - [MOVE_ROUND - 1] = sRoundDescription, - [MOVE_ECHOED_VOICE - 1] = sEchoedVoiceDescription, - [MOVE_CHIP_AWAY - 1] = sChipAwayDescription, - [MOVE_CLEAR_SMOG - 1] = sClearSmogDescription, - [MOVE_STORED_POWER - 1] = sStoredPowerDescription, - [MOVE_QUICK_GUARD - 1] = sQuickGuardDescription, - [MOVE_ALLY_SWITCH - 1] = sAllySwitchDescription, - [MOVE_SCALD - 1] = sScaldDescription, - [MOVE_SHELL_SMASH - 1] = sShellSmashDescription, - [MOVE_HEAL_PULSE - 1] = sHealPulseDescription, - [MOVE_HEX - 1] = sHexDescription, - [MOVE_SKY_DROP - 1] = sSkyDropDescription, - [MOVE_SHIFT_GEAR - 1] = sShiftGearDescription, - [MOVE_CIRCLE_THROW - 1] = sCircleThrowDescription, - [MOVE_INCINERATE - 1] = sIncinerateDescription, - [MOVE_QUASH - 1] = sQuashDescription, - [MOVE_ACROBATICS - 1] = sAcrobaticsDescription, - [MOVE_REFLECT_TYPE - 1] = sReflectTypeDescription, - [MOVE_RETALIATE - 1] = sRetaliateDescription, - [MOVE_FINAL_GAMBIT - 1] = sFinalGambitDescription, - [MOVE_BESTOW - 1] = sBestowDescription, - [MOVE_INFERNO - 1] = sInfernoDescription, - [MOVE_WATER_PLEDGE - 1] = sWaterPledgeDescription, - [MOVE_FIRE_PLEDGE - 1] = sFirePledgeDescription, - [MOVE_GRASS_PLEDGE - 1] = sGrassPledgeDescription, - [MOVE_VOLT_SWITCH - 1] = sUTurnDescription, - [MOVE_STRUGGLE_BUG - 1] = sStruggleBugDescription, - [MOVE_BULLDOZE - 1] = sBulldozeDescription, - [MOVE_FROST_BREATH - 1] = sStormThrowDescription, - [MOVE_DRAGON_TAIL - 1] = sCircleThrowDescription, - [MOVE_WORK_UP - 1] = sWorkUpDescription, - [MOVE_ELECTROWEB - 1] = sElectrowebDescription, - [MOVE_WILD_CHARGE - 1] = sWildChargeDescription, - [MOVE_DRILL_RUN - 1] = sDrillRunDescription, - [MOVE_DUAL_CHOP - 1] = sDualChopDescription, - [MOVE_HEART_STAMP - 1] = sHeartStampDescription, - [MOVE_HORN_LEECH - 1] = sMegaDrainDescription, - [MOVE_SACRED_SWORD - 1] = sChipAwayDescription, - [MOVE_RAZOR_SHELL - 1] = sRazorShellDescription, - [MOVE_HEAT_CRASH - 1] = sHeavySlamDescription, - [MOVE_LEAF_TORNADO - 1] = sLeafTornadoDescription, - [MOVE_STEAMROLLER - 1] = sSteamrollerDescription, - [MOVE_COTTON_GUARD - 1] = sCottonGuardDescription, - [MOVE_NIGHT_DAZE - 1] = sNightDazeDescription, - [MOVE_PSYSTRIKE - 1] = sPsyshockDescription, - [MOVE_TAIL_SLAP - 1] = sTailSlapDescription, - [MOVE_HURRICANE - 1] = sHurricaneDescription, - [MOVE_HEAD_CHARGE - 1] = sHeadChargeDescription, - [MOVE_GEAR_GRIND - 1] = sGearGrindDescription, - [MOVE_SEARING_SHOT - 1] = sLavaPlumeDescription, - [MOVE_TECHNO_BLAST - 1] = sTechnoBlastDescription, - [MOVE_RELIC_SONG - 1] = sRelicSongDescription, - [MOVE_SECRET_SWORD - 1] = sSecretSwordDescription, - [MOVE_GLACIATE - 1] = sGlaciateDescription, - [MOVE_BOLT_STRIKE - 1] = sBoltStrikeDescription, - [MOVE_BLUE_FLARE - 1] = sBlueFlareDescription, - [MOVE_FIERY_DANCE - 1] = sFieryDanceDescription, - [MOVE_FREEZE_SHOCK - 1] = sFreezeShockDescription, - [MOVE_ICE_BURN - 1] = sIceBurnDescription, - [MOVE_SNARL - 1] = sSnarlDescription, - [MOVE_ICICLE_CRASH - 1] = sIcicleCrashDescription, - [MOVE_V_CREATE - 1] = sVCreateDescription, - [MOVE_FUSION_FLARE - 1] = sFusionFlareDescription, - [MOVE_FUSION_BOLT - 1] = sFusionBoltDescription, - [MOVE_FLYING_PRESS - 1] = sFlyingPressDescription, - [MOVE_MAT_BLOCK - 1] = sMatBlockDescription, - [MOVE_BELCH - 1] = sBelchDescription, - [MOVE_ROTOTILLER - 1] = sRototillerDescription, - [MOVE_STICKY_WEB - 1] = sStickyWebDescription, - [MOVE_FELL_STINGER - 1] = sFellStingerDescription, - [MOVE_PHANTOM_FORCE - 1] = sShadowForceDescription, - [MOVE_TRICK_OR_TREAT - 1] = sTrickOrTreatDescription, - [MOVE_NOBLE_ROAR - 1] = sNobleRoarDescription, - [MOVE_ION_DELUGE - 1] = sIonDelugeDescription, - [MOVE_PARABOLIC_CHARGE - 1] = sParabolicChargeDescription, - [MOVE_FORESTS_CURSE - 1] = sForestsCurseDescription, - [MOVE_PETAL_BLIZZARD - 1] = sPetalBlizzardDescription, - [MOVE_FREEZE_DRY - 1] = sFreezeDryDescription, - [MOVE_DISARMING_VOICE - 1] = sDisarmingVoiceDescription, - [MOVE_PARTING_SHOT - 1] = sPartingShotDescription, - [MOVE_TOPSY_TURVY - 1] = sTopsyTurvyDescription, - [MOVE_DRAINING_KISS - 1] = sDrainingKissDescription, - [MOVE_CRAFTY_SHIELD - 1] = sCraftyShieldDescription, - [MOVE_FLOWER_SHIELD - 1] = sFlowerShieldDescription, - [MOVE_GRASSY_TERRAIN - 1] = sGrassyTerrainDescription, - [MOVE_MISTY_TERRAIN - 1] = sMistyTerrainDescription, - [MOVE_ELECTRIFY - 1] = sElectrifyDescription, - [MOVE_PLAY_ROUGH - 1] = sPlayRoughDescription, - [MOVE_FAIRY_WIND - 1] = sFairyWindDescription, - [MOVE_MOONBLAST - 1] = sMoonblastDescription, - [MOVE_BOOMBURST - 1] = sBoomburstDescription, - [MOVE_FAIRY_LOCK - 1] = sFairyLockDescription, - [MOVE_KINGS_SHIELD - 1] = sKingsShieldDescription, - [MOVE_PLAY_NICE - 1] = sPlayNiceDescription, - [MOVE_CONFIDE - 1] = sConfideDescription, - [MOVE_DIAMOND_STORM - 1] = sDiamondStormDescription, - [MOVE_STEAM_ERUPTION - 1] = sSteamEruptionDescription, - [MOVE_HYPERSPACE_HOLE - 1] = sHyperspaceHoleDescription, - [MOVE_WATER_SHURIKEN - 1] = sWaterShurikenDescription, - [MOVE_MYSTICAL_FIRE - 1] = sMysticalFireDescription, - [MOVE_SPIKY_SHIELD - 1] = sSpikyShieldDescription, - [MOVE_AROMATIC_MIST - 1] = sAromaticMistDescription, - [MOVE_EERIE_IMPULSE - 1] = sEerieImpulseDescription, - [MOVE_VENOM_DRENCH - 1] = sVenomDrenchDescription, - [MOVE_POWDER - 1] = sPowderDescription, - [MOVE_GEOMANCY - 1] = sGeomancyDescription, - [MOVE_MAGNETIC_FLUX - 1] = sMagneticFluxDescription, - [MOVE_HAPPY_HOUR - 1] = sHappyHourDescription, - [MOVE_ELECTRIC_TERRAIN - 1] = sElectricTerrainDescription, - [MOVE_DAZZLING_GLEAM - 1] = sDazzlingGleamDescription, - [MOVE_CELEBRATE - 1] = sCelebrateDescription, - [MOVE_HOLD_HANDS - 1] = sHoldHandsDescription, - [MOVE_BABY_DOLL_EYES - 1] = sBabyDollEyesDescription, - [MOVE_NUZZLE - 1] = sNuzzleDescription, - [MOVE_HOLD_BACK - 1] = sFalseSwipeDescription, - [MOVE_INFESTATION - 1] = sInfestationDescription, - [MOVE_POWER_UP_PUNCH - 1] = sPowerUpPunchDescription, - [MOVE_OBLIVION_WING - 1] = sDrainingKissDescription, - [MOVE_THOUSAND_ARROWS - 1] = sThousandArrowsDescription, - [MOVE_THOUSAND_WAVES - 1] = sThousandWavesDescription, - [MOVE_LANDS_WRATH - 1] = sLandsWrathDescription, - [MOVE_LIGHT_OF_RUIN - 1] = sLightOfRuinDescription, - [MOVE_ORIGIN_PULSE - 1] = sOriginPulseDescription, - [MOVE_PRECIPICE_BLADES - 1] = sPrecipiceBladesDescription, - [MOVE_DRAGON_ASCENT - 1] = sCloseCombatDescription, - [MOVE_HYPERSPACE_FURY - 1] = sHyperspaceHoleDescription, - [MOVE_SHORE_UP - 1] = sShoreUpDescription, - [MOVE_FIRST_IMPRESSION - 1] = sFirstImpressionDescription, - [MOVE_BANEFUL_BUNKER - 1] = sBanefulBunkerDescription, - [MOVE_SPIRIT_SHACKLE - 1] = sSpiritShackleDescription, - [MOVE_DARKEST_LARIAT - 1] = sDarkestLariatDescription, - [MOVE_SPARKLING_ARIA - 1] = sSparklingAriaDescription, - [MOVE_ICE_HAMMER - 1] = sIceHammerDescription, - [MOVE_FLORAL_HEALING - 1] = sFloralHealingDescription, - [MOVE_HIGH_HORSEPOWER - 1] = sHighHorsepowerDescription, - [MOVE_STRENGTH_SAP - 1] = sStrengthSapDescription, - [MOVE_SOLAR_BLADE - 1] = sSolarBladeDescription, - [MOVE_LEAFAGE - 1] = sLeafageDescription, - [MOVE_SPOTLIGHT - 1] = sSpotlightDescription, - [MOVE_TOXIC_THREAD - 1] = sToxicThreadDescription, - [MOVE_LASER_FOCUS - 1] = sLaserFocusDescription, - [MOVE_GEAR_UP - 1] = sGearUpDescription, - [MOVE_THROAT_CHOP - 1] = sThroatChopDescription, - [MOVE_POLLEN_PUFF - 1] = sPollenPuffDescription, - [MOVE_ANCHOR_SHOT - 1] = sAnchorShotDescription, - [MOVE_PSYCHIC_TERRAIN - 1] = sPsychicTerrainDescription, - [MOVE_LUNGE - 1] = sLungeDescription, - [MOVE_FIRE_LASH - 1] = sFireLashDescription, - [MOVE_POWER_TRIP - 1] = sPowerTripDescription, - [MOVE_BURN_UP - 1] = sBurnUpDescription, - [MOVE_SPEED_SWAP - 1] = sSpeedSwapDescription, - [MOVE_SMART_STRIKE - 1] = sSmartStrikeDescription, - [MOVE_PURIFY - 1] = sPurifyDescription, - [MOVE_REVELATION_DANCE - 1] = sRevelationDanceDescription, - [MOVE_CORE_ENFORCER - 1] = sCoreEnforcerDescription, - [MOVE_TROP_KICK - 1] = sTropKickDescription, - [MOVE_INSTRUCT - 1] = sInstructDescription, - [MOVE_BEAK_BLAST - 1] = sBeakBlastDescription, - [MOVE_CLANGING_SCALES - 1] = sClangingScalesDescription, - [MOVE_DRAGON_HAMMER - 1] = sDragonHammerDescription, - [MOVE_BRUTAL_SWING - 1] = sBrutalSwingDescription, - [MOVE_AURORA_VEIL - 1] = sAuroraVeilDescription, - [MOVE_SHELL_TRAP - 1] = sShellTrapDescription, - [MOVE_FLEUR_CANNON - 1] = sFleurCannonDescription, - [MOVE_PSYCHIC_FANGS - 1] = sPsychicFangsDescription, - [MOVE_STOMPING_TANTRUM - 1] = sStompingTantrumDescription, - [MOVE_SHADOW_BONE - 1] = sShadowBoneDescription, - [MOVE_ACCELEROCK - 1] = sAccelerockDescription, - [MOVE_LIQUIDATION - 1] = sLiquidationDescription, - [MOVE_PRISMATIC_LASER - 1] = sPrismaticLaserDescription, - [MOVE_SPECTRAL_THIEF - 1] = sSpectralThiefDescription, - [MOVE_SUNSTEEL_STRIKE - 1] = sSunsteelStrikeDescription, - [MOVE_MOONGEIST_BEAM - 1] = sMoongeistBeamDescription, - [MOVE_TEARFUL_LOOK - 1] = sTearfulLookDescription, - [MOVE_ZING_ZAP - 1] = sZingZapDescription, - [MOVE_NATURES_MADNESS - 1] = sNaturesMadnessDescription, - [MOVE_MULTI_ATTACK - 1] = sMultiAttackDescription, - [MOVE_MIND_BLOWN - 1] = sMindBlownDescription, - [MOVE_PLASMA_FISTS - 1] = sPlasmaFistsDescription, - [MOVE_PHOTON_GEYSER - 1] = sPhotonGeyserDescription, - [MOVE_ZIPPY_ZAP - 1] = sZippyZapDescription, - [MOVE_SPLISHY_SPLASH - 1] = sSplishySplashDescription, - [MOVE_FLOATY_FALL - 1] = sFloatyFallDescription, - [MOVE_PIKA_PAPOW - 1] = sPikaPapowDescription, - [MOVE_BOUNCY_BUBBLE - 1] = sBouncyBubbleDescription, - [MOVE_BUZZY_BUZZ - 1] = sBuzzyBuzzDescription, - [MOVE_SIZZLY_SLIDE - 1] = sSizzlySlideDescription, - [MOVE_GLITZY_GLOW - 1] = sGlitzyGlowDescription, - [MOVE_BADDY_BAD - 1] = sBaddyBadDescription, - [MOVE_SAPPY_SEED - 1] = sSappySeedDescription, - [MOVE_FREEZY_FROST - 1] = sFreezyFrostDescription, - [MOVE_SPARKLY_SWIRL - 1] = sSparklySwirlDescription, - [MOVE_VEEVEE_VOLLEY - 1] = sVeeveeVolleyDescription, - [MOVE_DOUBLE_IRON_BASH - 1] = sDoubleIronBashDescription, - - //GEN 8 - [MOVE_DYNAMAX_CANNON - 1] = sDynamaxCannonDescription, - [MOVE_SNIPE_SHOT - 1] = sSnipeShotDescription, - [MOVE_JAW_LOCK - 1] = sJawLockDescription, - [MOVE_STUFF_CHEEKS - 1] = sStuffCheeksDescription, - [MOVE_NO_RETREAT - 1] = sNoRetreatDescription, - [MOVE_TAR_SHOT - 1] = sTarShotDescription, - [MOVE_MAGIC_POWDER - 1] = sMagicPowderDescription, - [MOVE_DRAGON_DARTS - 1] = sDragonDartsDescription, - [MOVE_TEATIME - 1] = sTeatimeDescription, - [MOVE_OCTOLOCK - 1] = sOctolockDescription, - [MOVE_BOLT_BEAK - 1] = sBoltBeakDescription, - [MOVE_FISHIOUS_REND - 1] = sFishiousRendDescription, - [MOVE_COURT_CHANGE - 1] = sCourtChangeDescription, - [MOVE_CLANGOROUS_SOUL - 1] = sClangorousSoulDescription, - [MOVE_BODY_PRESS - 1] = sBodyPressDescription, - [MOVE_DECORATE - 1] = sDecorateDescription, - [MOVE_DRUM_BEATING - 1] = sDrumBeatingDescription, - [MOVE_SNAP_TRAP - 1] = sSnapTrapDescription, - [MOVE_PYRO_BALL - 1] = sPyroBallDescription, - [MOVE_BEHEMOTH_BLADE - 1] = sBehemothBladeDescription, - [MOVE_BEHEMOTH_BASH - 1] = sBehemothBashDescription, - [MOVE_AURA_WHEEL - 1] = sAuraWheelDescription, - [MOVE_BREAKING_SWIPE - 1] = sBreakingSwipeDescription, - [MOVE_BRANCH_POKE - 1] = sBranchPokeDescription, - [MOVE_OVERDRIVE - 1] = sOverdriveDescription, - [MOVE_APPLE_ACID - 1] = sAppleAcidDescription, - [MOVE_GRAV_APPLE - 1] = sGravAppleDescription, - [MOVE_SPIRIT_BREAK - 1] = sSpiritBreakDescription, - [MOVE_STRANGE_STEAM - 1] = sStrangeSteamDescription, - [MOVE_LIFE_DEW - 1] = sLifeDewDescription, - [MOVE_OBSTRUCT - 1] = sObstructDescription, - [MOVE_FALSE_SURRENDER - 1] = sFalseSurrenderDescription, - [MOVE_METEOR_ASSAULT - 1] = sMeteorAssaultDescription, - [MOVE_ETERNABEAM - 1] = sEternabeamDescription, - [MOVE_STEEL_BEAM - 1] = sSteelBeamDescription, - [MOVE_EXPANDING_FORCE - 1] = sExpandingForceDescription, - [MOVE_STEEL_ROLLER - 1] = sSteelRollerDescription, - [MOVE_SCALE_SHOT - 1] = sScaleShotDescription, - [MOVE_METEOR_BEAM - 1] = sMeteorBeamDescription, - [MOVE_SHELL_SIDE_ARM - 1] = sShellSideArmDescription, - [MOVE_MISTY_EXPLOSION - 1] = sMistyExplosionDescription, - [MOVE_GRASSY_GLIDE - 1] = sGrassyGlideDescription, - [MOVE_RISING_VOLTAGE - 1] = sRisingVoltageDescription, - [MOVE_TERRAIN_PULSE - 1] = sTerrainPulseDescription, - [MOVE_SKITTER_SMACK - 1] = sSkitterSmackDescription, - [MOVE_BURNING_JEALOUSY - 1] = sBurningJealousyDescription, - [MOVE_LASH_OUT - 1] = sLashOutDescription, - [MOVE_POLTERGEIST - 1] = sPoltergeistDescription, - [MOVE_CORROSIVE_GAS - 1] = sCorrosiveGasDescription, - [MOVE_COACHING - 1] = sCoachingDescription, - [MOVE_FLIP_TURN - 1] = sFlipTurnDescription, - [MOVE_TRIPLE_AXEL - 1] = sTripleAxelDescription, - [MOVE_DUAL_WINGBEAT - 1] = sDualWingbeatDescription, - [MOVE_SCORCHING_SANDS - 1] = sScorchingSandsDescription, - [MOVE_JUNGLE_HEALING - 1] = sJungleHealingDescription, - [MOVE_WICKED_BLOW - 1] = sWickedBlowDescription, - [MOVE_SURGING_STRIKES - 1] = sSurgingStrikesDescription, - [MOVE_THUNDER_CAGE - 1] = sThunderCageDescription, - [MOVE_DRAGON_ENERGY - 1] = sDragonEnergyDescription, - [MOVE_FREEZING_GLARE - 1] = sFreezingGlareDescription, - [MOVE_FIERY_WRATH - 1] = sFieryWrathDescription, - [MOVE_THUNDEROUS_KICK - 1] = sThunderousKickDescription, - [MOVE_GLACIAL_LANCE - 1] = sGlacialLanceDescription, - [MOVE_ASTRAL_BARRAGE - 1] = sAstralBarrageDescription, - [MOVE_EERIE_SPELL - 1] = sEerieSpellDescription, - [MOVE_DIRE_CLAW - 1] = sDireClawDescription, - [MOVE_PSYSHIELD_BASH - 1] = sPsyshieldBashDescription, - [MOVE_POWER_SHIFT - 1] = sPowerShiftDescription, - [MOVE_STONE_AXE - 1] = sStoneAxeDescription, - [MOVE_SPRINGTIDE_STORM - 1] = sSpringtideStormDescription, - [MOVE_MYSTICAL_POWER - 1] = sMysticalPowerDescription, - [MOVE_RAGING_FURY - 1] = sRagingFuryDescription, - [MOVE_WAVE_CRASH - 1] = sWaveCrashDescription, - [MOVE_CHLOROBLAST - 1] = sChloroblastDescription, - [MOVE_MOUNTAIN_GALE - 1] = sMountainGaleDescription, - [MOVE_VICTORY_DANCE - 1] = sVictoryDanceDescription, - [MOVE_HEADLONG_RUSH - 1] = sHeadlongRushDescription, - [MOVE_BARB_BARRAGE - 1] = sBarbBarrageDescription, - [MOVE_ESPER_WING - 1] = sEsperWingDescription, - [MOVE_BITTER_MALICE - 1] = sBitterMaliceDescription, - [MOVE_SHELTER - 1] = sShelterDescription, - [MOVE_TRIPLE_ARROWS - 1] = sTripleArrowsDescription, - [MOVE_INFERNAL_PARADE - 1] = sInfernalParadeDescription, - [MOVE_CEASELESS_EDGE - 1] = sCeaselessEdgeDescription, - [MOVE_BLEAKWIND_STORM - 1] = sBleakwindStormDescription, - [MOVE_WILDBOLT_STORM - 1] = sWildboltStormDescription, - [MOVE_SANDSEAR_STORM - 1] = sSandsearStormDescription, - [MOVE_LUNAR_BLESSING - 1] = sLunarBlessingDescription, - [MOVE_TAKE_HEART - 1] = sTakeHeartDescription, - [MOVE_TERA_BLAST - 1] = sTeraBlastDescription, - [MOVE_SILK_TRAP - 1] = sSilkTrapDescription, - [MOVE_AXE_KICK - 1] = sAxeKickDescription, - [MOVE_LAST_RESPECTS - 1] = sLastRespectsDescription, - [MOVE_LUMINA_CRASH - 1] = sLuminaCrashDescription, - [MOVE_ORDER_UP - 1] = sOrderUpDescription, - [MOVE_JET_PUNCH - 1] = sJetPunchDescription, - [MOVE_SPICY_EXTRACT - 1] = sSpicyExtractDescription, - [MOVE_SPIN_OUT - 1] = sSpinOutDescription, - [MOVE_POPULATION_BOMB - 1] = sPopulationBombDescription, - [MOVE_ICE_SPINNER - 1] = sIceSpinnerDescription, - [MOVE_GLAIVE_RUSH - 1] = sGlaiveRushDescription, - [MOVE_REVIVAL_BLESSING - 1] = sRevivalBlessingDescription, - [MOVE_SALT_CURE - 1] = sSaltCureDescription, - [MOVE_TRIPLE_DIVE - 1] = sTripleDiveDescription, - [MOVE_MORTAL_SPIN - 1] = sMortalSpinDescription, - [MOVE_DOODLE - 1] = sDoodleDescription, - [MOVE_FILLET_AWAY - 1] = sFilletAwayDescription, - [MOVE_KOWTOW_CLEAVE - 1] = sKowtowCleaveDescription, - [MOVE_FLOWER_TRICK - 1] = sFlowerTrickDescription, - [MOVE_TORCH_SONG - 1] = sTorchSongDescription, - [MOVE_AQUA_STEP - 1] = sAquaStepDescription, - [MOVE_RAGING_BULL - 1] = sRagingBullDescription, - [MOVE_MAKE_IT_RAIN - 1] = sMakeItRainDescription, - [MOVE_RUINATION - 1] = sRuinationDescription, - [MOVE_COLLISION_COURSE - 1] = sCollisionCourseDescription, - [MOVE_ELECTRO_DRIFT - 1] = sElectroDriftDescription, - [MOVE_SHED_TAIL - 1] = sShedTailDescription, - [MOVE_CHILLY_RECEPTION - 1] = sChillyReceptionDescription, - [MOVE_TIDY_UP - 1] = sTidyUpDescription, - [MOVE_SNOWSCAPE - 1] = sSnowscapeDescription, - [MOVE_POUNCE - 1] = sPounceDescription, - [MOVE_TRAILBLAZE - 1] = sTrailblazeDescription, - [MOVE_CHILLING_WATER - 1] = sChillingWaterDescription, - [MOVE_HYPER_DRILL - 1] = sHyperDrillDescription, - [MOVE_TWIN_BEAM - 1] = sTwinBeamDescription, - [MOVE_RAGE_FIST - 1] = sRageFistDescription, - [MOVE_ARMOR_CANNON - 1] = sArmorCannonDescription, - [MOVE_BITTER_BLADE - 1] = sBitterBladeDescription, - [MOVE_DOUBLE_SHOCK - 1] = sDoubleShockDescription, - [MOVE_GIGATON_HAMMER - 1] = sGigatonHammerDescription, - [MOVE_COMEUPPANCE - 1] = sComeuppanceDescription, - [MOVE_AQUA_CUTTER - 1] = sAquaCutterDescription, - [MOVE_BLAZING_TORQUE - 1] = sBlazingTorqueDescription, - [MOVE_WICKED_TORQUE - 1] = sWickedTorqueDescription, - [MOVE_NOXIOUS_TORQUE - 1] = sNoxiousTorqueDescription, - [MOVE_COMBAT_TORQUE - 1] = sCombatTorqueDescription, - [MOVE_MAGICAL_TORQUE - 1] = sMagicalTorqueDescription, - [MOVE_PSYBLADE - 1] = sPsybladeDescription, - [MOVE_HYDRO_STEAM - 1] = sHydroSteamDescription, - [MOVE_BLOOD_MOON - 1] = sBloodMoonDescription, - [MOVE_MATCHA_GOTCHA - 1] = sMatchaGotchaDescription, - [MOVE_SYRUP_BOMB - 1] = sSyrupBombDescription, - [MOVE_IVY_CUDGEL - 1] = sIvyCudgelDescription, - [MOVE_ELECTRO_SHOT - 1] = sElectroShotDescription, - [MOVE_TERA_STARSTORM - 1] = sTeraStarstormDescription, - [MOVE_FICKLE_BEAM - 1] = sFickleBeamDescription, - [MOVE_BURNING_BULWARK - 1] = sBurningBulwarkDescription, - [MOVE_THUNDERCLAP - 1] = sSuckerPunchDescription, - [MOVE_MIGHTY_CLEAVE - 1] = sFeintDescription, - [MOVE_TACHYON_CUTTER - 1] = sTachyonCutterDescription, - [MOVE_HARD_PRESS - 1] = sWringOutDescription, - [MOVE_DRAGON_CHEER - 1] = sDragonCheerDescription, - [MOVE_ALLURING_VOICE - 1] = sAlluringVoiceDescription, - [MOVE_TEMPER_FLARE - 1] = sTemperFlareDescription, - [MOVE_SUPERCELL_SLAM - 1] = sSupercellSlamDescription, - [MOVE_PSYCHIC_NOISE - 1] = sPsychicNoiseDescription, - [MOVE_UPPER_HAND - 1] = sUpperHandDescription, - [MOVE_MALIGNANT_CHAIN - 1] = sMalignantChainDescription, -}; diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h deleted file mode 100644 index f69b1f96a74f..000000000000 --- a/src/data/text/move_names.h +++ /dev/null @@ -1,2000 +0,0 @@ -#if B_EXPANDED_MOVE_NAMES == TRUE -// 16 letters -const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1] = -{ - [MOVE_NONE] = _("-"), - [MOVE_POUND] = _("Pound"), - [MOVE_KARATE_CHOP] = _("Karate Chop"), - [MOVE_DOUBLE_SLAP] = _("Double Slap"), - [MOVE_COMET_PUNCH] = _("Comet Punch"), - [MOVE_MEGA_PUNCH] = _("Mega Punch"), - [MOVE_PAY_DAY] = _("Pay Day"), - [MOVE_FIRE_PUNCH] = _("Fire Punch"), - [MOVE_ICE_PUNCH] = _("Ice Punch"), - [MOVE_THUNDER_PUNCH] = _("Thunder Punch"), - [MOVE_SCRATCH] = _("Scratch"), - [MOVE_VISE_GRIP] = _("Vise Grip"), - [MOVE_GUILLOTINE] = _("Guillotine"), - [MOVE_RAZOR_WIND] = _("Razor Wind"), - [MOVE_SWORDS_DANCE] = _("Swords Dance"), - [MOVE_CUT] = _("Cut"), - [MOVE_GUST] = _("Gust"), - [MOVE_WING_ATTACK] = _("Wing Attack"), - [MOVE_WHIRLWIND] = _("Whirlwind"), - [MOVE_FLY] = _("Fly"), - [MOVE_BIND] = _("Bind"), - [MOVE_SLAM] = _("Slam"), - [MOVE_VINE_WHIP] = _("Vine Whip"), - [MOVE_STOMP] = _("Stomp"), - [MOVE_DOUBLE_KICK] = _("Double Kick"), - [MOVE_MEGA_KICK] = _("Mega Kick"), - [MOVE_JUMP_KICK] = _("Jump Kick"), - [MOVE_ROLLING_KICK] = _("Rolling Kick"), - [MOVE_SAND_ATTACK] = _("Sand Attack"), - [MOVE_HEADBUTT] = _("Headbutt"), - [MOVE_HORN_ATTACK] = _("Horn Attack"), - [MOVE_FURY_ATTACK] = _("Fury Attack"), - [MOVE_HORN_DRILL] = _("Horn Drill"), - [MOVE_TACKLE] = _("Tackle"), - [MOVE_BODY_SLAM] = _("Body Slam"), - [MOVE_WRAP] = _("Wrap"), - [MOVE_TAKE_DOWN] = _("Take Down"), - [MOVE_THRASH] = _("Thrash"), - [MOVE_DOUBLE_EDGE] = _("Double-Edge"), - [MOVE_TAIL_WHIP] = _("Tail Whip"), - [MOVE_POISON_STING] = _("Poison Sting"), - [MOVE_TWINEEDLE] = _("Twineedle"), - [MOVE_PIN_MISSILE] = _("Pin Missile"), - [MOVE_LEER] = _("Leer"), - [MOVE_BITE] = _("Bite"), - [MOVE_GROWL] = _("Growl"), - [MOVE_ROAR] = _("Roar"), - [MOVE_SING] = _("Sing"), - [MOVE_SUPERSONIC] = _("Supersonic"), - [MOVE_SONIC_BOOM] = _("Sonic Boom"), - [MOVE_DISABLE] = _("Disable"), - [MOVE_ACID] = _("Acid"), - [MOVE_EMBER] = _("Ember"), - [MOVE_FLAMETHROWER] = _("Flamethrower"), - [MOVE_MIST] = _("Mist"), - [MOVE_WATER_GUN] = _("Water Gun"), - [MOVE_HYDRO_PUMP] = _("Hydro Pump"), - [MOVE_SURF] = _("Surf"), - [MOVE_ICE_BEAM] = _("Ice Beam"), - [MOVE_BLIZZARD] = _("Blizzard"), - [MOVE_PSYBEAM] = _("Psybeam"), - [MOVE_BUBBLE_BEAM] = _("Bubble Beam"), - [MOVE_AURORA_BEAM] = _("Aurora Beam"), - [MOVE_HYPER_BEAM] = _("Hyper Beam"), - [MOVE_PECK] = _("Peck"), - [MOVE_DRILL_PECK] = _("Drill Peck"), - [MOVE_SUBMISSION] = _("Submission"), - [MOVE_LOW_KICK] = _("Low Kick"), - [MOVE_COUNTER] = _("Counter"), - [MOVE_SEISMIC_TOSS] = _("Seismic Toss"), - [MOVE_STRENGTH] = _("Strength"), - [MOVE_ABSORB] = _("Absorb"), - [MOVE_MEGA_DRAIN] = _("Mega Drain"), - [MOVE_LEECH_SEED] = _("Leech Seed"), - [MOVE_GROWTH] = _("Growth"), - [MOVE_RAZOR_LEAF] = _("Razor Leaf"), - [MOVE_SOLAR_BEAM] = _("Solar Beam"), - [MOVE_POISON_POWDER] = _("Poison Powder"), - [MOVE_STUN_SPORE] = _("Stun Spore"), - [MOVE_SLEEP_POWDER] = _("Sleep Powder"), - [MOVE_PETAL_DANCE] = _("Petal Dance"), - [MOVE_STRING_SHOT] = _("String Shot"), - [MOVE_DRAGON_RAGE] = _("Dragon Rage"), - [MOVE_FIRE_SPIN] = _("Fire Spin"), - [MOVE_THUNDER_SHOCK] = _("Thunder Shock"), - [MOVE_THUNDERBOLT] = _("Thunderbolt"), - [MOVE_THUNDER_WAVE] = _("Thunder Wave"), - [MOVE_THUNDER] = _("Thunder"), - [MOVE_ROCK_THROW] = _("Rock Throw"), - [MOVE_EARTHQUAKE] = _("Earthquake"), - [MOVE_FISSURE] = _("Fissure"), - [MOVE_DIG] = _("Dig"), - [MOVE_TOXIC] = _("Toxic"), - [MOVE_CONFUSION] = _("Confusion"), - [MOVE_PSYCHIC] = _("Psychic"), - [MOVE_HYPNOSIS] = _("Hypnosis"), - [MOVE_MEDITATE] = _("Meditate"), - [MOVE_AGILITY] = _("Agility"), - [MOVE_QUICK_ATTACK] = _("Quick Attack"), - [MOVE_RAGE] = _("Rage"), - [MOVE_TELEPORT] = _("Teleport"), - [MOVE_NIGHT_SHADE] = _("Night Shade"), - [MOVE_MIMIC] = _("Mimic"), - [MOVE_SCREECH] = _("Screech"), - [MOVE_DOUBLE_TEAM] = _("Double Team"), - [MOVE_RECOVER] = _("Recover"), - [MOVE_HARDEN] = _("Harden"), - [MOVE_MINIMIZE] = _("Minimize"), - [MOVE_SMOKESCREEN] = _("Smokescreen"), - [MOVE_CONFUSE_RAY] = _("Confuse Ray"), - [MOVE_WITHDRAW] = _("Withdraw"), - [MOVE_DEFENSE_CURL] = _("Defense Curl"), - [MOVE_BARRIER] = _("Barrier"), - [MOVE_LIGHT_SCREEN] = _("Light Screen"), - [MOVE_HAZE] = _("Haze"), - [MOVE_REFLECT] = _("Reflect"), - [MOVE_FOCUS_ENERGY] = _("Focus Energy"), - [MOVE_BIDE] = _("Bide"), - [MOVE_METRONOME] = _("Metronome"), - [MOVE_MIRROR_MOVE] = _("Mirror Move"), - [MOVE_SELF_DESTRUCT] = _("Self-Destruct"), - [MOVE_EGG_BOMB] = _("Egg Bomb"), - [MOVE_LICK] = _("Lick"), - [MOVE_SMOG] = _("Smog"), - [MOVE_SLUDGE] = _("Sludge"), - [MOVE_BONE_CLUB] = _("Bone Club"), - [MOVE_FIRE_BLAST] = _("Fire Blast"), - [MOVE_WATERFALL] = _("Waterfall"), - [MOVE_CLAMP] = _("Clamp"), - [MOVE_SWIFT] = _("Swift"), - [MOVE_SKULL_BASH] = _("Skull Bash"), - [MOVE_SPIKE_CANNON] = _("Spike Cannon"), - [MOVE_CONSTRICT] = _("Constrict"), - [MOVE_AMNESIA] = _("Amnesia"), - [MOVE_KINESIS] = _("Kinesis"), - [MOVE_SOFT_BOILED] = _("Soft-Boiled"), - [MOVE_HIGH_JUMP_KICK] = _("High Jump Kick"), - [MOVE_GLARE] = _("Glare"), - [MOVE_DREAM_EATER] = _("Dream Eater"), - [MOVE_POISON_GAS] = _("Poison Gas"), - [MOVE_BARRAGE] = _("Barrage"), - [MOVE_LEECH_LIFE] = _("Leech Life"), - [MOVE_LOVELY_KISS] = _("Lovely Kiss"), - [MOVE_SKY_ATTACK] = _("Sky Attack"), - [MOVE_TRANSFORM] = _("Transform"), - [MOVE_BUBBLE] = _("Bubble"), - [MOVE_DIZZY_PUNCH] = _("Dizzy Punch"), - [MOVE_SPORE] = _("Spore"), - [MOVE_FLASH] = _("Flash"), - [MOVE_PSYWAVE] = _("Psywave"), - [MOVE_SPLASH] = _("Splash"), - [MOVE_ACID_ARMOR] = _("Acid Armor"), - [MOVE_CRABHAMMER] = _("Crabhammer"), - [MOVE_EXPLOSION] = _("Explosion"), - [MOVE_FURY_SWIPES] = _("Fury Swipes"), - [MOVE_BONEMERANG] = _("Bonemerang"), - [MOVE_REST] = _("Rest"), - [MOVE_ROCK_SLIDE] = _("Rock Slide"), - [MOVE_HYPER_FANG] = _("Hyper Fang"), - [MOVE_SHARPEN] = _("Sharpen"), - [MOVE_CONVERSION] = _("Conversion"), - [MOVE_TRI_ATTACK] = _("Tri Attack"), - [MOVE_SUPER_FANG] = _("Super Fang"), - [MOVE_SLASH] = _("Slash"), - [MOVE_SUBSTITUTE] = _("Substitute"), - [MOVE_STRUGGLE] = _("Struggle"), - [MOVE_SKETCH] = _("Sketch"), - [MOVE_TRIPLE_KICK] = _("Triple Kick"), - [MOVE_THIEF] = _("Thief"), - [MOVE_SPIDER_WEB] = _("Spider Web"), - [MOVE_MIND_READER] = _("Mind Reader"), - [MOVE_NIGHTMARE] = _("Nightmare"), - [MOVE_FLAME_WHEEL] = _("Flame Wheel"), - [MOVE_SNORE] = _("Snore"), - [MOVE_CURSE] = _("Curse"), - [MOVE_FLAIL] = _("Flail"), - [MOVE_CONVERSION_2] = _("Conversion 2"), - [MOVE_AEROBLAST] = _("Aeroblast"), - [MOVE_COTTON_SPORE] = _("Cotton Spore"), - [MOVE_REVERSAL] = _("Reversal"), - [MOVE_SPITE] = _("Spite"), - [MOVE_POWDER_SNOW] = _("Powder Snow"), - [MOVE_PROTECT] = _("Protect"), - [MOVE_MACH_PUNCH] = _("Mach Punch"), - [MOVE_SCARY_FACE] = _("Scary Face"), - [MOVE_FEINT_ATTACK] = _("Feint Attack"), - [MOVE_SWEET_KISS] = _("Sweet Kiss"), - [MOVE_BELLY_DRUM] = _("Belly Drum"), - [MOVE_SLUDGE_BOMB] = _("Sludge Bomb"), - [MOVE_MUD_SLAP] = _("Mud-Slap"), - [MOVE_OCTAZOOKA] = _("Octazooka"), - [MOVE_SPIKES] = _("Spikes"), - [MOVE_ZAP_CANNON] = _("Zap Cannon"), - [MOVE_FORESIGHT] = _("Foresight"), - [MOVE_DESTINY_BOND] = _("Destiny Bond"), - [MOVE_PERISH_SONG] = _("Perish Song"), - [MOVE_ICY_WIND] = _("Icy Wind"), - [MOVE_DETECT] = _("Detect"), - [MOVE_BONE_RUSH] = _("Bone Rush"), - [MOVE_LOCK_ON] = _("Lock-On"), - [MOVE_OUTRAGE] = _("Outrage"), - [MOVE_SANDSTORM] = _("Sandstorm"), - [MOVE_GIGA_DRAIN] = _("Giga Drain"), - [MOVE_ENDURE] = _("Endure"), - [MOVE_CHARM] = _("Charm"), - [MOVE_ROLLOUT] = _("Rollout"), - [MOVE_FALSE_SWIPE] = _("False Swipe"), - [MOVE_SWAGGER] = _("Swagger"), - [MOVE_MILK_DRINK] = _("Milk Drink"), - [MOVE_SPARK] = _("Spark"), - [MOVE_FURY_CUTTER] = _("Fury Cutter"), - [MOVE_STEEL_WING] = _("Steel Wing"), - [MOVE_MEAN_LOOK] = _("Mean Look"), - [MOVE_ATTRACT] = _("Attract"), - [MOVE_SLEEP_TALK] = _("Sleep Talk"), - [MOVE_HEAL_BELL] = _("Heal Bell"), - [MOVE_RETURN] = _("Return"), - [MOVE_PRESENT] = _("Present"), - [MOVE_FRUSTRATION] = _("Frustration"), - [MOVE_SAFEGUARD] = _("Safeguard"), - [MOVE_PAIN_SPLIT] = _("Pain Split"), - [MOVE_SACRED_FIRE] = _("Sacred Fire"), - [MOVE_MAGNITUDE] = _("Magnitude"), - [MOVE_DYNAMIC_PUNCH] = _("Dynamic Punch"), - [MOVE_MEGAHORN] = _("Megahorn"), - [MOVE_DRAGON_BREATH] = _("Dragon Breath"), - [MOVE_BATON_PASS] = _("Baton Pass"), - [MOVE_ENCORE] = _("Encore"), - [MOVE_PURSUIT] = _("Pursuit"), - [MOVE_RAPID_SPIN] = _("Rapid Spin"), - [MOVE_SWEET_SCENT] = _("Sweet Scent"), - [MOVE_IRON_TAIL] = _("Iron Tail"), - [MOVE_METAL_CLAW] = _("Metal Claw"), - [MOVE_VITAL_THROW] = _("Vital Throw"), - [MOVE_MORNING_SUN] = _("Morning Sun"), - [MOVE_SYNTHESIS] = _("Synthesis"), - [MOVE_MOONLIGHT] = _("Moonlight"), - [MOVE_HIDDEN_POWER] = _("Hidden Power"), - [MOVE_CROSS_CHOP] = _("Cross Chop"), - [MOVE_TWISTER] = _("Twister"), - [MOVE_RAIN_DANCE] = _("Rain Dance"), - [MOVE_SUNNY_DAY] = _("Sunny Day"), - [MOVE_CRUNCH] = _("Crunch"), - [MOVE_MIRROR_COAT] = _("Mirror Coat"), - [MOVE_PSYCH_UP] = _("Psych Up"), - [MOVE_EXTREME_SPEED] = _("Extreme Speed"), - [MOVE_ANCIENT_POWER] = _("Ancient Power"), - [MOVE_SHADOW_BALL] = _("Shadow Ball"), - [MOVE_FUTURE_SIGHT] = _("Future Sight"), - [MOVE_ROCK_SMASH] = _("Rock Smash"), - [MOVE_WHIRLPOOL] = _("Whirlpool"), - [MOVE_BEAT_UP] = _("Beat Up"), - [MOVE_FAKE_OUT] = _("Fake Out"), - [MOVE_UPROAR] = _("Uproar"), - [MOVE_STOCKPILE] = _("Stockpile"), - [MOVE_SPIT_UP] = _("Spit Up"), - [MOVE_SWALLOW] = _("Swallow"), - [MOVE_HEAT_WAVE] = _("Heat Wave"), - [MOVE_HAIL] = _("Hail"), - [MOVE_TORMENT] = _("Torment"), - [MOVE_FLATTER] = _("Flatter"), - [MOVE_WILL_O_WISP] = _("Will-o-Wisp"), - [MOVE_MEMENTO] = _("Memento"), - [MOVE_FACADE] = _("Facade"), - [MOVE_FOCUS_PUNCH] = _("Focus Punch"), - [MOVE_SMELLING_SALTS] = _("Smelling Salts"), - [MOVE_FOLLOW_ME] = _("Follow Me"), - [MOVE_NATURE_POWER] = _("Nature Power"), - [MOVE_CHARGE] = _("Charge"), - [MOVE_TAUNT] = _("Taunt"), - [MOVE_HELPING_HAND] = _("Helping Hand"), - [MOVE_TRICK] = _("Trick"), - [MOVE_ROLE_PLAY] = _("Role Play"), - [MOVE_WISH] = _("Wish"), - [MOVE_ASSIST] = _("Assist"), - [MOVE_INGRAIN] = _("Ingrain"), - [MOVE_SUPERPOWER] = _("Superpower"), - [MOVE_MAGIC_COAT] = _("Magic Coat"), - [MOVE_RECYCLE] = _("Recycle"), - [MOVE_REVENGE] = _("Revenge"), - [MOVE_BRICK_BREAK] = _("Brick Break"), - [MOVE_YAWN] = _("Yawn"), - [MOVE_KNOCK_OFF] = _("Knock Off"), - [MOVE_ENDEAVOR] = _("Endeavor"), - [MOVE_ERUPTION] = _("Eruption"), - [MOVE_SKILL_SWAP] = _("Skill Swap"), - [MOVE_IMPRISON] = _("Imprison"), - [MOVE_REFRESH] = _("Refresh"), - [MOVE_GRUDGE] = _("Grudge"), - [MOVE_SNATCH] = _("Snatch"), - [MOVE_SECRET_POWER] = _("Secret Power"), - [MOVE_DIVE] = _("Dive"), - [MOVE_ARM_THRUST] = _("Arm Thrust"), - [MOVE_CAMOUFLAGE] = _("Camouflage"), - [MOVE_TAIL_GLOW] = _("Tail Glow"), - [MOVE_LUSTER_PURGE] = _("Luster Purge"), - [MOVE_MIST_BALL] = _("Mist Ball"), - [MOVE_FEATHER_DANCE] = _("Feather Dance"), - [MOVE_TEETER_DANCE] = _("Teeter Dance"), - [MOVE_BLAZE_KICK] = _("Blaze Kick"), - [MOVE_MUD_SPORT] = _("Mud Sport"), - [MOVE_ICE_BALL] = _("Ice Ball"), - [MOVE_NEEDLE_ARM] = _("Needle Arm"), - [MOVE_SLACK_OFF] = _("Slack Off"), - [MOVE_HYPER_VOICE] = _("Hyper Voice"), - [MOVE_POISON_FANG] = _("Poison Fang"), - [MOVE_CRUSH_CLAW] = _("Crush Claw"), - [MOVE_BLAST_BURN] = _("Blast Burn"), - [MOVE_HYDRO_CANNON] = _("Hydro Cannon"), - [MOVE_METEOR_MASH] = _("Meteor Mash"), - [MOVE_ASTONISH] = _("Astonish"), - [MOVE_WEATHER_BALL] = _("Weather Ball"), - [MOVE_AROMATHERAPY] = _("Aromatherapy"), - [MOVE_FAKE_TEARS] = _("Fake Tears"), - [MOVE_AIR_CUTTER] = _("Air Cutter"), - [MOVE_OVERHEAT] = _("Overheat"), - [MOVE_ODOR_SLEUTH] = _("Odor Sleuth"), - [MOVE_ROCK_TOMB] = _("Rock Tomb"), - [MOVE_SILVER_WIND] = _("Silver Wind"), - [MOVE_METAL_SOUND] = _("Metal Sound"), - [MOVE_GRASS_WHISTLE] = _("Grass Whistle"), - [MOVE_TICKLE] = _("Tickle"), - [MOVE_COSMIC_POWER] = _("Cosmic Power"), - [MOVE_WATER_SPOUT] = _("Water Spout"), - [MOVE_SIGNAL_BEAM] = _("Signal Beam"), - [MOVE_SHADOW_PUNCH] = _("Shadow Punch"), - [MOVE_EXTRASENSORY] = _("Extrasensory"), - [MOVE_SKY_UPPERCUT] = _("Sky Uppercut"), - [MOVE_SAND_TOMB] = _("Sand Tomb"), - [MOVE_SHEER_COLD] = _("Sheer Cold"), - [MOVE_MUDDY_WATER] = _("Muddy Water"), - [MOVE_BULLET_SEED] = _("Bullet Seed"), - [MOVE_AERIAL_ACE] = _("Aerial Ace"), - [MOVE_ICICLE_SPEAR] = _("Icicle Spear"), - [MOVE_IRON_DEFENSE] = _("Iron Defense"), - [MOVE_BLOCK] = _("Block"), - [MOVE_HOWL] = _("Howl"), - [MOVE_DRAGON_CLAW] = _("Dragon Claw"), - [MOVE_FRENZY_PLANT] = _("Frenzy Plant"), - [MOVE_BULK_UP] = _("Bulk Up"), - [MOVE_BOUNCE] = _("Bounce"), - [MOVE_MUD_SHOT] = _("Mud Shot"), - [MOVE_POISON_TAIL] = _("Poison Tail"), - [MOVE_COVET] = _("Covet"), - [MOVE_VOLT_TACKLE] = _("Volt Tackle"), - [MOVE_MAGICAL_LEAF] = _("Magical Leaf"), - [MOVE_WATER_SPORT] = _("Water Sport"), - [MOVE_CALM_MIND] = _("Calm Mind"), - [MOVE_LEAF_BLADE] = _("Leaf Blade"), - [MOVE_DRAGON_DANCE] = _("Dragon Dance"), - [MOVE_ROCK_BLAST] = _("Rock Blast"), - [MOVE_SHOCK_WAVE] = _("Shock Wave"), - [MOVE_WATER_PULSE] = _("Water Pulse"), - [MOVE_DOOM_DESIRE] = _("Doom Desire"), - [MOVE_PSYCHO_BOOST] = _("Psycho Boost"), - [MOVE_ROOST] = _("Roost"), - [MOVE_GRAVITY] = _("Gravity"), - [MOVE_MIRACLE_EYE] = _("Miracle Eye"), - [MOVE_WAKE_UP_SLAP] = _("Wake-Up Slap"), - [MOVE_HAMMER_ARM] = _("Hammer Arm"), - [MOVE_GYRO_BALL] = _("Gyro Ball"), - [MOVE_HEALING_WISH] = _("Healing Wish"), - [MOVE_BRINE] = _("Brine"), - [MOVE_NATURAL_GIFT] = _("Natural Gift"), - [MOVE_FEINT] = _("Feint"), - [MOVE_PLUCK] = _("Pluck"), - [MOVE_TAILWIND] = _("Tailwind"), - [MOVE_ACUPRESSURE] = _("Acupressure"), - [MOVE_METAL_BURST] = _("Metal Burst"), - [MOVE_U_TURN] = _("U-turn"), - [MOVE_CLOSE_COMBAT] = _("Close Combat"), - [MOVE_PAYBACK] = _("Payback"), - [MOVE_ASSURANCE] = _("Assurance"), - [MOVE_EMBARGO] = _("Embargo"), - [MOVE_FLING] = _("Fling"), - [MOVE_PSYCHO_SHIFT] = _("Psycho Shift"), - [MOVE_TRUMP_CARD] = _("Trump Card"), - [MOVE_HEAL_BLOCK] = _("Heal Block"), - [MOVE_WRING_OUT] = _("Wring Out"), - [MOVE_POWER_TRICK] = _("Power Trick"), - [MOVE_GASTRO_ACID] = _("Gastro Acid"), - [MOVE_LUCKY_CHANT] = _("Lucky Chant"), - [MOVE_ME_FIRST] = _("Me First"), - [MOVE_COPYCAT] = _("Copycat"), - [MOVE_POWER_SWAP] = _("Power Swap"), - [MOVE_GUARD_SWAP] = _("Guard Swap"), - [MOVE_PUNISHMENT] = _("Punishment"), - [MOVE_LAST_RESORT] = _("Last Resort"), - [MOVE_WORRY_SEED] = _("Worry Seed"), - [MOVE_SUCKER_PUNCH] = _("Sucker Punch"), - [MOVE_TOXIC_SPIKES] = _("Toxic Spikes"), - [MOVE_HEART_SWAP] = _("Heart Swap"), - [MOVE_AQUA_RING] = _("Aqua Ring"), - [MOVE_MAGNET_RISE] = _("Magnet Rise"), - [MOVE_FLARE_BLITZ] = _("Flare Blitz"), - [MOVE_FORCE_PALM] = _("Force Palm"), - [MOVE_AURA_SPHERE] = _("Aura Sphere"), - [MOVE_ROCK_POLISH] = _("Rock Polish"), - [MOVE_POISON_JAB] = _("Poison Jab"), - [MOVE_DARK_PULSE] = _("Dark Pulse"), - [MOVE_NIGHT_SLASH] = _("Night Slash"), - [MOVE_AQUA_TAIL] = _("Aqua Tail"), - [MOVE_SEED_BOMB] = _("Seed Bomb"), - [MOVE_AIR_SLASH] = _("Air Slash"), - [MOVE_X_SCISSOR] = _("X-Scissor"), - [MOVE_BUG_BUZZ] = _("Bug Buzz"), - [MOVE_DRAGON_PULSE] = _("Dragon Pulse"), - [MOVE_DRAGON_RUSH] = _("Dragon Rush"), - [MOVE_POWER_GEM] = _("Power Gem"), - [MOVE_DRAIN_PUNCH] = _("Drain Punch"), - [MOVE_VACUUM_WAVE] = _("Vacuum Wave"), - [MOVE_FOCUS_BLAST] = _("Focus Blast"), - [MOVE_ENERGY_BALL] = _("Energy Ball"), - [MOVE_BRAVE_BIRD] = _("Brave Bird"), - [MOVE_EARTH_POWER] = _("Earth Power"), - [MOVE_SWITCHEROO] = _("Switcheroo"), - [MOVE_GIGA_IMPACT] = _("Giga Impact"), - [MOVE_NASTY_PLOT] = _("Nasty Plot"), - [MOVE_BULLET_PUNCH] = _("Bullet Punch"), - [MOVE_AVALANCHE] = _("Avalanche"), - [MOVE_ICE_SHARD] = _("Ice Shard"), - [MOVE_SHADOW_CLAW] = _("Shadow Claw"), - [MOVE_THUNDER_FANG] = _("Thunder Fang"), - [MOVE_ICE_FANG] = _("Ice Fang"), - [MOVE_FIRE_FANG] = _("Fire Fang"), - [MOVE_SHADOW_SNEAK] = _("Shadow Sneak"), - [MOVE_MUD_BOMB] = _("Mud Bomb"), - [MOVE_PSYCHO_CUT] = _("Psycho Cut"), - [MOVE_ZEN_HEADBUTT] = _("Zen Headbutt"), - [MOVE_MIRROR_SHOT] = _("Mirror Shot"), - [MOVE_FLASH_CANNON] = _("Flash Cannon"), - [MOVE_ROCK_CLIMB] = _("Rock Climb"), - [MOVE_DEFOG] = _("Defog"), - [MOVE_TRICK_ROOM] = _("Trick Room"), - [MOVE_DRACO_METEOR] = _("Draco Meteor"), - [MOVE_DISCHARGE] = _("Discharge"), - [MOVE_LAVA_PLUME] = _("Lava Plume"), - [MOVE_LEAF_STORM] = _("Leaf Storm"), - [MOVE_POWER_WHIP] = _("Power Whip"), - [MOVE_ROCK_WRECKER] = _("Rock Wrecker"), - [MOVE_CROSS_POISON] = _("Cross Poison"), - [MOVE_GUNK_SHOT] = _("Gunk Shot"), - [MOVE_IRON_HEAD] = _("Iron Head"), - [MOVE_MAGNET_BOMB] = _("Magnet Bomb"), - [MOVE_STONE_EDGE] = _("Stone Edge"), - [MOVE_CAPTIVATE] = _("Captivate"), - [MOVE_STEALTH_ROCK] = _("Stealth Rock"), - [MOVE_GRASS_KNOT] = _("Grass Knot"), - [MOVE_CHATTER] = _("Chatter"), - [MOVE_JUDGMENT] = _("Judgment"), - [MOVE_BUG_BITE] = _("Bug Bite"), - [MOVE_CHARGE_BEAM] = _("Charge Beam"), - [MOVE_WOOD_HAMMER] = _("Wood Hammer"), - [MOVE_AQUA_JET] = _("Aqua Jet"), - [MOVE_ATTACK_ORDER] = _("Attack Order"), - [MOVE_DEFEND_ORDER] = _("Defend Order"), - [MOVE_HEAL_ORDER] = _("Heal Order"), - [MOVE_HEAD_SMASH] = _("Head Smash"), - [MOVE_DOUBLE_HIT] = _("Double Hit"), - [MOVE_ROAR_OF_TIME] = _("Roar of Time"), - [MOVE_SPACIAL_REND] = _("Spacial Rend"), - [MOVE_LUNAR_DANCE] = _("Lunar Dance"), - [MOVE_CRUSH_GRIP] = _("Crush Grip"), - [MOVE_MAGMA_STORM] = _("Magma Storm"), - [MOVE_DARK_VOID] = _("Dark Void"), - [MOVE_SEED_FLARE] = _("Seed Flare"), - [MOVE_OMINOUS_WIND] = _("Ominous Wind"), - [MOVE_SHADOW_FORCE] = _("Shadow Force"), - [MOVE_HONE_CLAWS] = _("Hone Claws"), - [MOVE_WIDE_GUARD] = _("Wide Guard"), - [MOVE_GUARD_SPLIT] = _("Guard Split"), - [MOVE_POWER_SPLIT] = _("Power Split"), - [MOVE_WONDER_ROOM] = _("Wonder Room"), - [MOVE_PSYSHOCK] = _("Psyshock"), - [MOVE_VENOSHOCK] = _("Venoshock"), - [MOVE_AUTOTOMIZE] = _("Autotomize"), - [MOVE_RAGE_POWDER] = _("Rage Powder"), - [MOVE_TELEKINESIS] = _("Telekinesis"), - [MOVE_MAGIC_ROOM] = _("Magic Room"), - [MOVE_SMACK_DOWN] = _("Smack Down"), - [MOVE_STORM_THROW] = _("Storm Throw"), - [MOVE_FLAME_BURST] = _("Flame Burst"), - [MOVE_SLUDGE_WAVE] = _("Sludge Wave"), - [MOVE_QUIVER_DANCE] = _("Quiver Dance"), - [MOVE_HEAVY_SLAM] = _("Heavy Slam"), - [MOVE_SYNCHRONOISE] = _("Synchronoise"), - [MOVE_ELECTRO_BALL] = _("Electro Ball"), - [MOVE_SOAK] = _("Soak"), - [MOVE_FLAME_CHARGE] = _("Flame Charge"), - [MOVE_COIL] = _("Coil"), - [MOVE_LOW_SWEEP] = _("Low Sweep"), - [MOVE_ACID_SPRAY] = _("Acid Spray"), - [MOVE_FOUL_PLAY] = _("Foul Play"), - [MOVE_SIMPLE_BEAM] = _("Simple Beam"), - [MOVE_ENTRAINMENT] = _("Entrainment"), - [MOVE_AFTER_YOU] = _("After You"), - [MOVE_ROUND] = _("Round"), - [MOVE_ECHOED_VOICE] = _("Echoed Voice"), - [MOVE_CHIP_AWAY] = _("Chip Away"), - [MOVE_CLEAR_SMOG] = _("Clear Smog"), - [MOVE_STORED_POWER] = _("Stored Power"), - [MOVE_QUICK_GUARD] = _("Quick Guard"), - [MOVE_ALLY_SWITCH] = _("Ally Switch"), - [MOVE_SCALD] = _("Scald"), - [MOVE_SHELL_SMASH] = _("Shell Smash"), - [MOVE_HEAL_PULSE] = _("Heal Pulse"), - [MOVE_HEX] = _("Hex"), - [MOVE_SKY_DROP] = _("Sky Drop"), - [MOVE_SHIFT_GEAR] = _("Shift Gear"), - [MOVE_CIRCLE_THROW] = _("Circle Throw"), - [MOVE_INCINERATE] = _("Incinerate"), - [MOVE_QUASH] = _("Quash"), - [MOVE_ACROBATICS] = _("Acrobatics"), - [MOVE_REFLECT_TYPE] = _("Reflect Type"), - [MOVE_RETALIATE] = _("Retaliate"), - [MOVE_FINAL_GAMBIT] = _("Final Gambit"), - [MOVE_BESTOW] = _("Bestow"), - [MOVE_INFERNO] = _("Inferno"), - [MOVE_WATER_PLEDGE] = _("Water Pledge"), - [MOVE_FIRE_PLEDGE] = _("Fire Pledge"), - [MOVE_GRASS_PLEDGE] = _("Grass Pledge"), - [MOVE_VOLT_SWITCH] = _("Volt Switch"), - [MOVE_STRUGGLE_BUG] = _("Struggle Bug"), - [MOVE_BULLDOZE] = _("Bulldoze"), - [MOVE_FROST_BREATH] = _("Frost Breath"), - [MOVE_DRAGON_TAIL] = _("Dragon Tail"), - [MOVE_WORK_UP] = _("Work Up"), - [MOVE_ELECTROWEB] = _("Electroweb"), - [MOVE_WILD_CHARGE] = _("Wild Charge"), - [MOVE_DRILL_RUN] = _("Drill Run"), - [MOVE_DUAL_CHOP] = _("Dual Chop"), - [MOVE_HEART_STAMP] = _("Heart Stamp"), - [MOVE_HORN_LEECH] = _("Horn Leech"), - [MOVE_SACRED_SWORD] = _("Sacred Sword"), - [MOVE_RAZOR_SHELL] = _("Razor Shell"), - [MOVE_HEAT_CRASH] = _("Heat Crash"), - [MOVE_LEAF_TORNADO] = _("Leaf Tornado"), - [MOVE_STEAMROLLER] = _("Steamroller"), - [MOVE_COTTON_GUARD] = _("Cotton Guard"), - [MOVE_NIGHT_DAZE] = _("Night Daze"), - [MOVE_PSYSTRIKE] = _("Psystrike"), - [MOVE_TAIL_SLAP] = _("Tail Slap"), - [MOVE_HURRICANE] = _("Hurricane"), - [MOVE_HEAD_CHARGE] = _("Head Charge"), - [MOVE_GEAR_GRIND] = _("Gear Grind"), - [MOVE_SEARING_SHOT] = _("Searing Shot"), - [MOVE_TECHNO_BLAST] = _("Techno Blast"), - [MOVE_RELIC_SONG] = _("Relic Song"), - [MOVE_SECRET_SWORD] = _("Secret Sword"), - [MOVE_GLACIATE] = _("Glaciate"), - [MOVE_BOLT_STRIKE] = _("Bolt Strike"), - [MOVE_BLUE_FLARE] = _("Blue Flare"), - [MOVE_FIERY_DANCE] = _("Fiery Dance"), - [MOVE_FREEZE_SHOCK] = _("Freeze Shock"), - [MOVE_ICE_BURN] = _("Ice Burn"), - [MOVE_SNARL] = _("Snarl"), - [MOVE_ICICLE_CRASH] = _("Icicle Crash"), - [MOVE_V_CREATE] = _("V-create"), - [MOVE_FUSION_FLARE] = _("Fusion Flare"), - [MOVE_FUSION_BOLT] = _("Fusion Bolt"), - [MOVE_FLYING_PRESS] = _("Flying Press"), - [MOVE_MAT_BLOCK] = _("Mat Block"), - [MOVE_BELCH] = _("Belch"), - [MOVE_ROTOTILLER] = _("Rototiller"), - [MOVE_STICKY_WEB] = _("Sticky Web"), - [MOVE_FELL_STINGER] = _("Fell Stinger"), - [MOVE_PHANTOM_FORCE] = _("Phantom Force"), - [MOVE_TRICK_OR_TREAT] = _("Trick-Or-Treat"), - [MOVE_NOBLE_ROAR] = _("Noble Roar"), - [MOVE_ION_DELUGE] = _("Ion Deluge"), - [MOVE_PARABOLIC_CHARGE] = _("Parabolic Charge"), - [MOVE_FORESTS_CURSE] = _("Forest's Curse"), - [MOVE_PETAL_BLIZZARD] = _("Petal Blizzard"), - [MOVE_FREEZE_DRY] = _("Freeze-Dry"), - [MOVE_DISARMING_VOICE] = _("Disarming Voice"), - [MOVE_PARTING_SHOT] = _("Parting Shot"), - [MOVE_TOPSY_TURVY] = _("Topsy-Turvy"), - [MOVE_DRAINING_KISS] = _("Draining Kiss"), - [MOVE_CRAFTY_SHIELD] = _("Crafty Shield"), - [MOVE_FLOWER_SHIELD] = _("Flower Shield"), - [MOVE_GRASSY_TERRAIN] = _("Grassy Terrain"), - [MOVE_MISTY_TERRAIN] = _("Misty Terrain"), - [MOVE_ELECTRIFY] = _("Electrify"), - [MOVE_PLAY_ROUGH] = _("Play Rough"), - [MOVE_FAIRY_WIND] = _("Fairy Wind"), - [MOVE_MOONBLAST] = _("Moonblast"), - [MOVE_BOOMBURST] = _("Boomburst"), - [MOVE_FAIRY_LOCK] = _("Fairy Lock"), - [MOVE_KINGS_SHIELD] = _("King's Shield"), - [MOVE_PLAY_NICE] = _("Play Nice"), - [MOVE_CONFIDE] = _("Confide"), - [MOVE_DIAMOND_STORM] = _("Diamond Storm"), - [MOVE_STEAM_ERUPTION] = _("Steam Eruption"), - [MOVE_HYPERSPACE_HOLE] = _("Hyprspace Hole"), - [MOVE_WATER_SHURIKEN] = _("Water Shuriken"), - [MOVE_MYSTICAL_FIRE] = _("Mystical Fire"), - [MOVE_SPIKY_SHIELD] = _("Spiky Shield"), - [MOVE_AROMATIC_MIST] = _("Aromatic Mist"), - [MOVE_EERIE_IMPULSE] = _("Eerie Impulse"), - [MOVE_VENOM_DRENCH] = _("Venom Drench"), - [MOVE_POWDER] = _("Powder"), - [MOVE_GEOMANCY] = _("Geomancy"), - [MOVE_MAGNETIC_FLUX] = _("Magnetic Flux"), - [MOVE_HAPPY_HOUR] = _("Happy Hour"), - [MOVE_ELECTRIC_TERRAIN] = _("Electric Terrain"), - [MOVE_DAZZLING_GLEAM] = _("Dazzling Gleam"), - [MOVE_CELEBRATE] = _("Celebrate"), - [MOVE_HOLD_HANDS] = _("Hold Hands"), - [MOVE_BABY_DOLL_EYES] = _("Baby-Doll Eyes"), - [MOVE_NUZZLE] = _("Nuzzle"), - [MOVE_HOLD_BACK] = _("Hold Back"), - [MOVE_INFESTATION] = _("Infestation"), - [MOVE_POWER_UP_PUNCH] = _("Power-Up Punch"), - [MOVE_OBLIVION_WING] = _("Oblivion Wing"), - [MOVE_THOUSAND_ARROWS] = _("Thousand Arrows"), - [MOVE_THOUSAND_WAVES] = _("Thousand Waves"), - [MOVE_LANDS_WRATH] = _("Land's Wrath"), - [MOVE_LIGHT_OF_RUIN] = _("Light Of Ruin"), - [MOVE_ORIGIN_PULSE] = _("Origin Pulse"), - [MOVE_PRECIPICE_BLADES] = _("Precipice Blades"), - [MOVE_DRAGON_ASCENT] = _("Dragon Ascent"), - [MOVE_HYPERSPACE_FURY] = _("Hyperspace Fury"), - [MOVE_SHORE_UP] = _("Shore Up"), - [MOVE_FIRST_IMPRESSION] = _("First Impression"), - [MOVE_BANEFUL_BUNKER] = _("Baneful Bunker"), - [MOVE_SPIRIT_SHACKLE] = _("Spirit Shackle"), - [MOVE_DARKEST_LARIAT] = _("Darkest Lariat"), - [MOVE_SPARKLING_ARIA] = _("Sparkling Aria"), - [MOVE_ICE_HAMMER] = _("Ice Hammer"), - [MOVE_FLORAL_HEALING] = _("Floral Healng"), - [MOVE_HIGH_HORSEPOWER] = _("High Horsepower"), - [MOVE_STRENGTH_SAP] = _("Strength Sap"), - [MOVE_SOLAR_BLADE] = _("Solar Blade"), - [MOVE_LEAFAGE] = _("Leafage"), - [MOVE_SPOTLIGHT] = _("Spotlight"), - [MOVE_TOXIC_THREAD] = _("Toxic Thread"), - [MOVE_LASER_FOCUS] = _("Laser Focus"), - [MOVE_GEAR_UP] = _("Gear Up"), - [MOVE_THROAT_CHOP] = _("Throat Chop"), - [MOVE_POLLEN_PUFF] = _("Pollen Puff"), - [MOVE_ANCHOR_SHOT] = _("Anchor Shot"), - [MOVE_PSYCHIC_TERRAIN] = _("Psychic Terrain"), - [MOVE_LUNGE] = _("Lunge"), - [MOVE_FIRE_LASH] = _("Fire Lash"), - [MOVE_POWER_TRIP] = _("Power Trip"), - [MOVE_BURN_UP] = _("Burn Up"), - [MOVE_SPEED_SWAP] = _("Speed Swap"), - [MOVE_SMART_STRIKE] = _("Smart Strike"), - [MOVE_PURIFY] = _("Purify"), - [MOVE_REVELATION_DANCE] = _("Revelation Dance"), - [MOVE_CORE_ENFORCER] = _("Core Enforcer"), - [MOVE_TROP_KICK] = _("Trop Kick"), - [MOVE_INSTRUCT] = _("Instruct"), - [MOVE_BEAK_BLAST] = _("Beak Blast"), - [MOVE_CLANGING_SCALES] = _("Clanging Scales"), - [MOVE_DRAGON_HAMMER] = _("Dragon Hammer"), - [MOVE_BRUTAL_SWING] = _("Brutal Swing"), - [MOVE_AURORA_VEIL] = _("Aurora Veil"), - [MOVE_SHELL_TRAP] = _("Shell Trap"), - [MOVE_FLEUR_CANNON] = _("Fleur Cannon"), - [MOVE_PSYCHIC_FANGS] = _("Psychic Fangs"), - [MOVE_STOMPING_TANTRUM] = _("Stomping Tantrum"), - [MOVE_SHADOW_BONE] = _("Shadow Bone"), - [MOVE_ACCELEROCK] = _("Accelerock"), - [MOVE_LIQUIDATION] = _("Liquidation"), - [MOVE_PRISMATIC_LASER] = _("Prismatic Laser"), - [MOVE_SPECTRAL_THIEF] = _("Spectral Thief"), - [MOVE_SUNSTEEL_STRIKE] = _("Sunsteel Strike"), - [MOVE_MOONGEIST_BEAM] = _("Moongeist Beam"), - [MOVE_TEARFUL_LOOK] = _("Tearful Look"), - [MOVE_ZING_ZAP] = _("Zing Zap"), - [MOVE_NATURES_MADNESS] = _("Nature's Madness"), - [MOVE_MULTI_ATTACK] = _("Multi-Attack"), - [MOVE_MIND_BLOWN] = _("Mind Blown"), - [MOVE_PLASMA_FISTS] = _("Plasma Fists"), - [MOVE_PHOTON_GEYSER] = _("Photon Geyser"), - [MOVE_ZIPPY_ZAP] = _("Zippy Zap"), - [MOVE_SPLISHY_SPLASH] = _("Splishy Splash"), - [MOVE_FLOATY_FALL] = _("Floaty Fall"), - [MOVE_PIKA_PAPOW] = _("Pika Papow"), - [MOVE_BOUNCY_BUBBLE] = _("Bouncy Bubble"), - [MOVE_BUZZY_BUZZ] = _("Buzzy Buzz"), - [MOVE_SIZZLY_SLIDE] = _("Sizzly Slide"), - [MOVE_GLITZY_GLOW] = _("Glitzy Glow"), - [MOVE_BADDY_BAD] = _("Baddy Bad"), - [MOVE_SAPPY_SEED] = _("Sappy Seed"), - [MOVE_FREEZY_FROST] = _("Freezy Frost"), - [MOVE_SPARKLY_SWIRL] = _("Sparkly Swirl"), - [MOVE_VEEVEE_VOLLEY] = _("Veevee Volley"), - [MOVE_DOUBLE_IRON_BASH] = _("Double Iron Bash"), - [MOVE_DYNAMAX_CANNON] = _("Dynamax Cannon"), - [MOVE_SNIPE_SHOT] = _("Snipe Shot"), - [MOVE_JAW_LOCK] = _("Jaw Lock"), - [MOVE_STUFF_CHEEKS] = _("Stuff Cheeks"), - [MOVE_NO_RETREAT] = _("No Retreat"), - [MOVE_TAR_SHOT] = _("Tar Shot"), - [MOVE_MAGIC_POWDER] = _("Magic Powder"), - [MOVE_DRAGON_DARTS] = _("Dragon Darts"), - [MOVE_TEATIME] = _("Teatime"), - [MOVE_OCTOLOCK] = _("Octolock"), - [MOVE_BOLT_BEAK] = _("Bolt Beak"), - [MOVE_FISHIOUS_REND] = _("Fishious Rend"), - [MOVE_COURT_CHANGE] = _("Court Change"), - [MOVE_CLANGOROUS_SOUL] = _("Clangorous Soul"), - [MOVE_BODY_PRESS] = _("Body Press"), - [MOVE_DECORATE] = _("Decorate"), - [MOVE_DRUM_BEATING] = _("Drum Beating"), - [MOVE_SNAP_TRAP] = _("Snap Trap"), - [MOVE_PYRO_BALL] = _("Pyro Ball"), - [MOVE_BEHEMOTH_BLADE] = _("Behemoth Blade"), - [MOVE_BEHEMOTH_BASH] = _("Behemoth Bash"), - [MOVE_AURA_WHEEL] = _("Aura Wheel"), - [MOVE_BREAKING_SWIPE] = _("Breaking Swipe"), - [MOVE_BRANCH_POKE] = _("Branch Poke"), - [MOVE_OVERDRIVE] = _("Overdrive"), - [MOVE_APPLE_ACID] = _("Apple Acid"), - [MOVE_GRAV_APPLE] = _("Grav Apple"), - [MOVE_SPIRIT_BREAK] = _("Spirit Break"), - [MOVE_STRANGE_STEAM] = _("Strange Steam"), - [MOVE_LIFE_DEW] = _("Life Dew"), - [MOVE_OBSTRUCT] = _("Obstruct"), - [MOVE_FALSE_SURRENDER] = _("False Surrender"), - [MOVE_METEOR_ASSAULT] = _("Meteor Assault"), - [MOVE_ETERNABEAM] = _("Eternabeam"), - [MOVE_STEEL_BEAM] = _("Steel Beam"), - [MOVE_EXPANDING_FORCE] = _("Expanding Force"), - [MOVE_STEEL_ROLLER] = _("Steel Roller"), - [MOVE_SCALE_SHOT] = _("Scale Shot"), - [MOVE_METEOR_BEAM] = _("Meteor Beam"), - [MOVE_SHELL_SIDE_ARM] = _("Shell Side Arm"), - [MOVE_MISTY_EXPLOSION] = _("Misty Explosion"), - [MOVE_GRASSY_GLIDE] = _("Grassy Glide"), - [MOVE_RISING_VOLTAGE] = _("Rising Voltage"), - [MOVE_TERRAIN_PULSE] = _("Terrain Pulse"), - [MOVE_SKITTER_SMACK] = _("Skitter Smack"), - [MOVE_BURNING_JEALOUSY] = _("Burning Jealousy"), - [MOVE_LASH_OUT] = _("Lash Out"), - [MOVE_POLTERGEIST] = _("Poltergeist"), - [MOVE_CORROSIVE_GAS] = _("Corrosive Gas"), - [MOVE_COACHING] = _("Coaching"), - [MOVE_FLIP_TURN] = _("Flip Turn"), - [MOVE_TRIPLE_AXEL] = _("Triple Axel"), - [MOVE_DUAL_WINGBEAT] = _("Dual Wingbeat"), - [MOVE_SCORCHING_SANDS] = _("Scorching Sands"), - [MOVE_JUNGLE_HEALING] = _("Jungle Healng"), - [MOVE_WICKED_BLOW] = _("Wicked Blow"), - [MOVE_SURGING_STRIKES] = _("Surging Strikes"), - [MOVE_THUNDER_CAGE] = _("Thunder Cage"), - [MOVE_DRAGON_ENERGY] = _("Dragon Energy"), - [MOVE_FREEZING_GLARE] = _("Freezing Glare"), - [MOVE_FIERY_WRATH] = _("Fiery Wrath"), - [MOVE_THUNDEROUS_KICK] = _("Thunderous Kick"), - [MOVE_GLACIAL_LANCE] = _("Glacial Lance"), - [MOVE_ASTRAL_BARRAGE] = _("Astral Barrage"), - [MOVE_EERIE_SPELL] = _("Eerie Spell"), - [MOVE_DIRE_CLAW] = _("Dire Claw"), - [MOVE_PSYSHIELD_BASH] = _("Psyshield Bash"), - [MOVE_POWER_SHIFT] = _("Power Shift"), - [MOVE_STONE_AXE] = _("Stone Axe"), - [MOVE_SPRINGTIDE_STORM] = _("Springtide Storm"), - [MOVE_MYSTICAL_POWER] = _("Mystical Power"), - [MOVE_RAGING_FURY] = _("Raging Fury"), - [MOVE_WAVE_CRASH] = _("Wave Crash"), - [MOVE_CHLOROBLAST] = _("Chloroblast"), - [MOVE_MOUNTAIN_GALE] = _("Mountain Gale"), - [MOVE_VICTORY_DANCE] = _("Victory Dance"), - [MOVE_HEADLONG_RUSH] = _("Headlong Rush"), - [MOVE_BARB_BARRAGE] = _("Barb Barrage"), - [MOVE_ESPER_WING] = _("Esper Wing"), - [MOVE_BITTER_MALICE] = _("Bitter Malice"), - [MOVE_SHELTER] = _("Shelter"), - [MOVE_TRIPLE_ARROWS] = _("Triple Arrows"), - [MOVE_INFERNAL_PARADE] = _("Infernal Parade"), - [MOVE_CEASELESS_EDGE] = _("Ceaseless Edge"), - [MOVE_BLEAKWIND_STORM] = _("Bleakwind Storm"), - [MOVE_WILDBOLT_STORM] = _("Wildbolt Storm"), - [MOVE_SANDSEAR_STORM] = _("Sandsear Storm"), - [MOVE_LUNAR_BLESSING] = _("Lunar Blessing"), - [MOVE_TAKE_HEART] = _("Take Heart"), - [MOVE_TERA_BLAST] = _("Tera Blast"), - [MOVE_SILK_TRAP] = _("Silk Trap"), - [MOVE_AXE_KICK] = _("Axe Kick"), - [MOVE_LAST_RESPECTS] = _("Last Respects"), - [MOVE_LUMINA_CRASH] = _("Lumina Crash"), - [MOVE_ORDER_UP] = _("Order Up"), - [MOVE_JET_PUNCH] = _("Jet Punch"), - [MOVE_SPICY_EXTRACT] = _("Spicy Extract"), - [MOVE_SPIN_OUT] = _("Spin Out"), - [MOVE_POPULATION_BOMB] = _("Population Bomb"), - [MOVE_ICE_SPINNER] = _("Ice Spinner"), - [MOVE_GLAIVE_RUSH] = _("Glaive Rush"), - [MOVE_REVIVAL_BLESSING] = _("Revival Blessing"), - [MOVE_SALT_CURE] = _("Salt Cure"), - [MOVE_TRIPLE_DIVE] = _("Triple Dive"), - [MOVE_MORTAL_SPIN] = _("Mortal Spin"), - [MOVE_DOODLE] = _("Doodle"), - [MOVE_FILLET_AWAY] = _("Fillet Away"), - [MOVE_KOWTOW_CLEAVE] = _("Kowtow Cleave"), - [MOVE_FLOWER_TRICK] = _("Flower Trick"), - [MOVE_TORCH_SONG] = _("Torch Song"), - [MOVE_AQUA_STEP] = _("Aqua Step"), - [MOVE_RAGING_BULL] = _("Raging Bull"), - [MOVE_MAKE_IT_RAIN] = _("Make It Rain"), - [MOVE_RUINATION] = _("Ruination"), - [MOVE_COLLISION_COURSE] = _("Collision Course"), - [MOVE_ELECTRO_DRIFT] = _("Electro Drift"), - [MOVE_SHED_TAIL] = _("Shed Tail"), - [MOVE_CHILLY_RECEPTION] = _("Chilly Reception"), - [MOVE_TIDY_UP] = _("Tidy Up"), - [MOVE_SNOWSCAPE] = _("Snowscape"), - [MOVE_POUNCE] = _("Pounce"), - [MOVE_TRAILBLAZE] = _("Trailblaze"), - [MOVE_CHILLING_WATER] = _("Chilling Water"), - [MOVE_HYPER_DRILL] = _("Hyper Drill"), - [MOVE_TWIN_BEAM] = _("Twin Beam"), - [MOVE_RAGE_FIST] = _("Rage Fist"), - [MOVE_ARMOR_CANNON] = _("Armor Cannon"), - [MOVE_BITTER_BLADE] = _("Bitter Blade"), - [MOVE_DOUBLE_SHOCK] = _("Double Shock"), - [MOVE_GIGATON_HAMMER] = _("Gigaton Hammer"), - [MOVE_COMEUPPANCE] = _("Comeuppance"), - [MOVE_AQUA_CUTTER] = _("Aqua Cutter"), - [MOVE_BLAZING_TORQUE] = _("Blazing Torque"), - [MOVE_WICKED_TORQUE] = _("Wicked Torque"), - [MOVE_NOXIOUS_TORQUE] = _("Noxious Torque"), - [MOVE_COMBAT_TORQUE] = _("Combat Torque"), - [MOVE_MAGICAL_TORQUE] = _("Magical Torque"), - [MOVE_PSYBLADE] = _("Psyblade"), - [MOVE_HYDRO_STEAM] = _("Hydro Steam"), - [MOVE_BLOOD_MOON] = _("Blood Moon"), - [MOVE_MATCHA_GOTCHA] = _("Matcha Gotcha"), - [MOVE_SYRUP_BOMB] = _("Syrup Bomb"), - [MOVE_IVY_CUDGEL] = _("Ivy Cudgel"), - [MOVE_ELECTRO_SHOT] = _("Electro Shot"), - [MOVE_TERA_STARSTORM] = _("Tera Starstorm"), - [MOVE_FICKLE_BEAM] = _("Fickle Beam"), - [MOVE_BURNING_BULWARK] = _("Burning Bulwark"), - [MOVE_THUNDERCLAP] = _("Thunderclap"), - [MOVE_MIGHTY_CLEAVE] = _("Mighty Cleave"), - [MOVE_TACHYON_CUTTER] = _("Tachyon Cutter"), - [MOVE_HARD_PRESS] = _("Hard Press"), - [MOVE_DRAGON_CHEER] = _("Dragon Cheer"), - [MOVE_ALLURING_VOICE] = _("Alluring Voice"), - [MOVE_TEMPER_FLARE] = _("Temper Flare"), - [MOVE_SUPERCELL_SLAM] = _("Supercell Slam"), - [MOVE_PSYCHIC_NOISE] = _("Psychic Noise"), - [MOVE_UPPER_HAND] = _("Upper Hand"), - [MOVE_MALIGNANT_CHAIN] = _("Malignant Chain"), - // Max Moves - [MOVE_MAX_GUARD] = _("Max Guard"), - [MOVE_MAX_STRIKE] = _("Max Strike"), - [MOVE_MAX_KNUCKLE] = _("Max Knuckle"), - [MOVE_MAX_AIRSTREAM] = _("Max Airstream"), - [MOVE_MAX_OOZE] = _("Max Ooze"), - [MOVE_MAX_QUAKE] = _("Max Quake"), - [MOVE_MAX_ROCKFALL] = _("Max Rockfall"), - [MOVE_MAX_FLUTTERBY] = _("Max Flutterby"), - [MOVE_MAX_PHANTASM] = _("Max Phantasm"), - [MOVE_MAX_STEELSPIKE] = _("Max Steelspike"), - [MOVE_MAX_FLARE] = _("Max Flare"), - [MOVE_MAX_GEYSER] = _("Max Geyser"), - [MOVE_MAX_OVERGROWTH] = _("Max Overgrowth"), - [MOVE_MAX_LIGHTNING] = _("Max Lightning"), - [MOVE_MAX_HAILSTORM] = _("Max Hailstorm"), - [MOVE_MAX_MINDSTORM] = _("Max Mindstorm"), - [MOVE_MAX_WYRMWIND] = _("Max Wyrmwind"), - [MOVE_MAX_DARKNESS] = _("Max Darkness"), - [MOVE_MAX_STARFALL] = _("Max Starfall"), - // Gigantamax Moves - [MOVE_G_MAX_VINE_LASH] = _("Gmax Vine Lash"), - [MOVE_G_MAX_WILDFIRE] = _("Gmax Wildfire"), - [MOVE_G_MAX_CANNONADE] = _("Gmax Cannonade"), - [MOVE_G_MAX_BEFUDDLE] = _("Gmax Befuddle"), - [MOVE_G_MAX_VOLT_CRASH] = _("Gmax Volt Crash"), - [MOVE_G_MAX_GOLD_RUSH] = _("Gmax Gold Rush"), - [MOVE_G_MAX_CHI_STRIKE] = _("Gmax Chi Strike"), - [MOVE_G_MAX_TERROR] = _("Gmax Terror"), - [MOVE_G_MAX_FOAM_BURST] = _("Gmax Foam Burst"), - [MOVE_G_MAX_RESONANCE] = _("Gmax Resonance"), - [MOVE_G_MAX_CUDDLE] = _("Gmax Cuddle"), - [MOVE_G_MAX_REPLENISH] = _("Gmax Replenish"), - [MOVE_G_MAX_MALODOR] = _("Gmax Malodor"), - [MOVE_G_MAX_MELTDOWN] = _("Gmax Meltdown"), - [MOVE_G_MAX_DRUM_SOLO] = _("Gmax Drum Solo"), - [MOVE_G_MAX_FIREBALL] = _("Gmax Fireball"), - [MOVE_G_MAX_HYDROSNIPE] = _("Gmax Hydrosnipe"), - [MOVE_G_MAX_WIND_RAGE] = _("Gmax Wind Rage"), - [MOVE_G_MAX_GRAVITAS] = _("Gmax Gravitas"), - [MOVE_G_MAX_STONESURGE] = _("Gmax Stonesurge"), - [MOVE_G_MAX_VOLCALITH] = _("Gmax Volcalith"), - [MOVE_G_MAX_TARTNESS] = _("Gmax Tartness"), - [MOVE_G_MAX_SWEETNESS] = _("Gmax Sweetness"), - [MOVE_G_MAX_SANDBLAST] = _("Gmax Sandblast"), - [MOVE_G_MAX_STUN_SHOCK] = _("Gmax Stun Shock"), - [MOVE_G_MAX_CENTIFERNO] = _("Gmax Centiferno"), - [MOVE_G_MAX_SMITE] = _("Gmax Smite"), - [MOVE_G_MAX_SNOOZE] = _("Gmax Snooze"), - [MOVE_G_MAX_FINALE] = _("Gmax Finale"), - [MOVE_G_MAX_STEELSURGE] = _("Gmax Steelsurge"), - [MOVE_G_MAX_DEPLETION] = _("Gmax Depletion"), - [MOVE_G_MAX_ONE_BLOW] = _("Gmax One Blow"), - [MOVE_G_MAX_RAPID_FLOW] = _("Gmax Rapid Flow"), -}; -#else -// 12 letters -const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1] = -{ - [MOVE_NONE] = _("-"), - [MOVE_POUND] = _("Pound"), - [MOVE_KARATE_CHOP] = _("Karate Chop"), - [MOVE_DOUBLE_SLAP] = _("Double Slap"), - [MOVE_COMET_PUNCH] = _("Comet Punch"), - [MOVE_MEGA_PUNCH] = _("Mega Punch"), - [MOVE_PAY_DAY] = _("Pay Day"), - [MOVE_FIRE_PUNCH] = _("Fire Punch"), - [MOVE_ICE_PUNCH] = _("Ice Punch"), - [MOVE_THUNDER_PUNCH] = _("ThunderPunch"), - [MOVE_SCRATCH] = _("Scratch"), - [MOVE_VISE_GRIP] = _("Vise Grip"), - [MOVE_GUILLOTINE] = _("Guillotine"), - [MOVE_RAZOR_WIND] = _("Razor Wind"), - [MOVE_SWORDS_DANCE] = _("Swords Dance"), - [MOVE_CUT] = _("Cut"), - [MOVE_GUST] = _("Gust"), - [MOVE_WING_ATTACK] = _("Wing Attack"), - [MOVE_WHIRLWIND] = _("Whirlwind"), - [MOVE_FLY] = _("Fly"), - [MOVE_BIND] = _("Bind"), - [MOVE_SLAM] = _("Slam"), - [MOVE_VINE_WHIP] = _("Vine Whip"), - [MOVE_STOMP] = _("Stomp"), - [MOVE_DOUBLE_KICK] = _("Double Kick"), - [MOVE_MEGA_KICK] = _("Mega Kick"), - [MOVE_JUMP_KICK] = _("Jump Kick"), - [MOVE_ROLLING_KICK] = _("Rolling Kick"), - [MOVE_SAND_ATTACK] = _("Sand Attack"), - [MOVE_HEADBUTT] = _("Headbutt"), - [MOVE_HORN_ATTACK] = _("Horn Attack"), - [MOVE_FURY_ATTACK] = _("Fury Attack"), - [MOVE_HORN_DRILL] = _("Horn Drill"), - [MOVE_TACKLE] = _("Tackle"), - [MOVE_BODY_SLAM] = _("Body Slam"), - [MOVE_WRAP] = _("Wrap"), - [MOVE_TAKE_DOWN] = _("Take Down"), - [MOVE_THRASH] = _("Thrash"), - [MOVE_DOUBLE_EDGE] = _("Double-Edge"), - [MOVE_TAIL_WHIP] = _("Tail Whip"), - [MOVE_POISON_STING] = _("Poison Sting"), - [MOVE_TWINEEDLE] = _("Twineedle"), - [MOVE_PIN_MISSILE] = _("Pin Missile"), - [MOVE_LEER] = _("Leer"), - [MOVE_BITE] = _("Bite"), - [MOVE_GROWL] = _("Growl"), - [MOVE_ROAR] = _("Roar"), - [MOVE_SING] = _("Sing"), - [MOVE_SUPERSONIC] = _("Supersonic"), - [MOVE_SONIC_BOOM] = _("Sonic Boom"), - [MOVE_DISABLE] = _("Disable"), - [MOVE_ACID] = _("Acid"), - [MOVE_EMBER] = _("Ember"), - [MOVE_FLAMETHROWER] = _("Flamethrower"), - [MOVE_MIST] = _("Mist"), - [MOVE_WATER_GUN] = _("Water Gun"), - [MOVE_HYDRO_PUMP] = _("Hydro Pump"), - [MOVE_SURF] = _("Surf"), - [MOVE_ICE_BEAM] = _("Ice Beam"), - [MOVE_BLIZZARD] = _("Blizzard"), - [MOVE_PSYBEAM] = _("Psybeam"), - [MOVE_BUBBLE_BEAM] = _("Bubble Beam"), - [MOVE_AURORA_BEAM] = _("Aurora Beam"), - [MOVE_HYPER_BEAM] = _("Hyper Beam"), - [MOVE_PECK] = _("Peck"), - [MOVE_DRILL_PECK] = _("Drill Peck"), - [MOVE_SUBMISSION] = _("Submission"), - [MOVE_LOW_KICK] = _("Low Kick"), - [MOVE_COUNTER] = _("Counter"), - [MOVE_SEISMIC_TOSS] = _("Seismic Toss"), - [MOVE_STRENGTH] = _("Strength"), - [MOVE_ABSORB] = _("Absorb"), - [MOVE_MEGA_DRAIN] = _("Mega Drain"), - [MOVE_LEECH_SEED] = _("Leech Seed"), - [MOVE_GROWTH] = _("Growth"), - [MOVE_RAZOR_LEAF] = _("Razor Leaf"), - [MOVE_SOLAR_BEAM] = _("Solar Beam"), - [MOVE_POISON_POWDER] = _("PoisonPowder"), - [MOVE_STUN_SPORE] = _("Stun Spore"), - [MOVE_SLEEP_POWDER] = _("Sleep Powder"), - [MOVE_PETAL_DANCE] = _("Petal Dance"), - [MOVE_STRING_SHOT] = _("String Shot"), - [MOVE_DRAGON_RAGE] = _("Dragon Rage"), - [MOVE_FIRE_SPIN] = _("Fire Spin"), - [MOVE_THUNDER_SHOCK] = _("ThunderShock"), - [MOVE_THUNDERBOLT] = _("Thunderbolt"), - [MOVE_THUNDER_WAVE] = _("Thunder Wave"), - [MOVE_THUNDER] = _("Thunder"), - [MOVE_ROCK_THROW] = _("Rock Throw"), - [MOVE_EARTHQUAKE] = _("Earthquake"), - [MOVE_FISSURE] = _("Fissure"), - [MOVE_DIG] = _("Dig"), - [MOVE_TOXIC] = _("Toxic"), - [MOVE_CONFUSION] = _("Confusion"), - [MOVE_PSYCHIC] = _("Psychic"), - [MOVE_HYPNOSIS] = _("Hypnosis"), - [MOVE_MEDITATE] = _("Meditate"), - [MOVE_AGILITY] = _("Agility"), - [MOVE_QUICK_ATTACK] = _("Quick Attack"), - [MOVE_RAGE] = _("Rage"), - [MOVE_TELEPORT] = _("Teleport"), - [MOVE_NIGHT_SHADE] = _("Night Shade"), - [MOVE_MIMIC] = _("Mimic"), - [MOVE_SCREECH] = _("Screech"), - [MOVE_DOUBLE_TEAM] = _("Double Team"), - [MOVE_RECOVER] = _("Recover"), - [MOVE_HARDEN] = _("Harden"), - [MOVE_MINIMIZE] = _("Minimize"), - [MOVE_SMOKESCREEN] = _("Smokescreen"), - [MOVE_CONFUSE_RAY] = _("Confuse Ray"), - [MOVE_WITHDRAW] = _("Withdraw"), - [MOVE_DEFENSE_CURL] = _("Defense Curl"), - [MOVE_BARRIER] = _("Barrier"), - [MOVE_LIGHT_SCREEN] = _("Light Screen"), - [MOVE_HAZE] = _("Haze"), - [MOVE_REFLECT] = _("Reflect"), - [MOVE_FOCUS_ENERGY] = _("Focus Energy"), - [MOVE_BIDE] = _("Bide"), - [MOVE_METRONOME] = _("Metronome"), - [MOVE_MIRROR_MOVE] = _("Mirror Move"), - [MOVE_SELF_DESTRUCT] = _("SelfDestruct"), - [MOVE_EGG_BOMB] = _("Egg Bomb"), - [MOVE_LICK] = _("Lick"), - [MOVE_SMOG] = _("Smog"), - [MOVE_SLUDGE] = _("Sludge"), - [MOVE_BONE_CLUB] = _("Bone Club"), - [MOVE_FIRE_BLAST] = _("Fire Blast"), - [MOVE_WATERFALL] = _("Waterfall"), - [MOVE_CLAMP] = _("Clamp"), - [MOVE_SWIFT] = _("Swift"), - [MOVE_SKULL_BASH] = _("Skull Bash"), - [MOVE_SPIKE_CANNON] = _("Spike Cannon"), - [MOVE_CONSTRICT] = _("Constrict"), - [MOVE_AMNESIA] = _("Amnesia"), - [MOVE_KINESIS] = _("Kinesis"), - [MOVE_SOFT_BOILED] = _("Soft-Boiled"), - [MOVE_HIGH_JUMP_KICK] = _("HighJumpKick"), - [MOVE_GLARE] = _("Glare"), - [MOVE_DREAM_EATER] = _("Dream Eater"), - [MOVE_POISON_GAS] = _("Poison Gas"), - [MOVE_BARRAGE] = _("Barrage"), - [MOVE_LEECH_LIFE] = _("Leech Life"), - [MOVE_LOVELY_KISS] = _("Lovely Kiss"), - [MOVE_SKY_ATTACK] = _("Sky Attack"), - [MOVE_TRANSFORM] = _("Transform"), - [MOVE_BUBBLE] = _("Bubble"), - [MOVE_DIZZY_PUNCH] = _("Dizzy Punch"), - [MOVE_SPORE] = _("Spore"), - [MOVE_FLASH] = _("Flash"), - [MOVE_PSYWAVE] = _("Psywave"), - [MOVE_SPLASH] = _("Splash"), - [MOVE_ACID_ARMOR] = _("Acid Armor"), - [MOVE_CRABHAMMER] = _("Crabhammer"), - [MOVE_EXPLOSION] = _("Explosion"), - [MOVE_FURY_SWIPES] = _("Fury Swipes"), - [MOVE_BONEMERANG] = _("Bonemerang"), - [MOVE_REST] = _("Rest"), - [MOVE_ROCK_SLIDE] = _("Rock Slide"), - [MOVE_HYPER_FANG] = _("Hyper Fang"), - [MOVE_SHARPEN] = _("Sharpen"), - [MOVE_CONVERSION] = _("Conversion"), - [MOVE_TRI_ATTACK] = _("Tri Attack"), - [MOVE_SUPER_FANG] = _("Super Fang"), - [MOVE_SLASH] = _("Slash"), - [MOVE_SUBSTITUTE] = _("Substitute"), - [MOVE_STRUGGLE] = _("Struggle"), - [MOVE_SKETCH] = _("Sketch"), - [MOVE_TRIPLE_KICK] = _("Triple Kick"), - [MOVE_THIEF] = _("Thief"), - [MOVE_SPIDER_WEB] = _("Spider Web"), - [MOVE_MIND_READER] = _("Mind Reader"), - [MOVE_NIGHTMARE] = _("Nightmare"), - [MOVE_FLAME_WHEEL] = _("Flame Wheel"), - [MOVE_SNORE] = _("Snore"), - [MOVE_CURSE] = _("Curse"), - [MOVE_FLAIL] = _("Flail"), - [MOVE_CONVERSION_2] = _("Conversion 2"), - [MOVE_AEROBLAST] = _("Aeroblast"), - [MOVE_COTTON_SPORE] = _("Cotton Spore"), - [MOVE_REVERSAL] = _("Reversal"), - [MOVE_SPITE] = _("Spite"), - [MOVE_POWDER_SNOW] = _("Powder Snow"), - [MOVE_PROTECT] = _("Protect"), - [MOVE_MACH_PUNCH] = _("Mach Punch"), - [MOVE_SCARY_FACE] = _("Scary Face"), - [MOVE_FEINT_ATTACK] = _("Feint Attack"), - [MOVE_SWEET_KISS] = _("Sweet Kiss"), - [MOVE_BELLY_DRUM] = _("Belly Drum"), - [MOVE_SLUDGE_BOMB] = _("Sludge Bomb"), - [MOVE_MUD_SLAP] = _("Mud-Slap"), - [MOVE_OCTAZOOKA] = _("Octazooka"), - [MOVE_SPIKES] = _("Spikes"), - [MOVE_ZAP_CANNON] = _("Zap Cannon"), - [MOVE_FORESIGHT] = _("Foresight"), - [MOVE_DESTINY_BOND] = _("Destiny Bond"), - [MOVE_PERISH_SONG] = _("Perish Song"), - [MOVE_ICY_WIND] = _("Icy Wind"), - [MOVE_DETECT] = _("Detect"), - [MOVE_BONE_RUSH] = _("Bone Rush"), - [MOVE_LOCK_ON] = _("Lock-On"), - [MOVE_OUTRAGE] = _("Outrage"), - [MOVE_SANDSTORM] = _("Sandstorm"), - [MOVE_GIGA_DRAIN] = _("Giga Drain"), - [MOVE_ENDURE] = _("Endure"), - [MOVE_CHARM] = _("Charm"), - [MOVE_ROLLOUT] = _("Rollout"), - [MOVE_FALSE_SWIPE] = _("False Swipe"), - [MOVE_SWAGGER] = _("Swagger"), - [MOVE_MILK_DRINK] = _("Milk Drink"), - [MOVE_SPARK] = _("Spark"), - [MOVE_FURY_CUTTER] = _("Fury Cutter"), - [MOVE_STEEL_WING] = _("Steel Wing"), - [MOVE_MEAN_LOOK] = _("Mean Look"), - [MOVE_ATTRACT] = _("Attract"), - [MOVE_SLEEP_TALK] = _("Sleep Talk"), - [MOVE_HEAL_BELL] = _("Heal Bell"), - [MOVE_RETURN] = _("Return"), - [MOVE_PRESENT] = _("Present"), - [MOVE_FRUSTRATION] = _("Frustration"), - [MOVE_SAFEGUARD] = _("Safeguard"), - [MOVE_PAIN_SPLIT] = _("Pain Split"), - [MOVE_SACRED_FIRE] = _("Sacred Fire"), - [MOVE_MAGNITUDE] = _("Magnitude"), - [MOVE_DYNAMIC_PUNCH] = _("DynamicPunch"), - [MOVE_MEGAHORN] = _("Megahorn"), - [MOVE_DRAGON_BREATH] = _("DragonBreath"), - [MOVE_BATON_PASS] = _("Baton Pass"), - [MOVE_ENCORE] = _("Encore"), - [MOVE_PURSUIT] = _("Pursuit"), - [MOVE_RAPID_SPIN] = _("Rapid Spin"), - [MOVE_SWEET_SCENT] = _("Sweet Scent"), - [MOVE_IRON_TAIL] = _("Iron Tail"), - [MOVE_METAL_CLAW] = _("Metal Claw"), - [MOVE_VITAL_THROW] = _("Vital Throw"), - [MOVE_MORNING_SUN] = _("Morning Sun"), - [MOVE_SYNTHESIS] = _("Synthesis"), - [MOVE_MOONLIGHT] = _("Moonlight"), - [MOVE_HIDDEN_POWER] = _("Hidden Power"), - [MOVE_CROSS_CHOP] = _("Cross Chop"), - [MOVE_TWISTER] = _("Twister"), - [MOVE_RAIN_DANCE] = _("Rain Dance"), - [MOVE_SUNNY_DAY] = _("Sunny Day"), - [MOVE_CRUNCH] = _("Crunch"), - [MOVE_MIRROR_COAT] = _("Mirror Coat"), - [MOVE_PSYCH_UP] = _("Psych Up"), - [MOVE_EXTREME_SPEED] = _("ExtremeSpeed"), - [MOVE_ANCIENT_POWER] = _("AncientPower"), - [MOVE_SHADOW_BALL] = _("Shadow Ball"), - [MOVE_FUTURE_SIGHT] = _("Future Sight"), - [MOVE_ROCK_SMASH] = _("Rock Smash"), - [MOVE_WHIRLPOOL] = _("Whirlpool"), - [MOVE_BEAT_UP] = _("Beat Up"), - [MOVE_FAKE_OUT] = _("Fake Out"), - [MOVE_UPROAR] = _("Uproar"), - [MOVE_STOCKPILE] = _("Stockpile"), - [MOVE_SPIT_UP] = _("Spit Up"), - [MOVE_SWALLOW] = _("Swallow"), - [MOVE_HEAT_WAVE] = _("Heat Wave"), - [MOVE_HAIL] = _("Hail"), - [MOVE_TORMENT] = _("Torment"), - [MOVE_FLATTER] = _("Flatter"), - [MOVE_WILL_O_WISP] = _("Will-o-Wisp"), - [MOVE_MEMENTO] = _("Memento"), - [MOVE_FACADE] = _("Facade"), - [MOVE_FOCUS_PUNCH] = _("Focus Punch"), - [MOVE_SMELLING_SALTS] = _("SmellngSalts"), - [MOVE_FOLLOW_ME] = _("Follow Me"), - [MOVE_NATURE_POWER] = _("Nature Power"), - [MOVE_CHARGE] = _("Charge"), - [MOVE_TAUNT] = _("Taunt"), - [MOVE_HELPING_HAND] = _("Helping Hand"), - [MOVE_TRICK] = _("Trick"), - [MOVE_ROLE_PLAY] = _("Role Play"), - [MOVE_WISH] = _("Wish"), - [MOVE_ASSIST] = _("Assist"), - [MOVE_INGRAIN] = _("Ingrain"), - [MOVE_SUPERPOWER] = _("Superpower"), - [MOVE_MAGIC_COAT] = _("Magic Coat"), - [MOVE_RECYCLE] = _("Recycle"), - [MOVE_REVENGE] = _("Revenge"), - [MOVE_BRICK_BREAK] = _("Brick Break"), - [MOVE_YAWN] = _("Yawn"), - [MOVE_KNOCK_OFF] = _("Knock Off"), - [MOVE_ENDEAVOR] = _("Endeavor"), - [MOVE_ERUPTION] = _("Eruption"), - [MOVE_SKILL_SWAP] = _("Skill Swap"), - [MOVE_IMPRISON] = _("Imprison"), - [MOVE_REFRESH] = _("Refresh"), - [MOVE_GRUDGE] = _("Grudge"), - [MOVE_SNATCH] = _("Snatch"), - [MOVE_SECRET_POWER] = _("Secret Power"), - [MOVE_DIVE] = _("Dive"), - [MOVE_ARM_THRUST] = _("Arm Thrust"), - [MOVE_CAMOUFLAGE] = _("Camouflage"), - [MOVE_TAIL_GLOW] = _("Tail Glow"), - [MOVE_LUSTER_PURGE] = _("Luster Purge"), - [MOVE_MIST_BALL] = _("Mist Ball"), - [MOVE_FEATHER_DANCE] = _("FeatherDance"), - [MOVE_TEETER_DANCE] = _("Teeter Dance"), - [MOVE_BLAZE_KICK] = _("Blaze Kick"), - [MOVE_MUD_SPORT] = _("Mud Sport"), - [MOVE_ICE_BALL] = _("Ice Ball"), - [MOVE_NEEDLE_ARM] = _("Needle Arm"), - [MOVE_SLACK_OFF] = _("Slack Off"), - [MOVE_HYPER_VOICE] = _("Hyper Voice"), - [MOVE_POISON_FANG] = _("Poison Fang"), - [MOVE_CRUSH_CLAW] = _("Crush Claw"), - [MOVE_BLAST_BURN] = _("Blast Burn"), - [MOVE_HYDRO_CANNON] = _("Hydro Cannon"), - [MOVE_METEOR_MASH] = _("Meteor Mash"), - [MOVE_ASTONISH] = _("Astonish"), - [MOVE_WEATHER_BALL] = _("Weather Ball"), - [MOVE_AROMATHERAPY] = _("Aromatherapy"), - [MOVE_FAKE_TEARS] = _("Fake Tears"), - [MOVE_AIR_CUTTER] = _("Air Cutter"), - [MOVE_OVERHEAT] = _("Overheat"), - [MOVE_ODOR_SLEUTH] = _("Odor Sleuth"), - [MOVE_ROCK_TOMB] = _("Rock Tomb"), - [MOVE_SILVER_WIND] = _("Silver Wind"), - [MOVE_METAL_SOUND] = _("Metal Sound"), - [MOVE_GRASS_WHISTLE] = _("GrassWhistle"), - [MOVE_TICKLE] = _("Tickle"), - [MOVE_COSMIC_POWER] = _("Cosmic Power"), - [MOVE_WATER_SPOUT] = _("Water Spout"), - [MOVE_SIGNAL_BEAM] = _("Signal Beam"), - [MOVE_SHADOW_PUNCH] = _("Shadow Punch"), - [MOVE_EXTRASENSORY] = _("Extrasensory"), - [MOVE_SKY_UPPERCUT] = _("Sky Uppercut"), - [MOVE_SAND_TOMB] = _("Sand Tomb"), - [MOVE_SHEER_COLD] = _("Sheer Cold"), - [MOVE_MUDDY_WATER] = _("Muddy Water"), - [MOVE_BULLET_SEED] = _("Bullet Seed"), - [MOVE_AERIAL_ACE] = _("Aerial Ace"), - [MOVE_ICICLE_SPEAR] = _("Icicle Spear"), - [MOVE_IRON_DEFENSE] = _("Iron Defense"), - [MOVE_BLOCK] = _("Block"), - [MOVE_HOWL] = _("Howl"), - [MOVE_DRAGON_CLAW] = _("Dragon Claw"), - [MOVE_FRENZY_PLANT] = _("Frenzy Plant"), - [MOVE_BULK_UP] = _("Bulk Up"), - [MOVE_BOUNCE] = _("Bounce"), - [MOVE_MUD_SHOT] = _("Mud Shot"), - [MOVE_POISON_TAIL] = _("Poison Tail"), - [MOVE_COVET] = _("Covet"), - [MOVE_VOLT_TACKLE] = _("Volt Tackle"), - [MOVE_MAGICAL_LEAF] = _("Magical Leaf"), - [MOVE_WATER_SPORT] = _("Water Sport"), - [MOVE_CALM_MIND] = _("Calm Mind"), - [MOVE_LEAF_BLADE] = _("Leaf Blade"), - [MOVE_DRAGON_DANCE] = _("Dragon Dance"), - [MOVE_ROCK_BLAST] = _("Rock Blast"), - [MOVE_SHOCK_WAVE] = _("Shock Wave"), - [MOVE_WATER_PULSE] = _("Water Pulse"), - [MOVE_DOOM_DESIRE] = _("Doom Desire"), - [MOVE_PSYCHO_BOOST] = _("Psycho Boost"), - [MOVE_ROOST] = _("Roost"), - [MOVE_GRAVITY] = _("Gravity"), - [MOVE_MIRACLE_EYE] = _("Miracle Eye"), - [MOVE_WAKE_UP_SLAP] = _("Wake-Up Slap"), - [MOVE_HAMMER_ARM] = _("Hammer Arm"), - [MOVE_GYRO_BALL] = _("Gyro Ball"), - [MOVE_HEALING_WISH] = _("Healing Wish"), - [MOVE_BRINE] = _("Brine"), - [MOVE_NATURAL_GIFT] = _("Natural Gift"), - [MOVE_FEINT] = _("Feint"), - [MOVE_PLUCK] = _("Pluck"), - [MOVE_TAILWIND] = _("Tailwind"), - [MOVE_ACUPRESSURE] = _("Acupressure"), - [MOVE_METAL_BURST] = _("Metal Burst"), - [MOVE_U_TURN] = _("U-turn"), - [MOVE_CLOSE_COMBAT] = _("Close Combat"), - [MOVE_PAYBACK] = _("Payback"), - [MOVE_ASSURANCE] = _("Assurance"), - [MOVE_EMBARGO] = _("Embargo"), - [MOVE_FLING] = _("Fling"), - [MOVE_PSYCHO_SHIFT] = _("Psycho Shift"), - [MOVE_TRUMP_CARD] = _("Trump Card"), - [MOVE_HEAL_BLOCK] = _("Heal Block"), - [MOVE_WRING_OUT] = _("Wring Out"), - [MOVE_POWER_TRICK] = _("Power Trick"), - [MOVE_GASTRO_ACID] = _("Gastro Acid"), - [MOVE_LUCKY_CHANT] = _("Lucky Chant"), - [MOVE_ME_FIRST] = _("Me First"), - [MOVE_COPYCAT] = _("Copycat"), - [MOVE_POWER_SWAP] = _("Power Swap"), - [MOVE_GUARD_SWAP] = _("Guard Swap"), - [MOVE_PUNISHMENT] = _("Punishment"), - [MOVE_LAST_RESORT] = _("Last Resort"), - [MOVE_WORRY_SEED] = _("Worry Seed"), - [MOVE_SUCKER_PUNCH] = _("Sucker Punch"), - [MOVE_TOXIC_SPIKES] = _("Toxic Spikes"), - [MOVE_HEART_SWAP] = _("Heart Swap"), - [MOVE_AQUA_RING] = _("Aqua Ring"), - [MOVE_MAGNET_RISE] = _("Magnet Rise"), - [MOVE_FLARE_BLITZ] = _("Flare Blitz"), - [MOVE_FORCE_PALM] = _("Force Palm"), - [MOVE_AURA_SPHERE] = _("Aura Sphere"), - [MOVE_ROCK_POLISH] = _("Rock Polish"), - [MOVE_POISON_JAB] = _("Poison Jab"), - [MOVE_DARK_PULSE] = _("Dark Pulse"), - [MOVE_NIGHT_SLASH] = _("Night Slash"), - [MOVE_AQUA_TAIL] = _("Aqua Tail"), - [MOVE_SEED_BOMB] = _("Seed Bomb"), - [MOVE_AIR_SLASH] = _("Air Slash"), - [MOVE_X_SCISSOR] = _("X-Scissor"), - [MOVE_BUG_BUZZ] = _("Bug Buzz"), - [MOVE_DRAGON_PULSE] = _("Dragon Pulse"), - [MOVE_DRAGON_RUSH] = _("Dragon Rush"), - [MOVE_POWER_GEM] = _("Power Gem"), - [MOVE_DRAIN_PUNCH] = _("Drain Punch"), - [MOVE_VACUUM_WAVE] = _("Vacuum Wave"), - [MOVE_FOCUS_BLAST] = _("Focus Blast"), - [MOVE_ENERGY_BALL] = _("Energy Ball"), - [MOVE_BRAVE_BIRD] = _("Brave Bird"), - [MOVE_EARTH_POWER] = _("Earth Power"), - [MOVE_SWITCHEROO] = _("Switcheroo"), - [MOVE_GIGA_IMPACT] = _("Giga Impact"), - [MOVE_NASTY_PLOT] = _("Nasty Plot"), - [MOVE_BULLET_PUNCH] = _("Bullet Punch"), - [MOVE_AVALANCHE] = _("Avalanche"), - [MOVE_ICE_SHARD] = _("Ice Shard"), - [MOVE_SHADOW_CLAW] = _("Shadow Claw"), - [MOVE_THUNDER_FANG] = _("Thunder Fang"), - [MOVE_ICE_FANG] = _("Ice Fang"), - [MOVE_FIRE_FANG] = _("Fire Fang"), - [MOVE_SHADOW_SNEAK] = _("Shadow Sneak"), - [MOVE_MUD_BOMB] = _("Mud Bomb"), - [MOVE_PSYCHO_CUT] = _("Psycho Cut"), - [MOVE_ZEN_HEADBUTT] = _("Zen Headbutt"), - [MOVE_MIRROR_SHOT] = _("Mirror Shot"), - [MOVE_FLASH_CANNON] = _("Flash Cannon"), - [MOVE_ROCK_CLIMB] = _("Rock Climb"), - [MOVE_DEFOG] = _("Defog"), - [MOVE_TRICK_ROOM] = _("Trick Room"), - [MOVE_DRACO_METEOR] = _("Draco Meteor"), - [MOVE_DISCHARGE] = _("Discharge"), - [MOVE_LAVA_PLUME] = _("Lava Plume"), - [MOVE_LEAF_STORM] = _("Leaf Storm"), - [MOVE_POWER_WHIP] = _("Power Whip"), - [MOVE_ROCK_WRECKER] = _("Rock Wrecker"), - [MOVE_CROSS_POISON] = _("Cross Poison"), - [MOVE_GUNK_SHOT] = _("Gunk Shot"), - [MOVE_IRON_HEAD] = _("Iron Head"), - [MOVE_MAGNET_BOMB] = _("Magnet Bomb"), - [MOVE_STONE_EDGE] = _("Stone Edge"), - [MOVE_CAPTIVATE] = _("Captivate"), - [MOVE_STEALTH_ROCK] = _("Stealth Rock"), - [MOVE_GRASS_KNOT] = _("Grass Knot"), - [MOVE_CHATTER] = _("Chatter"), - [MOVE_JUDGMENT] = _("Judgment"), - [MOVE_BUG_BITE] = _("Bug Bite"), - [MOVE_CHARGE_BEAM] = _("Charge Beam"), - [MOVE_WOOD_HAMMER] = _("Wood Hammer"), - [MOVE_AQUA_JET] = _("Aqua Jet"), - [MOVE_ATTACK_ORDER] = _("Attack Order"), - [MOVE_DEFEND_ORDER] = _("Defend Order"), - [MOVE_HEAL_ORDER] = _("Heal Order"), - [MOVE_HEAD_SMASH] = _("Head Smash"), - [MOVE_DOUBLE_HIT] = _("Double Hit"), - [MOVE_ROAR_OF_TIME] = _("Roar of Time"), - [MOVE_SPACIAL_REND] = _("Spacial Rend"), - [MOVE_LUNAR_DANCE] = _("Lunar Dance"), - [MOVE_CRUSH_GRIP] = _("Crush Grip"), - [MOVE_MAGMA_STORM] = _("Magma Storm"), - [MOVE_DARK_VOID] = _("Dark Void"), - [MOVE_SEED_FLARE] = _("Seed Flare"), - [MOVE_OMINOUS_WIND] = _("Ominous Wind"), - [MOVE_SHADOW_FORCE] = _("Shadow Force"), - [MOVE_HONE_CLAWS] = _("Hone Claws"), - [MOVE_WIDE_GUARD] = _("Wide Guard"), - [MOVE_GUARD_SPLIT] = _("Guard Split"), - [MOVE_POWER_SPLIT] = _("Power Split"), - [MOVE_WONDER_ROOM] = _("Wonder Room"), - [MOVE_PSYSHOCK] = _("Psyshock"), - [MOVE_VENOSHOCK] = _("Venoshock"), - [MOVE_AUTOTOMIZE] = _("Autotomize"), - [MOVE_RAGE_POWDER] = _("Rage Powder"), - [MOVE_TELEKINESIS] = _("Telekinesis"), - [MOVE_MAGIC_ROOM] = _("Magic Room"), - [MOVE_SMACK_DOWN] = _("Smack Down"), - [MOVE_STORM_THROW] = _("Storm Throw"), - [MOVE_FLAME_BURST] = _("Flame Burst"), - [MOVE_SLUDGE_WAVE] = _("Sludge Wave"), - [MOVE_QUIVER_DANCE] = _("Quiver Dance"), - [MOVE_HEAVY_SLAM] = _("Heavy Slam"), - [MOVE_SYNCHRONOISE] = _("Synchronoise"), - [MOVE_ELECTRO_BALL] = _("Electro Ball"), - [MOVE_SOAK] = _("Soak"), - [MOVE_FLAME_CHARGE] = _("Flame Charge"), - [MOVE_COIL] = _("Coil"), - [MOVE_LOW_SWEEP] = _("Low Sweep"), - [MOVE_ACID_SPRAY] = _("Acid Spray"), - [MOVE_FOUL_PLAY] = _("Foul Play"), - [MOVE_SIMPLE_BEAM] = _("Simple Beam"), - [MOVE_ENTRAINMENT] = _("Entrainment"), - [MOVE_AFTER_YOU] = _("After You"), - [MOVE_ROUND] = _("Round"), - [MOVE_ECHOED_VOICE] = _("Echoed Voice"), - [MOVE_CHIP_AWAY] = _("Chip Away"), - [MOVE_CLEAR_SMOG] = _("Clear Smog"), - [MOVE_STORED_POWER] = _("Stored Power"), - [MOVE_QUICK_GUARD] = _("Quick Guard"), - [MOVE_ALLY_SWITCH] = _("Ally Switch"), - [MOVE_SCALD] = _("Scald"), - [MOVE_SHELL_SMASH] = _("Shell Smash"), - [MOVE_HEAL_PULSE] = _("Heal Pulse"), - [MOVE_HEX] = _("Hex"), - [MOVE_SKY_DROP] = _("Sky Drop"), - [MOVE_SHIFT_GEAR] = _("Shift Gear"), - [MOVE_CIRCLE_THROW] = _("Circle Throw"), - [MOVE_INCINERATE] = _("Incinerate"), - [MOVE_QUASH] = _("Quash"), - [MOVE_ACROBATICS] = _("Acrobatics"), - [MOVE_REFLECT_TYPE] = _("Reflect Type"), - [MOVE_RETALIATE] = _("Retaliate"), - [MOVE_FINAL_GAMBIT] = _("Final Gambit"), - [MOVE_BESTOW] = _("Bestow"), - [MOVE_INFERNO] = _("Inferno"), - [MOVE_WATER_PLEDGE] = _("Water Pledge"), - [MOVE_FIRE_PLEDGE] = _("Fire Pledge"), - [MOVE_GRASS_PLEDGE] = _("Grass Pledge"), - [MOVE_VOLT_SWITCH] = _("Volt Switch"), - [MOVE_STRUGGLE_BUG] = _("Struggle Bug"), - [MOVE_BULLDOZE] = _("Bulldoze"), - [MOVE_FROST_BREATH] = _("Frost Breath"), - [MOVE_DRAGON_TAIL] = _("Dragon Tail"), - [MOVE_WORK_UP] = _("Work Up"), - [MOVE_ELECTROWEB] = _("Electroweb"), - [MOVE_WILD_CHARGE] = _("Wild Charge"), - [MOVE_DRILL_RUN] = _("Drill Run"), - [MOVE_DUAL_CHOP] = _("Dual Chop"), - [MOVE_HEART_STAMP] = _("Heart Stamp"), - [MOVE_HORN_LEECH] = _("Horn Leech"), - [MOVE_SACRED_SWORD] = _("Sacred Sword"), - [MOVE_RAZOR_SHELL] = _("Razor Shell"), - [MOVE_HEAT_CRASH] = _("Heat Crash"), - [MOVE_LEAF_TORNADO] = _("Leaf Tornado"), - [MOVE_STEAMROLLER] = _("Steamroller"), - [MOVE_COTTON_GUARD] = _("Cotton Guard"), - [MOVE_NIGHT_DAZE] = _("Night Daze"), - [MOVE_PSYSTRIKE] = _("Psystrike"), - [MOVE_TAIL_SLAP] = _("Tail Slap"), - [MOVE_HURRICANE] = _("Hurricane"), - [MOVE_HEAD_CHARGE] = _("Head Charge"), - [MOVE_GEAR_GRIND] = _("Gear Grind"), - [MOVE_SEARING_SHOT] = _("Searing Shot"), - [MOVE_TECHNO_BLAST] = _("Techno Blast"), - [MOVE_RELIC_SONG] = _("Relic Song"), - [MOVE_SECRET_SWORD] = _("Secret Sword"), - [MOVE_GLACIATE] = _("Glaciate"), - [MOVE_BOLT_STRIKE] = _("Bolt Strike"), - [MOVE_BLUE_FLARE] = _("Blue Flare"), - [MOVE_FIERY_DANCE] = _("Fiery Dance"), - [MOVE_FREEZE_SHOCK] = _("Freeze Shock"), - [MOVE_ICE_BURN] = _("Ice Burn"), - [MOVE_SNARL] = _("Snarl"), - [MOVE_ICICLE_CRASH] = _("Icicle Crash"), - [MOVE_V_CREATE] = _("V-create"), - [MOVE_FUSION_FLARE] = _("Fusion Flare"), - [MOVE_FUSION_BOLT] = _("Fusion Bolt"), - [MOVE_FLYING_PRESS] = _("Flying Press"), - [MOVE_MAT_BLOCK] = _("Mat Block"), - [MOVE_BELCH] = _("Belch"), - [MOVE_ROTOTILLER] = _("Rototiller"), - [MOVE_STICKY_WEB] = _("Sticky Web"), - [MOVE_FELL_STINGER] = _("Fell Stinger"), - [MOVE_PHANTOM_FORCE] = _("PhantomForce"), - [MOVE_TRICK_OR_TREAT] = _("TrickOrTreat"), - [MOVE_NOBLE_ROAR] = _("Noble Roar"), - [MOVE_ION_DELUGE] = _("Ion Deluge"), - [MOVE_PARABOLIC_CHARGE] = _("ParabolcChrg"), - [MOVE_FORESTS_CURSE] = _("Forest'sCurs"), - [MOVE_PETAL_BLIZZARD] = _("PetalBlizzrd"), - [MOVE_FREEZE_DRY] = _("Freeze-Dry"), - [MOVE_DISARMING_VOICE] = _("DisrmngVoice"), - [MOVE_PARTING_SHOT] = _("Parting Shot"), - [MOVE_TOPSY_TURVY] = _("Topsy-Turvy"), - [MOVE_DRAINING_KISS] = _("DrainingKiss"), - [MOVE_CRAFTY_SHIELD] = _("CraftyShield"), - [MOVE_FLOWER_SHIELD] = _("FlowerShield"), - [MOVE_GRASSY_TERRAIN] = _("GrssyTerrain"), - [MOVE_MISTY_TERRAIN] = _("MistyTerrain"), - [MOVE_ELECTRIFY] = _("Electrify"), - [MOVE_PLAY_ROUGH] = _("Play Rough"), - [MOVE_FAIRY_WIND] = _("Fairy Wind"), - [MOVE_MOONBLAST] = _("Moonblast"), - [MOVE_BOOMBURST] = _("Boomburst"), - [MOVE_FAIRY_LOCK] = _("Fairy Lock"), - [MOVE_KINGS_SHIELD] = _("King'sShield"), - [MOVE_PLAY_NICE] = _("Play Nice"), - [MOVE_CONFIDE] = _("Confide"), - [MOVE_DIAMOND_STORM] = _("DiamondStorm"), - [MOVE_STEAM_ERUPTION] = _("SteamErption"), - [MOVE_HYPERSPACE_HOLE] = _("HyprspceHole"), - [MOVE_WATER_SHURIKEN] = _("WatrShuriken"), - [MOVE_MYSTICAL_FIRE] = _("MysticalFire"), - [MOVE_SPIKY_SHIELD] = _("Spiky Shield"), - [MOVE_AROMATIC_MIST] = _("AromaticMist"), - [MOVE_EERIE_IMPULSE] = _("EerieImpulse"), - [MOVE_VENOM_DRENCH] = _("Venom Drench"), - [MOVE_POWDER] = _("Powder"), - [MOVE_GEOMANCY] = _("Geomancy"), - [MOVE_MAGNETIC_FLUX] = _("MagneticFlux"), - [MOVE_HAPPY_HOUR] = _("Happy Hour"), - [MOVE_ELECTRIC_TERRAIN] = _("ElctrcTrrain"), - [MOVE_DAZZLING_GLEAM] = _("DazzlngGleam"), - [MOVE_CELEBRATE] = _("Celebrate"), - [MOVE_HOLD_HANDS] = _("Hold Hands"), - [MOVE_BABY_DOLL_EYES] = _("BabyDollEyes"), - [MOVE_NUZZLE] = _("Nuzzle"), - [MOVE_HOLD_BACK] = _("Hold Back"), - [MOVE_INFESTATION] = _("Infestation"), - [MOVE_POWER_UP_PUNCH] = _("PowerUpPunch"), - [MOVE_OBLIVION_WING] = _("OblivionWing"), - [MOVE_THOUSAND_ARROWS] = _("ThousndArrws"), - [MOVE_THOUSAND_WAVES] = _("ThousndWaves"), - [MOVE_LANDS_WRATH] = _("Land's Wrath"), - [MOVE_LIGHT_OF_RUIN] = _("LightOfRuin"), - [MOVE_ORIGIN_PULSE] = _("Origin Pulse"), - [MOVE_PRECIPICE_BLADES] = _("PrcipceBldes"), - [MOVE_DRAGON_ASCENT] = _("DragonAscent"), - [MOVE_HYPERSPACE_FURY] = _("HyprspceFury"), - [MOVE_SHORE_UP] = _("Shore Up"), - [MOVE_FIRST_IMPRESSION] = _("FrstImpressn"), - [MOVE_BANEFUL_BUNKER] = _("BanefulBunkr"), - [MOVE_SPIRIT_SHACKLE] = _("SpiritShackl"), - [MOVE_DARKEST_LARIAT] = _("DarkstLariat"), - [MOVE_SPARKLING_ARIA] = _("SparklngAria"), - [MOVE_ICE_HAMMER] = _("Ice Hammer"), - [MOVE_FLORAL_HEALING] = _("FloralHealng"), - [MOVE_HIGH_HORSEPOWER] = _("HighHorsepwr"), - [MOVE_STRENGTH_SAP] = _("Strength Sap"), - [MOVE_SOLAR_BLADE] = _("Solar Blade"), - [MOVE_LEAFAGE] = _("Leafage"), - [MOVE_SPOTLIGHT] = _("Spotlight"), - [MOVE_TOXIC_THREAD] = _("Toxic Thread"), - [MOVE_LASER_FOCUS] = _("Laser Focus"), - [MOVE_GEAR_UP] = _("Gear Up"), - [MOVE_THROAT_CHOP] = _("Throat Chop"), - [MOVE_POLLEN_PUFF] = _("Pollen Puff"), - [MOVE_ANCHOR_SHOT] = _("Anchor Shot"), - [MOVE_PSYCHIC_TERRAIN] = _("PsychcTrrain"), - [MOVE_LUNGE] = _("Lunge"), - [MOVE_FIRE_LASH] = _("Fire Lash"), - [MOVE_POWER_TRIP] = _("Power Trip"), - [MOVE_BURN_UP] = _("Burn Up"), - [MOVE_SPEED_SWAP] = _("Speed Swap"), - [MOVE_SMART_STRIKE] = _("Smart Strike"), - [MOVE_PURIFY] = _("Purify"), - [MOVE_REVELATION_DANCE] = _("RvlationDnce"), - [MOVE_CORE_ENFORCER] = _("CoreEnforcer"), - [MOVE_TROP_KICK] = _("Trop Kick"), - [MOVE_INSTRUCT] = _("Instruct"), - [MOVE_BEAK_BLAST] = _("Beak Blast"), - [MOVE_CLANGING_SCALES] = _("ClngngScales"), - [MOVE_DRAGON_HAMMER] = _("DragonHammer"), - [MOVE_BRUTAL_SWING] = _("Brutal Swing"), - [MOVE_AURORA_VEIL] = _("Aurora Veil"), - [MOVE_SHELL_TRAP] = _("Shell Trap"), - [MOVE_FLEUR_CANNON] = _("Fleur Cannon"), - [MOVE_PSYCHIC_FANGS] = _("PsychicFangs"), - [MOVE_STOMPING_TANTRUM] = _("StmpngTantrm"), - [MOVE_SHADOW_BONE] = _("Shadow Bone"), - [MOVE_ACCELEROCK] = _("Accelerock"), - [MOVE_LIQUIDATION] = _("Liquidation"), - [MOVE_PRISMATIC_LASER] = _("PrsmaticLasr"), - [MOVE_SPECTRAL_THIEF] = _("SpectrlThief"), - [MOVE_SUNSTEEL_STRIKE] = _("SnsteelStrke"), - [MOVE_MOONGEIST_BEAM] = _("MoongestBeam"), - [MOVE_TEARFUL_LOOK] = _("Tearful Look"), - [MOVE_ZING_ZAP] = _("Zing Zap"), - [MOVE_NATURES_MADNESS] = _("Natur'sMadns"), - [MOVE_MULTI_ATTACK] = _("Multi-Attack"), - [MOVE_MIND_BLOWN] = _("Mind Blown"), - [MOVE_PLASMA_FISTS] = _("Plasma Fists"), - [MOVE_PHOTON_GEYSER] = _("PhotonGeyser"), - [MOVE_ZIPPY_ZAP] = _("Zippy Zap"), - [MOVE_SPLISHY_SPLASH] = _("SplishySplsh"), - [MOVE_FLOATY_FALL] = _("Floaty Fall"), - [MOVE_PIKA_PAPOW] = _("Pika Papow"), - [MOVE_BOUNCY_BUBBLE] = _("BouncyBubble"), - [MOVE_BUZZY_BUZZ] = _("Buzzy Buzz"), - [MOVE_SIZZLY_SLIDE] = _("Sizzly Slide"), - [MOVE_GLITZY_GLOW] = _("Glitzy Glow"), - [MOVE_BADDY_BAD] = _("Baddy Bad"), - [MOVE_SAPPY_SEED] = _("Sappy Seed"), - [MOVE_FREEZY_FROST] = _("Freezy Frost"), - [MOVE_SPARKLY_SWIRL] = _("SparklySwirl"), - [MOVE_VEEVEE_VOLLEY] = _("VeeveeVolley"), - [MOVE_DOUBLE_IRON_BASH] = _("DublIronBash"), - [MOVE_DYNAMAX_CANNON] = _("DynamxCannon"), - [MOVE_SNIPE_SHOT] = _("Snipe Shot"), - [MOVE_JAW_LOCK] = _("Jaw Lock"), - [MOVE_STUFF_CHEEKS] = _("Stuff Cheeks"), - [MOVE_NO_RETREAT] = _("No Retreat"), - [MOVE_TAR_SHOT] = _("Tar Shot"), - [MOVE_MAGIC_POWDER] = _("Magic Powder"), - [MOVE_DRAGON_DARTS] = _("Dragon Darts"), - [MOVE_TEATIME] = _("Teatime"), - [MOVE_OCTOLOCK] = _("Octolock"), - [MOVE_BOLT_BEAK] = _("Bolt Beak"), - [MOVE_FISHIOUS_REND] = _("FishiousRend"), - [MOVE_COURT_CHANGE] = _("Court Change"), - [MOVE_CLANGOROUS_SOUL] = _("ClngrousSoul"), - [MOVE_BODY_PRESS] = _("Body Press"), - [MOVE_DECORATE] = _("Decorate"), - [MOVE_DRUM_BEATING] = _("Drum Beating"), - [MOVE_SNAP_TRAP] = _("Snap Trap"), - [MOVE_PYRO_BALL] = _("Pyro Ball"), - [MOVE_BEHEMOTH_BLADE] = _("BehemthBlade"), - [MOVE_BEHEMOTH_BASH] = _("BehemothBash"), - [MOVE_AURA_WHEEL] = _("Aura Wheel"), - [MOVE_BREAKING_SWIPE] = _("BreakngSwipe"), - [MOVE_BRANCH_POKE] = _("Branch Poke"), - [MOVE_OVERDRIVE] = _("Overdrive"), - [MOVE_APPLE_ACID] = _("Apple Acid"), - [MOVE_GRAV_APPLE] = _("Grav Apple"), - [MOVE_SPIRIT_BREAK] = _("Spirit Break"), - [MOVE_STRANGE_STEAM] = _("StrangeSteam"), - [MOVE_LIFE_DEW] = _("Life Dew"), - [MOVE_OBSTRUCT] = _("Obstruct"), - [MOVE_FALSE_SURRENDER] = _("FalsSurrendr"), - [MOVE_METEOR_ASSAULT] = _("MeteorAssalt"), - [MOVE_ETERNABEAM] = _("Eternabeam"), - [MOVE_STEEL_BEAM] = _("Steel Beam"), - [MOVE_EXPANDING_FORCE] = _("ExpandngForc"), - [MOVE_STEEL_ROLLER] = _("Steel Roller"), - [MOVE_SCALE_SHOT] = _("Scale Shot"), - [MOVE_METEOR_BEAM] = _("Meteor Beam"), - [MOVE_SHELL_SIDE_ARM] = _("ShellSideArm"), - [MOVE_MISTY_EXPLOSION] = _("MstyExplsion"), - [MOVE_GRASSY_GLIDE] = _("Grassy Glide"), - [MOVE_RISING_VOLTAGE] = _("RisngVoltage"), - [MOVE_TERRAIN_PULSE] = _("TerrainPulse"), - [MOVE_SKITTER_SMACK] = _("SkitterSmack"), - [MOVE_BURNING_JEALOUSY] = _("BrningJelosy"), - [MOVE_LASH_OUT] = _("Lash Out"), - [MOVE_POLTERGEIST] = _("Poltergeist"), - [MOVE_CORROSIVE_GAS] = _("CorrosiveGas"), - [MOVE_COACHING] = _("Coaching"), - [MOVE_FLIP_TURN] = _("Flip Turn"), - [MOVE_TRIPLE_AXEL] = _("Triple Axel"), - [MOVE_DUAL_WINGBEAT] = _("DualWingbeat"), - [MOVE_SCORCHING_SANDS] = _("ScorchngSnds"), - [MOVE_JUNGLE_HEALING] = _("JungleHealng"), - [MOVE_WICKED_BLOW] = _("Wicked Blow"), - [MOVE_SURGING_STRIKES] = _("SurgngStrkes"), - [MOVE_THUNDER_CAGE] = _("Thunder Cage"), - [MOVE_DRAGON_ENERGY] = _("DragonEnergy"), - [MOVE_FREEZING_GLARE] = _("FreezngGlare"), - [MOVE_FIERY_WRATH] = _("Fiery Wrath"), - [MOVE_THUNDEROUS_KICK] = _("ThnderusKick"), - [MOVE_GLACIAL_LANCE] = _("GlacialLance"), - [MOVE_ASTRAL_BARRAGE] = _("AstrlBarrage"), - [MOVE_EERIE_SPELL] = _("Eerie Spell"), - [MOVE_DIRE_CLAW] = _("Dire Claw"), - [MOVE_PSYSHIELD_BASH] = _("PsyshieldBsh"), - [MOVE_POWER_SHIFT] = _("Power Shift"), - [MOVE_STONE_AXE] = _("Stone Axe"), - [MOVE_SPRINGTIDE_STORM] = _("SprngtdeStrm"), - [MOVE_MYSTICAL_POWER] = _("MystcalPower"), - [MOVE_RAGING_FURY] = _("Raging Fury"), - [MOVE_WAVE_CRASH] = _("Wave Crash"), - [MOVE_CHLOROBLAST] = _("Chloroblast"), - [MOVE_MOUNTAIN_GALE] = _("MountainGale"), - [MOVE_VICTORY_DANCE] = _("VictoryDance"), - [MOVE_HEADLONG_RUSH] = _("HeadlongRush"), - [MOVE_BARB_BARRAGE] = _("Barb Barrage"), - [MOVE_ESPER_WING] = _("Esper Wing"), - [MOVE_BITTER_MALICE] = _("BitterMalice"), - [MOVE_SHELTER] = _("Shelter"), - [MOVE_TRIPLE_ARROWS] = _("TripleArrows"), - [MOVE_INFERNAL_PARADE] = _("InfrnlParade"), - [MOVE_CEASELESS_EDGE] = _("CeaslessEdge"), - [MOVE_BLEAKWIND_STORM] = _("BlekwndStorm"), - [MOVE_WILDBOLT_STORM] = _("WildbltStorm"), - [MOVE_SANDSEAR_STORM] = _("SndsearStorm"), - [MOVE_LUNAR_BLESSING] = _("LunarBlessng"), - [MOVE_TAKE_HEART] = _("Take Heart"), - [MOVE_TERA_BLAST] = _("Tera Blast"), - [MOVE_SILK_TRAP] = _("Silk Trap"), - [MOVE_AXE_KICK] = _("Axe Kick"), - [MOVE_LAST_RESPECTS] = _("LastRespects"), - [MOVE_LUMINA_CRASH] = _("Lumina Crash"), - [MOVE_ORDER_UP] = _("Order Up"), - [MOVE_JET_PUNCH] = _("Jet Punch"), - [MOVE_SPICY_EXTRACT] = _("SpicyExtract"), - [MOVE_SPIN_OUT] = _("Spin Out"), - [MOVE_POPULATION_BOMB] = _("PoplatinBomb"), - [MOVE_ICE_SPINNER] = _("Ice Spinner"), - [MOVE_GLAIVE_RUSH] = _("Glaive Rush"), - [MOVE_REVIVAL_BLESSING] = _("RevivlBlesng"), - [MOVE_SALT_CURE] = _("Salt Cure"), - [MOVE_TRIPLE_DIVE] = _("Triple Dive"), - [MOVE_MORTAL_SPIN] = _("Mortal Spin"), - [MOVE_DOODLE] = _("Doodle"), - [MOVE_FILLET_AWAY] = _("Fillet Away"), - [MOVE_KOWTOW_CLEAVE] = _("KowtowCleave"), - [MOVE_FLOWER_TRICK] = _("Flower Trick"), - [MOVE_TORCH_SONG] = _("Torch Song"), - [MOVE_AQUA_STEP] = _("Aqua Step"), - [MOVE_RAGING_BULL] = _("Raging Bull"), - [MOVE_MAKE_IT_RAIN] = _("Make It Rain"), - [MOVE_RUINATION] = _("Ruination"), - [MOVE_COLLISION_COURSE] = _("ColisinCours"), - [MOVE_ELECTRO_DRIFT] = _("ElectroDrift"), - [MOVE_SHED_TAIL] = _("Shed Tail"), - [MOVE_CHILLY_RECEPTION] = _("ChilReceptin"), - [MOVE_TIDY_UP] = _("Tidy Up"), - [MOVE_SNOWSCAPE] = _("Snowscape"), - [MOVE_POUNCE] = _("Pounce"), - [MOVE_TRAILBLAZE] = _("Trailblaze"), - [MOVE_CHILLING_WATER] = _("ChillingWatr"), - [MOVE_HYPER_DRILL] = _("Hyper Drill"), - [MOVE_TWIN_BEAM] = _("Twin Beam"), - [MOVE_RAGE_FIST] = _("Rage Fist"), - [MOVE_ARMOR_CANNON] = _("Armor Cannon"), - [MOVE_BITTER_BLADE] = _("Bitter Blade"), - [MOVE_DOUBLE_SHOCK] = _("Double Shock"), - [MOVE_GIGATON_HAMMER] = _("GigatonHammr"), - [MOVE_COMEUPPANCE] = _("Comeuppance"), - [MOVE_AQUA_CUTTER] = _("Aqua Cutter"), - [MOVE_BLAZING_TORQUE] = _("BlazngTorque"), - [MOVE_WICKED_TORQUE] = _("WickedTorque"), - [MOVE_NOXIOUS_TORQUE] = _("NoxiusTorque"), - [MOVE_COMBAT_TORQUE] = _("CombatTorque"), - [MOVE_MAGICAL_TORQUE] = _("MagiclTorque"), - [MOVE_PSYBLADE] = _("Psyblade"), - [MOVE_HYDRO_STEAM] = _("Hydro Steam"), - [MOVE_BLOOD_MOON] = _("Blood Moon"), - [MOVE_MATCHA_GOTCHA] = _("MatchaGotcha"), - [MOVE_SYRUP_BOMB] = _("Syrup Bomb"), - [MOVE_IVY_CUDGEL] = _("Ivy Cudgel"), - [MOVE_ELECTRO_SHOT] = _("Electro Shot"), - [MOVE_TERA_STARSTORM] = _("TeraStarstrm"), - [MOVE_FICKLE_BEAM] = _("Fickle Beam"), - [MOVE_BURNING_BULWARK] = _("BurnngBulwrk"), - [MOVE_THUNDERCLAP] = _("Thunderclap"), - [MOVE_MIGHTY_CLEAVE] = _("MightyCleave"), - [MOVE_TACHYON_CUTTER] = _("TachyonCuttr"), - [MOVE_HARD_PRESS] = _("Hard Press"), - [MOVE_DRAGON_CHEER] = _("Dragon Cheer"), - [MOVE_ALLURING_VOICE] = _("AllurngVoice"), - [MOVE_TEMPER_FLARE] = _("Temper Flare"), - [MOVE_SUPERCELL_SLAM] = _("SuprcellSlam"), - [MOVE_PSYCHIC_NOISE] = _("PsychicNoise"), - [MOVE_UPPER_HAND] = _("Upper Hand"), - [MOVE_MALIGNANT_CHAIN] = _("MalignntChan"), - // Max Moves - [MOVE_MAX_GUARD] = _("M-Guard"), - [MOVE_MAX_STRIKE] = _("M-Strike"), - [MOVE_MAX_KNUCKLE] = _("M-Knuckle"), - [MOVE_MAX_AIRSTREAM] = _("M-Airstream"), - [MOVE_MAX_OOZE] = _("M-Ooze"), - [MOVE_MAX_QUAKE] = _("M-Quake"), - [MOVE_MAX_ROCKFALL] = _("M-Rockfall"), - [MOVE_MAX_FLUTTERBY] = _("M-Flutterby"), - [MOVE_MAX_PHANTASM] = _("M-Phantasm"), - [MOVE_MAX_STEELSPIKE] = _("M-Steelspike"), - [MOVE_MAX_FLARE] = _("M-Flare"), - [MOVE_MAX_GEYSER] = _("M-Geyser"), - [MOVE_MAX_OVERGROWTH] = _("M-Overgrowth"), - [MOVE_MAX_LIGHTNING] = _("M-Lightning"), - [MOVE_MAX_HAILSTORM] = _("M-Hailstorm"), - [MOVE_MAX_MINDSTORM] = _("M-Mindstorm"), - [MOVE_MAX_WYRMWIND] = _("M-Wyrmwind"), - [MOVE_MAX_DARKNESS] = _("M-Darkness"), - [MOVE_MAX_STARFALL] = _("M-Starfall"), -// Gigantamax Moves - [MOVE_G_MAX_VINE_LASH] = _("G-Vine Lash"), - [MOVE_G_MAX_WILDFIRE] = _("G-Wildfire"), - [MOVE_G_MAX_CANNONADE] = _("G-Cannonade"), - [MOVE_G_MAX_BEFUDDLE] = _("G-Befuddle"), - [MOVE_G_MAX_VOLT_CRASH] = _("G-VoltCrash"), - [MOVE_G_MAX_GOLD_RUSH] = _("G-Gold Rush"), - [MOVE_G_MAX_CHI_STRIKE] = _("G-ChiStrike"), - [MOVE_G_MAX_TERROR] = _("G-Terror"), - [MOVE_G_MAX_FOAM_BURST] = _("G-FoamBurst"), - [MOVE_G_MAX_RESONANCE] = _("G-Resonance"), - [MOVE_G_MAX_CUDDLE] = _("G-Cuddle"), - [MOVE_G_MAX_REPLENISH] = _("G-Replenish"), - [MOVE_G_MAX_MALODOR] = _("G-Malodor"), - [MOVE_G_MAX_MELTDOWN] = _("G-Meltdown"), - [MOVE_G_MAX_DRUM_SOLO] = _("G-Drum Solo"), - [MOVE_G_MAX_FIREBALL] = _("G-Fireball"), - [MOVE_G_MAX_HYDROSNIPE] = _("G-Hydrsnipe"), - [MOVE_G_MAX_WIND_RAGE] = _("G-Wind Rage"), - [MOVE_G_MAX_GRAVITAS] = _("G-Gravitas"), - [MOVE_G_MAX_STONESURGE] = _("G-Stonesrge"), - [MOVE_G_MAX_VOLCALITH] = _("G-Volcalith"), - [MOVE_G_MAX_TARTNESS] = _("G-Tartness"), - [MOVE_G_MAX_SWEETNESS] = _("G-Sweetness"), - [MOVE_G_MAX_SANDBLAST] = _("G-Sandblast"), - [MOVE_G_MAX_STUN_SHOCK] = _("G-StunShock"), - [MOVE_G_MAX_CENTIFERNO] = _("G-Centiferno"), - [MOVE_G_MAX_SMITE] = _("G-Smite"), - [MOVE_G_MAX_SNOOZE] = _("G-Snooze"), - [MOVE_G_MAX_FINALE] = _("G-Finale"), - [MOVE_G_MAX_STEELSURGE] = _("G-Steelsrge"), - [MOVE_G_MAX_DEPLETION] = _("G-Depletion"), - [MOVE_G_MAX_ONE_BLOW] = _("G-One Blow"), - [MOVE_G_MAX_RAPID_FLOW] = _("G-Rapid Flow"), -}; -#endif - -static const u8 sText_Breakneck_Blitz[] = _("Breakneck Blitz"); -static const u8 sText_All_Out_Pummeling[] = _("All Out Pummeling"); -static const u8 sText_Supersonic_Skystrike[] = _("Supersonic Skystrike"); -static const u8 sText_Acid_Downpour[] = _("Acid Downpour"); -static const u8 sText_Tectonic_Rage[] = _("Tectonic Rage"); -static const u8 sText_Continental_Crush[] = _("Continental Crush"); -static const u8 sText_Savage_Spin_Out[] = _("Savage Spin Out"); -static const u8 sText_Never_Ending_Nightmare[] = _("Never Ending Nightmare"); -static const u8 sText_Corkscrew_Crash[] = _("Corkscrew Crash"); -static const u8 sText_Inferno_Overdrive[] = _("Inferno Overdrive"); -static const u8 sText_Hydro_Vortex[] = _("Hydro Vortex"); -static const u8 sText_Bloom_Doom[] = _("Bloom Doom"); -static const u8 sText_Gigavolt_Havoc[] = _("Gigavolt Havoc"); -static const u8 sText_Shattered_Psyche[] = _("Shattered Psyche"); -static const u8 sText_Subzero_Slammer[] = _("Subzero Slammer"); -static const u8 sText_Devastating_Drake[] = _("Devastating Drake"); -static const u8 sText_Black_Hole_Eclipse[] = _("Black Hole Eclipse"); -static const u8 sText_Twinkle_Tackle[] = _("Twinkle Tackle"); -static const u8 sText_Catastropika[] = _("Catastropika"); -static const u8 sText_10000000_Volt_Thunderbolt[] = _("10000000 Volt Thunderbolt"); -static const u8 sText_Stoked_Sparksurfer[] = _("Stoked Sparksurfer"); -static const u8 sText_Extreme_Evoboost[] = _("Extreme Evoboost"); -static const u8 sText_Pulverizing_Pancake[] = _("Pulverizing Pancake"); -static const u8 sText_Genesis_Supernova[] = _("Genesis Supernova"); -static const u8 sText_Sinister_Arrow_Raid[] = _("Sinister Arrow Raid"); -static const u8 sText_Malicious_Moonsault[] = _("Malicious Moonsault"); -static const u8 sText_Oceanic_Operetta[] = _("Oceanic Operetta"); -static const u8 sText_Splintered_Stormshards[] = _("Splintered Stormshards"); -static const u8 sText_Lets_Snuggle_Forever[] = _("Let's Snuggle Forever"); -static const u8 sText_Clangorous_Soulblaze[] = _("Clangorous Soulblaze"); -static const u8 sText_Guardian_Of_Alola[] = _("Guardian Of Alola"); -static const u8 sText_Searing_Sunraze_Smash[] = _("Searing Sunraze Smash"); -static const u8 sText_Menacing_Moonraze_Maelstrom[] = _("Menacing Moonraze Maelstrom"); -static const u8 sText_Light_That_Burns_The_Sky[] = _("Light That Burns The Sky"); -static const u8 sText_Soul_Stealing_7_Star_Strike[] = _("Soul Stealing 7 Star Strike"); - -const u8 *const gZMoveNames[] = -{ - [MOVE_BREAKNECK_BLITZ - FIRST_Z_MOVE] = sText_Breakneck_Blitz, - [MOVE_ALL_OUT_PUMMELING - FIRST_Z_MOVE] = sText_All_Out_Pummeling, - [MOVE_SUPERSONIC_SKYSTRIKE - FIRST_Z_MOVE] = sText_Supersonic_Skystrike, - [MOVE_ACID_DOWNPOUR - FIRST_Z_MOVE] = sText_Acid_Downpour, - [MOVE_TECTONIC_RAGE - FIRST_Z_MOVE] = sText_Tectonic_Rage, - [MOVE_CONTINENTAL_CRUSH - FIRST_Z_MOVE] = sText_Continental_Crush, - [MOVE_SAVAGE_SPIN_OUT - FIRST_Z_MOVE] = sText_Savage_Spin_Out, - [MOVE_NEVER_ENDING_NIGHTMARE - FIRST_Z_MOVE] = sText_Never_Ending_Nightmare, - [MOVE_CORKSCREW_CRASH - FIRST_Z_MOVE] = sText_Corkscrew_Crash, - [MOVE_INFERNO_OVERDRIVE - FIRST_Z_MOVE] = sText_Inferno_Overdrive, - [MOVE_HYDRO_VORTEX - FIRST_Z_MOVE] = sText_Hydro_Vortex, - [MOVE_BLOOM_DOOM - FIRST_Z_MOVE] = sText_Bloom_Doom, - [MOVE_GIGAVOLT_HAVOC - FIRST_Z_MOVE] = sText_Gigavolt_Havoc, - [MOVE_SHATTERED_PSYCHE - FIRST_Z_MOVE] = sText_Shattered_Psyche, - [MOVE_SUBZERO_SLAMMER - FIRST_Z_MOVE] = sText_Subzero_Slammer, - [MOVE_DEVASTATING_DRAKE - FIRST_Z_MOVE] = sText_Devastating_Drake, - [MOVE_BLACK_HOLE_ECLIPSE - FIRST_Z_MOVE] = sText_Black_Hole_Eclipse, - [MOVE_TWINKLE_TACKLE - FIRST_Z_MOVE] = sText_Twinkle_Tackle, - [MOVE_CATASTROPIKA - FIRST_Z_MOVE] = sText_Catastropika, - [MOVE_10000000_VOLT_THUNDERBOLT - FIRST_Z_MOVE] = sText_10000000_Volt_Thunderbolt, - [MOVE_STOKED_SPARKSURFER - FIRST_Z_MOVE] = sText_Stoked_Sparksurfer, - [MOVE_EXTREME_EVOBOOST - FIRST_Z_MOVE] = sText_Extreme_Evoboost, - [MOVE_PULVERIZING_PANCAKE - FIRST_Z_MOVE] = sText_Pulverizing_Pancake, - [MOVE_GENESIS_SUPERNOVA - FIRST_Z_MOVE] = sText_Genesis_Supernova, - [MOVE_SINISTER_ARROW_RAID - FIRST_Z_MOVE] = sText_Sinister_Arrow_Raid, - [MOVE_MALICIOUS_MOONSAULT - FIRST_Z_MOVE] = sText_Malicious_Moonsault, - [MOVE_OCEANIC_OPERETTA - FIRST_Z_MOVE] = sText_Oceanic_Operetta, - [MOVE_SPLINTERED_STORMSHARDS - FIRST_Z_MOVE] = sText_Splintered_Stormshards, - [MOVE_LETS_SNUGGLE_FOREVER - FIRST_Z_MOVE] = sText_Lets_Snuggle_Forever, - [MOVE_CLANGOROUS_SOULBLAZE - FIRST_Z_MOVE] = sText_Clangorous_Soulblaze, - [MOVE_GUARDIAN_OF_ALOLA - FIRST_Z_MOVE] = sText_Guardian_Of_Alola, - [MOVE_SEARING_SUNRAZE_SMASH - FIRST_Z_MOVE] = sText_Searing_Sunraze_Smash, - [MOVE_MENACING_MOONRAZE_MAELSTROM - FIRST_Z_MOVE] = sText_Menacing_Moonraze_Maelstrom, - [MOVE_LIGHT_THAT_BURNS_THE_SKY - FIRST_Z_MOVE] = sText_Light_That_Burns_The_Sky, - [MOVE_SOUL_STEALING_7_STAR_STRIKE - FIRST_Z_MOVE] = sText_Soul_Stealing_7_Star_Strike, -}; - -// Max Moves -static const u8 sText_Max_Guard[] = _("Max Guard"); -static const u8 sText_Max_Strike[] = _("Max Strike"); -static const u8 sText_Max_Knuckle[] = _("Max Knuckle"); -static const u8 sText_Max_Airstream[] = _("Max Airstream"); -static const u8 sText_Max_Ooze[] = _("Max Ooze"); -static const u8 sText_Max_Quake[] = _("Max Quake"); -static const u8 sText_Max_Rockfall[] = _("Max Rockfall"); -static const u8 sText_Max_Flutterby[] = _("Max Flutterby"); -static const u8 sText_Max_Phantasm[] = _("Max Phantasm"); -static const u8 sText_Max_Steelspike[] = _("Max Steelspike"); -static const u8 sText_Max_Flare[] = _("Max Flare"); -static const u8 sText_Max_Geyser[] = _("Max Geyser"); -static const u8 sText_Max_Overgrowth[] = _("Max Overgrowth"); -static const u8 sText_Max_Lightning[] = _("Max Lightning"); -static const u8 sText_Max_Hailstorm[] = _("Max Hailstorm"); -static const u8 sText_Max_Mindstorm[] = _("Max Mindstorm"); -static const u8 sText_Max_Wyrmwind[] = _("Max Wyrmwind"); -static const u8 sText_Max_Darkness[] = _("Max Darkness"); -static const u8 sText_Max_Starfall[] = _("Max Starfall"); -static const u8 sText_G_Max_Vine_Lash[] = _("G-Max Vine Lash"); -static const u8 sText_G_Max_Wildfire[] = _("G-Max Wildfire"); -static const u8 sText_G_Max_Cannonade[] = _("G-Max Cannonade"); -static const u8 sText_G_Max_Befuddle[] = _("G-Max Befuddle"); -static const u8 sText_G_Max_Volt_Crash[] = _("G-Max Volt Crash"); -static const u8 sText_G_Max_Gold_Rush[] = _("G-Max Gold Rush"); -static const u8 sText_G_Max_Chi_Strike[] = _("G-Max Chi Strike"); -static const u8 sText_G_Max_Terror[] = _("G-Max Terror"); -static const u8 sText_G_Max_Foam_Burst[] = _("G-Max Foam Burst"); -static const u8 sText_G_Max_Resonance[] = _("G-Max Resonance"); -static const u8 sText_G_Max_Cuddle[] = _("G-Max Cuddle"); -static const u8 sText_G_Max_Replenish[] = _("G-Max Replenish"); -static const u8 sText_G_Max_Malodor[] = _("G-Max Malodor"); -static const u8 sText_G_Max_Meltdown[] = _("G-Max Meltdown"); -static const u8 sText_G_Max_Drum_Solo[] = _("G-Max Drum Solo"); -static const u8 sText_G_Max_Fireball[] = _("G-Max Fireball"); -static const u8 sText_G_Max_Hydrosnipe[] = _("G-Max Hydrosnipe"); -static const u8 sText_G_Max_Wind_Rage[] = _("G-Max Wind Rage"); -static const u8 sText_G_Max_Gravitas[] = _("G-Max Gravitas"); -static const u8 sText_G_Max_Stonesurge[] = _("G-Max Stonesurge"); -static const u8 sText_G_Max_Volcalith[] = _("G-Max Volcalith"); -static const u8 sText_G_Max_Tartness[] = _("G-Max Tartness"); -static const u8 sText_G_Max_Sweetness[] = _("G-Max Sweetness"); -static const u8 sText_G_Max_Sandblast[] = _("G-Max Sandblast"); -static const u8 sText_G_Max_Stun_Shock[] = _("G-Max Stun Shock"); -static const u8 sText_G_Max_Centiferno[] = _("G-Max Centiferno"); -static const u8 sText_G_Max_Smite[] = _("G-Max Smite"); -static const u8 sText_G_Max_Snooze[] = _("G-Max Snooze"); -static const u8 sText_G_Max_Finale[] = _("G-Max Finale"); -static const u8 sText_G_Max_Steelsurge[] = _("G-Max Steelsurge"); -static const u8 sText_G_Max_Depletion[] = _("G-Max Depletion"); -static const u8 sText_G_Max_One_Blow[] = _("G-Max One Blow"); -static const u8 sText_G_Max_Rapid_Flow[] = _("G-Max Rapid Flow"); - -const u8 *const gMaxMoveNames[] = -{ - [MOVE_MAX_GUARD - FIRST_MAX_MOVE] = sText_Max_Guard, - [MOVE_MAX_STRIKE - FIRST_MAX_MOVE] = sText_Max_Strike, - [MOVE_MAX_KNUCKLE - FIRST_MAX_MOVE] = sText_Max_Knuckle, - [MOVE_MAX_AIRSTREAM - FIRST_MAX_MOVE] = sText_Max_Airstream, - [MOVE_MAX_OOZE - FIRST_MAX_MOVE] = sText_Max_Ooze, - [MOVE_MAX_QUAKE - FIRST_MAX_MOVE] = sText_Max_Quake, - [MOVE_MAX_ROCKFALL - FIRST_MAX_MOVE] = sText_Max_Rockfall, - [MOVE_MAX_FLUTTERBY - FIRST_MAX_MOVE] = sText_Max_Flutterby, - [MOVE_MAX_PHANTASM - FIRST_MAX_MOVE] = sText_Max_Phantasm, - [MOVE_MAX_STEELSPIKE - FIRST_MAX_MOVE] = sText_Max_Steelspike, - [MOVE_MAX_FLARE - FIRST_MAX_MOVE] = sText_Max_Flare, - [MOVE_MAX_GEYSER - FIRST_MAX_MOVE] = sText_Max_Geyser, - [MOVE_MAX_OVERGROWTH - FIRST_MAX_MOVE] = sText_Max_Overgrowth, - [MOVE_MAX_LIGHTNING - FIRST_MAX_MOVE] = sText_Max_Lightning, - [MOVE_MAX_HAILSTORM - FIRST_MAX_MOVE] = sText_Max_Hailstorm, - [MOVE_MAX_MINDSTORM - FIRST_MAX_MOVE] = sText_Max_Mindstorm, - [MOVE_MAX_WYRMWIND - FIRST_MAX_MOVE] = sText_Max_Wyrmwind, - [MOVE_MAX_DARKNESS - FIRST_MAX_MOVE] = sText_Max_Darkness, - [MOVE_MAX_STARFALL - FIRST_MAX_MOVE] = sText_Max_Starfall, - [MOVE_G_MAX_VINE_LASH - FIRST_MAX_MOVE] = sText_G_Max_Vine_Lash, - [MOVE_G_MAX_WILDFIRE - FIRST_MAX_MOVE] = sText_G_Max_Wildfire, - [MOVE_G_MAX_CANNONADE - FIRST_MAX_MOVE] = sText_G_Max_Cannonade, - [MOVE_G_MAX_BEFUDDLE - FIRST_MAX_MOVE] = sText_G_Max_Befuddle, - [MOVE_G_MAX_VOLT_CRASH - FIRST_MAX_MOVE] = sText_G_Max_Volt_Crash, - [MOVE_G_MAX_GOLD_RUSH - FIRST_MAX_MOVE] = sText_G_Max_Gold_Rush, - [MOVE_G_MAX_CHI_STRIKE - FIRST_MAX_MOVE] = sText_G_Max_Chi_Strike, - [MOVE_G_MAX_TERROR - FIRST_MAX_MOVE] = sText_G_Max_Terror, - [MOVE_G_MAX_FOAM_BURST - FIRST_MAX_MOVE] = sText_G_Max_Foam_Burst, - [MOVE_G_MAX_RESONANCE - FIRST_MAX_MOVE] = sText_G_Max_Resonance, - [MOVE_G_MAX_CUDDLE - FIRST_MAX_MOVE] = sText_G_Max_Cuddle, - [MOVE_G_MAX_REPLENISH - FIRST_MAX_MOVE] = sText_G_Max_Replenish, - [MOVE_G_MAX_MALODOR - FIRST_MAX_MOVE] = sText_G_Max_Malodor, - [MOVE_G_MAX_MELTDOWN - FIRST_MAX_MOVE] = sText_G_Max_Meltdown, - [MOVE_G_MAX_DRUM_SOLO - FIRST_MAX_MOVE] = sText_G_Max_Drum_Solo, - [MOVE_G_MAX_FIREBALL - FIRST_MAX_MOVE] = sText_G_Max_Fireball, - [MOVE_G_MAX_HYDROSNIPE - FIRST_MAX_MOVE] = sText_G_Max_Hydrosnipe, - [MOVE_G_MAX_WIND_RAGE - FIRST_MAX_MOVE] = sText_G_Max_Wind_Rage, - [MOVE_G_MAX_GRAVITAS - FIRST_MAX_MOVE] = sText_G_Max_Gravitas, - [MOVE_G_MAX_STONESURGE - FIRST_MAX_MOVE] = sText_G_Max_Stonesurge, - [MOVE_G_MAX_VOLCALITH - FIRST_MAX_MOVE] = sText_G_Max_Volcalith, - [MOVE_G_MAX_TARTNESS - FIRST_MAX_MOVE] = sText_G_Max_Tartness, - [MOVE_G_MAX_SWEETNESS - FIRST_MAX_MOVE] = sText_G_Max_Sweetness, - [MOVE_G_MAX_SANDBLAST - FIRST_MAX_MOVE] = sText_G_Max_Sandblast, - [MOVE_G_MAX_STUN_SHOCK - FIRST_MAX_MOVE] = sText_G_Max_Stun_Shock, - [MOVE_G_MAX_CENTIFERNO - FIRST_MAX_MOVE] = sText_G_Max_Centiferno, - [MOVE_G_MAX_SMITE - FIRST_MAX_MOVE] = sText_G_Max_Smite, - [MOVE_G_MAX_SNOOZE - FIRST_MAX_MOVE] = sText_G_Max_Snooze, - [MOVE_G_MAX_FINALE - FIRST_MAX_MOVE] = sText_G_Max_Finale, - [MOVE_G_MAX_STEELSURGE - FIRST_MAX_MOVE] = sText_G_Max_Steelsurge, - [MOVE_G_MAX_DEPLETION - FIRST_MAX_MOVE] = sText_G_Max_Depletion, - [MOVE_G_MAX_ONE_BLOW - FIRST_MAX_MOVE] = sText_G_Max_One_Blow, - [MOVE_G_MAX_RAPID_FLOW - FIRST_MAX_MOVE] = sText_G_Max_Rapid_Flow, -}; diff --git a/src/debug.c b/src/debug.c index 3842a14aefb1..4b2e09e67c0b 100644 --- a/src/debug.c +++ b/src/debug.c @@ -3771,7 +3771,7 @@ static void DebugAction_Give_Pokemon_SelectEVs(u8 taskId) else { StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); - StringCopy(gStringVar1, gMoveNames[gTasks[taskId].tInput]); + StringCopy(gStringVar1, GetBattleMoveName(gTasks[taskId].tInput)); StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); StringExpandPlaceholders(gStringVar4, sDebugText_PokemonMove_0); @@ -3819,7 +3819,7 @@ static void DebugAction_Give_Pokemon_Move(u8 taskId) } StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); - StringCopy(gStringVar1, gMoveNames[gTasks[taskId].tInput]); + StringCopy(gStringVar1, GetBattleMoveName(gTasks[taskId].tInput)); StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); switch (gTasks[taskId].tIterator) @@ -3871,7 +3871,7 @@ static void DebugAction_Give_Pokemon_Move(u8 taskId) gTasks[taskId].tDigit = 0; StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); - StringCopy(gStringVar1, gMoveNames[gTasks[taskId].tInput]); + StringCopy(gStringVar1, GetBattleMoveName(gTasks[taskId].tInput)); StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); switch (gTasks[taskId].tIterator) diff --git a/src/easy_chat.c b/src/easy_chat.c index db5bbba8a82c..a80cbb5d1c29 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -5207,7 +5207,7 @@ static const u8 *GetEasyChatWord(u8 groupId, u16 index) return GetSpeciesName(index); case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_2: - return gMoveNames[index]; + return GetBattleMoveName(index); default: return gEasyChatGroups[groupId].wordData.words[index].text; } diff --git a/src/field_specials.c b/src/field_specials.c index a3f0c97d269a..7627923d8e5e 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1648,7 +1648,7 @@ bool8 BufferTMHMMoveName(void) { if (gSpecialVar_0x8004 >= ITEM_TM01 && gSpecialVar_0x8004 <= ITEM_HM08) { - StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(gSpecialVar_0x8004)]); + StringCopy(gStringVar2, GetBattleMoveName(ItemIdToBattleMoveId(gSpecialVar_0x8004))); return TRUE; } @@ -3069,7 +3069,7 @@ static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused) void BufferBattleFrontierTutorMoveName(void) { - StringCopy(gStringVar1, gMoveNames[gSpecialVar_0x8005]); + StringCopy(gStringVar1, GetBattleMoveName(gSpecialVar_0x8005)); } static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection) diff --git a/src/item_menu.c b/src/item_menu.c index 3753e4f2dc9c..8efd8bc2511e 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -908,7 +908,7 @@ static void GetItemName(u8 *dest, u16 itemId) switch (gBagPosition.pocket) { case TMHM_POCKET: - StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]); + StringCopy(gStringVar2, GetBattleMoveName(ItemIdToBattleMoveId(itemId))); if (itemId >= ITEM_HM01) { // Get HM number diff --git a/src/item_use.c b/src/item_use.c index 585f5c754a53..c46e0078a30b 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -876,7 +876,7 @@ static void Task_ShowTMHMContainedMessage(u8 taskId) { if (JOY_NEW(A_BUTTON | B_BUTTON)) { - StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gSpecialVar_ItemId)]); + StringCopy(gStringVar1, GetBattleMoveName(ItemIdToBattleMoveId(gSpecialVar_ItemId))); StringExpandPlaceholders(gStringVar4, gText_TMHMContainedVar1); DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, UseTMHMYesNo); } diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 125a9356665b..d2bd5a432e2c 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -807,7 +807,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) AddTextPrinterParameterized(RELEARNERWIN_DESC_BATTLE, FONT_NORMAL, str, 106, 41, TEXT_SKIP_DRAW, NULL); if (move->effect != EFFECT_PLACEHOLDER) - str = gMoveDescriptionPointers[chosenMove - 1]; + str = gBattleMoves[chosenMove].description; else str = gNotDoneYetDescription; diff --git a/src/move_relearner.c b/src/move_relearner.c index 975663e4d3d2..ee93fd7f7556 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -600,7 +600,7 @@ static void DoMoveRelearnerMain(void) } break; case MENU_STATE_PRINT_STOP_TEACHING: - StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]); + StringCopy(gStringVar2, GetBattleMoveName(GetCurrentSelectedMove())); PrintMessageWithPlaceholders(gText_MoveRelearnerStopTryingToTeachMove); sMoveRelearnerStruct->state++; break; @@ -707,10 +707,10 @@ static void DoMoveRelearnerMain(void) { u16 moveId = GetMonData(&gPlayerParty[sMoveRelearnerStruct->partyMon], MON_DATA_MOVE1 + sMoveRelearnerStruct->moveSlot); - StringCopy(gStringVar3, gMoveNames[moveId]); + StringCopy(gStringVar3, GetBattleMoveName(moveId)); RemoveMonPPBonus(&gPlayerParty[sMoveRelearnerStruct->partyMon], sMoveRelearnerStruct->moveSlot); SetMonMoveSlot(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove(), sMoveRelearnerStruct->moveSlot); - StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]); + StringCopy(gStringVar2, GetBattleMoveName(GetCurrentSelectedMove())); PrintMessageWithPlaceholders(gText_MoveRelearnerAndPoof); sMoveRelearnerStruct->state = MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE; gSpecialVar_0x8004 = TRUE; @@ -815,7 +815,7 @@ static void HandleInput(bool8 showContest) PlaySE(SE_SELECT); RemoveScrollArrows(); sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEACH_MOVE_PROMPT; - StringCopy(gStringVar2, gMoveNames[itemId]); + StringCopy(gStringVar2, GetBattleMoveName(itemId)); StringExpandPlaceholders(gStringVar4, gText_MoveRelearnerTeachMoveConfirm); MoveRelearnerPrintMessage(gStringVar4); break; @@ -904,7 +904,7 @@ static void CreateLearnableMovesList(void) for (i = 0; i < sMoveRelearnerStruct->numMenuChoices; i++) { - sMoveRelearnerStruct->menuItems[i].name = gMoveNames[sMoveRelearnerStruct->movesToLearn[i]]; + sMoveRelearnerStruct->menuItems[i].name = GetBattleMoveName(sMoveRelearnerStruct->movesToLearn[i]); sMoveRelearnerStruct->menuItems[i].id = sMoveRelearnerStruct->movesToLearn[i]; } diff --git a/src/party_menu.c b/src/party_menu.c index 54d8ec41b719..ae3d0fdb89ec 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -5101,7 +5101,7 @@ static void ShowMoveSelectWindow(u8 slot) for (i = 0; i < MAX_MON_MOVES; i++) { move = GetMonData(&gPlayerParty[slot], MON_DATA_MOVE1 + i); - AddTextPrinterParameterized(windowId, fontId, gMoveNames[move], 8, (i * 16) + 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, fontId, GetBattleMoveName(move), 8, (i * 16) + 1, TEXT_SKIP_DRAW, NULL); if (move != MOVE_NONE) moveCount++; } @@ -5207,7 +5207,7 @@ static void TryUseItemOnMove(u8 taskId) PlaySE(SE_USE_ITEM); RemoveBagItem(item, 1); move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot); - StringCopy(gStringVar1, gMoveNames[move]); + StringCopy(gStringVar1, GetBattleMoveName(move)); GetMedicineItemEffectMessage(item, 0); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5281,7 +5281,7 @@ void ItemUseCB_TMHM(u8 taskId, TaskFunc task) mon = &gPlayerParty[gPartyMenu.slotId]; GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, gMoveNames[move]); + StringCopy(gStringVar2, GetBattleMoveName(move)); switch (CanTeachMove(mon, move)) { @@ -5317,7 +5317,7 @@ static void Task_LearnedMove(u8 taskId) RemoveBagItem(item, 1); } GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, gMoveNames[move[0]]); + StringCopy(gStringVar2, GetBattleMoveName(move[0])); StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5415,7 +5415,7 @@ static void DisplayPartyMenuForgotMoveMessage(u8 taskId) u16 move = GetMonData(mon, MON_DATA_MOVE1 + GetMoveSlotToReplace()); GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, gMoveNames[move]); + StringCopy(gStringVar2, GetBattleMoveName(move)); DisplayLearnMoveMessage(gText_12PoofForgotMove); gTasks[taskId].func = Task_PartyMenuReplaceMove; } @@ -5437,7 +5437,7 @@ static void Task_PartyMenuReplaceMove(u8 taskId) static void StopLearningMovePrompt(u8 taskId) { - StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]); + StringCopy(gStringVar2, GetBattleMoveName(gPartyMenu.data1)); StringExpandPlaceholders(gStringVar4, gText_StopLearningMove2); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5461,7 +5461,7 @@ static void Task_HandleStopLearningMoveYesNoInput(u8 taskId) { case 0: GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]); + StringCopy(gStringVar2, GetBattleMoveName(gPartyMenu.data1)); StringExpandPlaceholders(gStringVar4, gText_MoveNotLearned); DisplayPartyMenuMessage(gStringVar4, TRUE); if (gPartyMenu.learnMoveState == 1) @@ -5480,7 +5480,7 @@ static void Task_HandleStopLearningMoveYesNoInput(u8 taskId) // fallthrough case 1: GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]); + StringCopy(gStringVar2, GetBattleMoveName(gPartyMenu.data1)); DisplayLearnMoveMessage(gText_PkmnNeedsToReplaceMove); gTasks[taskId].func = Task_ReplaceMoveYesNo; break; @@ -5742,7 +5742,7 @@ static void PartyMenuTryEvolution(u8 taskId) static void DisplayMonNeedsToReplaceMove(u8 taskId) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); - StringCopy(gStringVar2, gMoveNames[gMoveToLearn]); + StringCopy(gStringVar2, GetBattleMoveName(gMoveToLearn)); StringExpandPlaceholders(gStringVar4, gText_PkmnNeedsToReplaceMove); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5753,7 +5753,7 @@ static void DisplayMonNeedsToReplaceMove(u8 taskId) static void DisplayMonLearnedMove(u8 taskId, u16 move) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); - StringCopy(gStringVar2, gMoveNames[move]); + StringCopy(gStringVar2, GetBattleMoveName(move)); StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5991,7 +5991,7 @@ void FormChangeTeachMove(u8 taskId, u32 move, u32 slot) PlaySE(SE_SELECT); mon = &gPlayerParty[slot]; GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, gMoveNames[move]); + StringCopy(gStringVar2, GetBattleMoveName(move)); if (GiveMoveToMon(mon, move) != MON_HAS_MAX_MOVES) { @@ -6632,7 +6632,7 @@ static void TryTutorSelectedMon(u8 taskId) move = &gPartyMenu.data1; GetMonNickname(mon, gStringVar1); gPartyMenu.data1 = gSpecialVar_0x8005; - StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]); + StringCopy(gStringVar2, GetBattleMoveName(gPartyMenu.data1)); move[1] = 2; switch (CanTeachMove(mon, gPartyMenu.data1)) { @@ -7668,7 +7668,7 @@ void BufferMoveDeleterNicknameAndMove(void) u16 move = GetMonData(mon, MON_DATA_MOVE1 + gSpecialVar_0x8005); GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, gMoveNames[move]); + StringCopy(gStringVar2, GetBattleMoveName(move)); } void MoveDeleterForgetMove(void) diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 05e4bc677590..24e62f34c147 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -5340,7 +5340,7 @@ static void PrintStatsScreen_Moves_Top(u8 taskId) PrintStatsScreenTextSmallWhite(WIN_STATS_MOVES_TOP, gStringVar1, moves_x-1, moves_y+1); //Move name - StringCopy(gStringVar3, gMoveNames[move]); + StringCopy(gStringVar3, GetBattleMoveName(move)); StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 20); PrintStatsScreenTextSmall(WIN_STATS_MOVES_TOP, gStringVar3, moves_x, moves_y + 17); @@ -5408,7 +5408,7 @@ static void PrintStatsScreen_Moves_Description(u8 taskId) //Move description if (gTasks[taskId].data[5] == 0) { - StringCopy(gStringVar4, gMoveDescriptionPointers[(move - 1)]); + StringCopy(gStringVar4, gBattleMoves[move].description); PrintStatsScreenTextSmall(WIN_STATS_MOVES_DESCRIPTION, gStringVar4, moves_x, moves_y); } else @@ -6688,7 +6688,7 @@ static u8 PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 depth, StringExpandPlaceholders(gStringVar4, sText_EVO_ITEM_HOLD_NIGHT ); break; case EVO_MOVE: - StringCopy(gStringVar2, gMoveNames[evolutions[i].param]); + StringCopy(gStringVar2, GetBattleMoveName(evolutions[i].param)); StringExpandPlaceholders(gStringVar4, sText_EVO_MOVE ); break; case EVO_FRIENDSHIP_MOVE_TYPE: diff --git a/src/pokemon.c b/src/pokemon.c index cb4a08366dca..cbb4ddffd432 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6425,3 +6425,9 @@ u16 GetSpeciesPreEvolution(u16 species) return SPECIES_NONE; } + +const u8 *GetBattleMoveName(u16 moveId) +{ + // TODO: Check for MOVE_NAME_LENGTH here. + return gBattleMoves[moveId].name; +} diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 41c4f9f76d36..6b442da64cec 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -321,9 +321,6 @@ static void SetMainMoveSelectorColor(u8); static void KeepMoveSelectorVisible(u8); static void SummaryScreen_DestroyAnimDelayTask(void); -// const rom data -#include "data/text/move_descriptions.h" - static const struct BgTemplate sBgTemplates[] = { { @@ -3640,7 +3637,7 @@ static void PrintMoveNameAndPP(u8 moveIndex) if (move != 0) { pp = CalculatePPWithBonus(move, summary->ppBonuses, moveIndex); - PrintTextOnWindow(moveNameWindowId, gMoveNames[move], 0, moveIndex * 16 + 1, 0, 1); + PrintTextOnWindow(moveNameWindowId, GetBattleMoveName(move), 0, moveIndex * 16 + 1, 0, 1); ConvertIntToDecimalStringN(gStringVar1, summary->pp[moveIndex], STR_CONV_MODE_RIGHT_ALIGN, 2); ConvertIntToDecimalStringN(gStringVar2, pp, STR_CONV_MODE_RIGHT_ALIGN, 2); DynamicPlaceholderTextUtil_Reset(); @@ -3776,7 +3773,7 @@ static void PrintMoveDetails(u16 move) PrintMovePowerAndAccuracy(move); if (moveEffect != EFFECT_PLACEHOLDER) - PrintTextOnWindow(windowId, gMoveDescriptionPointers[move - 1], 6, 1, 0, 0); + PrintTextOnWindow(windowId, gBattleMoves[move].description, 6, 1, 0, 0); else PrintTextOnWindow(windowId, gNotDoneYetDescription, 6, 1, 0, 0); } @@ -3808,9 +3805,9 @@ static void PrintNewMoveDetailsOrCancelText(void) u16 move = sMonSummaryScreen->newMove; if (sMonSummaryScreen->currPageIndex == PSS_PAGE_BATTLE_MOVES) - PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 6); + PrintTextOnWindow(windowId1, GetBattleMoveName(move), 0, 65, 0, 6); else - PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 5); + PrintTextOnWindow(windowId1, GetBattleMoveName(move), 0, 65, 0, 5); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 2); DynamicPlaceholderTextUtil_Reset(); diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c index 4ded1a7ff353..b620fef2993a 100644 --- a/src/rom_header_gf.c +++ b/src/rom_header_gf.c @@ -108,7 +108,6 @@ static const struct GFRomHeader sGFRomHeader = { //.monIconPaletteIds = gMonIconPaletteIndices, .monIconPalettes = gMonIconPaletteTable, //.monSpeciesNames = gSpeciesNames, // Handled in gSpeciesInfo - .moveNames = gMoveNames, .decorations = gDecorations, .flagsOffset = offsetof(struct SaveBlock1, flags), .varsOffset = offsetof(struct SaveBlock1, vars), diff --git a/src/scrcmd.c b/src/scrcmd.c index 11ae5f3d75ac..0876ea28ab47 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1708,7 +1708,7 @@ bool8 ScrCmd_buffermovename(struct ScriptContext *ctx) u8 stringVarIndex = ScriptReadByte(ctx); u16 moveId = VarGet(ScriptReadHalfword(ctx)); - StringCopy(sScriptStringVars[stringVarIndex], gMoveNames[moveId]); + StringCopy(sScriptStringVars[stringVarIndex], GetBattleMoveName(moveId)); return FALSE; } diff --git a/src/shop.c b/src/shop.c index b4978f063e99..08167aa728c8 100644 --- a/src/shop.c +++ b/src/shop.c @@ -1013,7 +1013,7 @@ static void Task_BuyMenu(u8 taskId) } else if (ItemId_GetPocket(itemId) == POCKET_TM_HM) { - StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]); + StringCopy(gStringVar2, GetBattleMoveName(ItemIdToBattleMoveId(itemId))); BuyMenuDisplayMessage(taskId, gText_Var1CertainlyHowMany2, Task_BuyHowManyDialogueInit); } else diff --git a/src/trade.c b/src/trade.c index 080bd74f6615..b72e2b890809 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1974,7 +1974,7 @@ static void BufferMovesString(u8 *str, u8 whichParty, u8 partyIdx) for (i = 0; i < MAX_MON_MOVES; i++) { if (moves[i] != MOVE_NONE) - StringAppend(str, gMoveNames[moves[i]]); + StringAppend(str, GetBattleMoveName(moves[i])); StringAppend(str, sText_NewLine); } diff --git a/src/tv.c b/src/tv.c index e89f6a9145cc..4bcf50bc9478 100644 --- a/src/tv.c +++ b/src/tv.c @@ -4319,7 +4319,7 @@ static void DoTVShowBravoTrainerPokemonProfile(void) break; case 6: StringCopy(gStringVar1, GetSpeciesName(show->bravoTrainer.species)); - StringCopy(gStringVar2, gMoveNames[show->bravoTrainer.move]); + StringCopy(gStringVar2, GetBattleMoveName(show->bravoTrainer.move)); CopyEasyChatWord(gStringVar3, show->bravoTrainer.words[1]); sTVShowState = 7; break; @@ -5149,7 +5149,7 @@ static void DoTVShowPokemonContestLiveUpdates(void) break; case CONTESTLIVE_STATE_USED_MOVE: StringCopy(gStringVar2, GetSpeciesName(show->contestLiveUpdates.winningSpecies)); - StringCopy(gStringVar3, gMoveNames[show->contestLiveUpdates.move]); + StringCopy(gStringVar3, GetBattleMoveName(show->contestLiveUpdates.move)); sTVShowState = CONTESTLIVE_STATE_TALK_ABOUT_LOSER; break; case CONTESTLIVE_STATE_TALK_ABOUT_LOSER: @@ -5256,7 +5256,7 @@ static void DoTVShowPokemonBattleUpdate(void) case 2: TVShowConvertInternationalString(gStringVar1, show->battleUpdate.playerName, show->battleUpdate.language); StringCopy(gStringVar2, GetSpeciesName(show->battleUpdate.speciesPlayer)); - StringCopy(gStringVar3, gMoveNames[show->battleUpdate.move]); + StringCopy(gStringVar3, GetBattleMoveName(show->battleUpdate.move)); sTVShowState = 3; break; case 3: @@ -5277,7 +5277,7 @@ static void DoTVShowPokemonBattleUpdate(void) case 6: TVShowConvertInternationalString(gStringVar1, show->battleUpdate.playerName, show->battleUpdate.language); StringCopy(gStringVar2, GetSpeciesName(show->battleUpdate.speciesPlayer)); - StringCopy(gStringVar3, gMoveNames[show->battleUpdate.move]); + StringCopy(gStringVar3, GetBattleMoveName(show->battleUpdate.move)); sTVShowState = 7; break; case 7: @@ -5418,7 +5418,7 @@ void DoTVShowInSearchOfTrainers(void) break; case 3: StringCopy(gStringVar1, GetSpeciesName(gSaveBlock1Ptr->gabbyAndTyData.mon1)); - StringCopy(gStringVar2, gMoveNames[gSaveBlock1Ptr->gabbyAndTyData.lastMove]); + StringCopy(gStringVar2, GetBattleMoveName(gSaveBlock1Ptr->gabbyAndTyData.lastMove)); StringCopy(gStringVar3, GetSpeciesName(gSaveBlock1Ptr->gabbyAndTyData.mon2)); sTVShowState = 8; break; @@ -5848,7 +5848,7 @@ static void DoTVShowBreakingNewsTV(void) } break; case 7: - StringCopy(gStringVar1, gMoveNames[show->breakingNews.lastUsedMove]); + StringCopy(gStringVar1, GetBattleMoveName(show->breakingNews.lastUsedMove)); StringCopy(gStringVar2, GetSpeciesName(show->breakingNews.poke1Species)); sTVShowState = 8; break; @@ -5948,7 +5948,7 @@ static void DoTVShowSecretBaseVisit(void) case 12: TVShowConvertInternationalString(gStringVar1, show->secretBaseVisit.playerName, show->secretBaseVisit.language); StringCopy(gStringVar2, GetSpeciesName(show->secretBaseVisit.species)); - StringCopy(gStringVar3, gMoveNames[show->secretBaseVisit.move]); + StringCopy(gStringVar3, GetBattleMoveName(show->secretBaseVisit.move)); sTVShowState = 13; break; case 13: @@ -5999,7 +5999,7 @@ static void DoTVShowThePokemonBattleSeminar(void) case 1: TVShowConvertInternationalString(gStringVar1, show->battleSeminar.playerName, show->battleSeminar.language); StringCopy(gStringVar2, GetSpeciesName(show->battleSeminar.foeSpecies)); - StringCopy(gStringVar3, gMoveNames[show->battleSeminar.move]); + StringCopy(gStringVar3, GetBattleMoveName(show->battleSeminar.move)); sTVShowState = 2; break; case 2: @@ -6021,23 +6021,23 @@ static void DoTVShowThePokemonBattleSeminar(void) } break; case 3: - StringCopy(gStringVar1, gMoveNames[show->battleSeminar.otherMoves[0]]); - StringCopy(gStringVar2, gMoveNames[show->battleSeminar.otherMoves[1]]); - StringCopy(gStringVar3, gMoveNames[show->battleSeminar.otherMoves[2]]); + StringCopy(gStringVar1, GetBattleMoveName(show->battleSeminar.otherMoves[0])); + StringCopy(gStringVar2, GetBattleMoveName(show->battleSeminar.otherMoves[1])); + StringCopy(gStringVar3, GetBattleMoveName(show->battleSeminar.otherMoves[2])); sTVShowState = 6; break; case 4: - StringCopy(gStringVar1, gMoveNames[show->battleSeminar.otherMoves[0]]); - StringCopy(gStringVar2, gMoveNames[show->battleSeminar.otherMoves[1]]); + StringCopy(gStringVar1, GetBattleMoveName(show->battleSeminar.otherMoves[0])); + StringCopy(gStringVar2, GetBattleMoveName(show->battleSeminar.otherMoves[1])); sTVShowState = 6; break; case 5: - StringCopy(gStringVar2, gMoveNames[show->battleSeminar.otherMoves[0]]); + StringCopy(gStringVar2, GetBattleMoveName(show->battleSeminar.otherMoves[0])); sTVShowState = 6; break; case 6: - StringCopy(gStringVar1, gMoveNames[show->battleSeminar.betterMove]); - StringCopy(gStringVar2, gMoveNames[show->battleSeminar.move]); + StringCopy(gStringVar1, GetBattleMoveName(show->battleSeminar.betterMove)); + StringCopy(gStringVar2, GetBattleMoveName(show->battleSeminar.move)); TVShowDone(); break; } diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c index caccdb2042fe..d33a5db1d33e 100644 --- a/test/test_runner_battle.c +++ b/test/test_runner_battle.c @@ -844,16 +844,16 @@ void TestRunner_Battle_CheckChosenMove(u32 battlerId, u32 moveId, u32 target) u32 moveSlot = GetMoveSlot(gBattleMons[battlerId].moves, moveId); PrintAiMoveLog(battlerId, moveSlot, moveId, gBattleStruct->aiFinalScore[battlerId][expectedAction->target][moveSlot]); if (countExpected > 1) - Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched EXPECT_MOVES %S, got %S", filename, expectedAction->sourceLine, gMoveNames[expectedMoveId], gMoveNames[moveId]); + Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched EXPECT_MOVES %S, got %S", filename, expectedAction->sourceLine, GetBattleMoveName(expectedMoveId), GetBattleMoveName(moveId)); else - Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched EXPECT_MOVE %S, got %S", filename, expectedAction->sourceLine, gMoveNames[expectedMoveId], gMoveNames[moveId]); + Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched EXPECT_MOVE %S, got %S", filename, expectedAction->sourceLine, GetBattleMoveName(expectedMoveId), GetBattleMoveName(moveId)); } if (expectedAction->notMove && !movePasses) { if (countExpected > 1) - Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched NOT_EXPECT_MOVES %S", filename, expectedAction->sourceLine, gMoveNames[expectedMoveId]); + Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched NOT_EXPECT_MOVES %S", filename, expectedAction->sourceLine, GetBattleMoveName(expectedMoveId)); else - Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched NOT_EXPECT_MOVE %S", filename, expectedAction->sourceLine, gMoveNames[expectedMoveId]); + Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched NOT_EXPECT_MOVE %S", filename, expectedAction->sourceLine, GetBattleMoveName(expectedMoveId)); } } // Turn passed, clear logs from the turn @@ -934,7 +934,7 @@ static void CheckIfMaxScoreEqualExpectMove(u32 battlerId, s32 target, struct Exp && !(aiAction->moveSlots & gBitTable[bestScoreId])) { Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: EXPECT_MOVE %S has the same best score(%d) as not expected MOVE %S", filename, - aiAction->sourceLine, gMoveNames[moves[i]], scores[i], gMoveNames[moves[bestScoreId]]); + aiAction->sourceLine, GetBattleMoveName(moves[i]), scores[i], GetBattleMoveName(moves[bestScoreId])); } // We DO NOT expect move 'i', but it has the same best score as another move. if (scores[i] == scores[bestScoreId] @@ -943,7 +943,7 @@ static void CheckIfMaxScoreEqualExpectMove(u32 battlerId, s32 target, struct Exp && !(aiAction->moveSlots & gBitTable[bestScoreId])) { Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: NOT_EXPECT_MOVE %S has the same best score(%d) as MOVE %S", filename, - aiAction->sourceLine, gMoveNames[moves[i]], scores[i], gMoveNames[moves[bestScoreId]]); + aiAction->sourceLine, GetBattleMoveName(moves[i]), scores[i], GetBattleMoveName(moves[bestScoreId])); } } } @@ -956,7 +956,7 @@ static void PrintAiMoveLog(u32 battlerId, u32 moveSlot, u32 moveId, s32 totalSco if (DATA.aiLogPrintedForMove[battlerId] & gBitTable[moveSlot]) return; DATA.aiLogPrintedForMove[battlerId] |= gBitTable[moveSlot]; - MgbaPrintf_("Score Log for move %S:\n", gMoveNames[moveId]); + MgbaPrintf_("Score Log for move %S:\n", GetBattleMoveName(moveId)); for (i = 0; i < MAX_AI_LOG_LINES; i++) { struct AILogLine *log = &DATA.aiLogLines[battlerId][moveSlot][i]; @@ -1024,7 +1024,7 @@ void TestRunner_Battle_CheckAiMoveScores(u32 battlerId) if (!CheckComparision(scores[scoreCtx->moveSlot1], scoreCtx->value, scoreCtx->cmp)) { Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched SCORE_%s_VAL %S %d, got %d", - filename, scoreCtx->sourceLine, sCmpToStringTable[scoreCtx->cmp], gMoveNames[moveId1], scoreCtx->value, scores[scoreCtx->moveSlot1]); + filename, scoreCtx->sourceLine, sCmpToStringTable[scoreCtx->cmp], GetBattleMoveName(moveId1), scoreCtx->value, scores[scoreCtx->moveSlot1]); } } else @@ -1035,7 +1035,7 @@ void TestRunner_Battle_CheckAiMoveScores(u32 battlerId) if (!CheckComparision(scores[scoreCtx->moveSlot1], scores[scoreCtx->moveSlot2], scoreCtx->cmp)) { Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched SCORE_%s, got %S: %d, %S: %d", - filename, scoreCtx->sourceLine, sCmpToStringTable[scoreCtx->cmp], gMoveNames[moveId1], scores[scoreCtx->moveSlot1], gMoveNames[moveId2], scores[scoreCtx->moveSlot2]); + filename, scoreCtx->sourceLine, sCmpToStringTable[scoreCtx->cmp], GetBattleMoveName(moveId1), scores[scoreCtx->moveSlot1], GetBattleMoveName(moveId2), scores[scoreCtx->moveSlot2]); } } } @@ -1995,7 +1995,7 @@ s32 MoveGetTarget(s32 battlerId, u32 moveId, struct MoveContext *ctx, u32 source // In AI Doubles not specified target allows any target for EXPECT_MOVE. if (GetBattleTest()->type != BATTLE_TEST_AI_DOUBLES) { - INVALID_IF(STATE->battlersCount > 2, "%S requires explicit target", gMoveNames[moveId]); + INVALID_IF(STATE->battlersCount > 2, "%S requires explicit target", GetBattleMoveName(moveId)); } target = BATTLE_OPPOSITE(battlerId); @@ -2013,7 +2013,7 @@ s32 MoveGetTarget(s32 battlerId, u32 moveId, struct MoveContext *ctx, u32 source // In AI Doubles not specified target allows any target for EXPECT_MOVE. if (GetBattleTest()->type != BATTLE_TEST_AI_DOUBLES) { - INVALID("%S requires explicit target", gMoveNames[moveId]); + INVALID("%S requires explicit target", GetBattleMoveName(moveId)); } } } @@ -2038,7 +2038,7 @@ void MoveGetIdAndSlot(s32 battlerId, struct MoveContext *ctx, u32 *moveId, u32 * } else if (*moveId == MOVE_NONE) { - INVALID_IF(DATA.explicitMoves[battlerId & BIT_SIDE] & (1 << DATA.currentMonIndexes[battlerId]), "Missing explicit %S", gMoveNames[ctx->move]); + INVALID_IF(DATA.explicitMoves[battlerId & BIT_SIDE] & (1 << DATA.currentMonIndexes[battlerId]), "Missing explicit %S", GetBattleMoveName(ctx->move)); SetMonData(mon, MON_DATA_MOVE1 + i, &ctx->move); SetMonData(DATA.currentMon, MON_DATA_PP1 + i, &gBattleMoves[ctx->move].pp); *moveSlot = i; @@ -2201,7 +2201,7 @@ s32 GetAiMoveTargetForScoreCompare(u32 battlerId, u32 moveId, struct MoveContext else { // TODO: Fix ai targeting self in double battles. - INVALID_IF(!ctx->explicitTarget, "%S requires explicit target for score comparison in doubles", gMoveNames[moveId]); + INVALID_IF(!ctx->explicitTarget, "%S requires explicit target for score comparison in doubles", GetBattleMoveName(moveId)); target = MoveGetTarget(battlerId, moveId, ctx, sourceLine); } return target; From 28ac83d6171387bba8b4e659e0a4551e987879f2 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 10 Jan 2024 19:21:22 -0300 Subject: [PATCH 02/30] Reintroduced move names Misc: -Fixed Trick-or-Treat and Light of Ruin's expanded names. -Introduced a new field for Z-Move names, and a constant for their name length. -Added a few TODOs to GetBattleMoveName. -Updated GetMaxMoveName and GetZMoveName. There's no reason not to let GetBattleMoveName handle everything on its own. --- include/constants/global.h | 1 + include/pokemon.h | 1 + src/battle_dynamax.c | 5 +- src/battle_z_move.c | 5 +- src/data/battle_moves.h | 4463 +++++++++++++++++++++--------------- src/pokemon.c | 1 + 6 files changed, 2598 insertions(+), 1878 deletions(-) diff --git a/include/constants/global.h b/include/constants/global.h index cb023efab356..d408d48e0bc3 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -111,6 +111,7 @@ #else #define MOVE_NAME_LENGTH 12 #endif +#define Z_MOVE_NAME_LENGTH 27 #define NUM_QUESTIONNAIRE_WORDS 4 #define QUIZ_QUESTION_LEN 9 #define WONDER_CARD_TEXT_LENGTH 40 diff --git a/include/pokemon.h b/include/pokemon.h index cd15832cb346..b25276f8bea6 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -444,6 +444,7 @@ struct SpeciesInfo /*0x8C*/ struct BattleMove { u8 name[MOVE_NAME_LENGTH + 1]; + u8 zMoveName[Z_MOVE_NAME_LENGTH + 1]; const u8 *description; u16 effect; u8 power; diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index e7385d60e3f0..85d3133bb0b9 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -490,10 +490,7 @@ bool32 IsMaxMove(u16 move) // Returns the full name of a Max Move for the move usage text. const u8 *GetMaxMoveName(u16 move) { - if (IsMaxMove(move)) - return GetBattleMoveName(move); - else - return GetBattleMoveName(MOVE_NONE); // Failsafe + return GetBattleMoveName(move); } // Assigns the multistring to use for the "Damage Non- Types" G-Max effect. diff --git a/src/battle_z_move.c b/src/battle_z_move.c index c2a9c9a30286..ce2a029e9588 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -559,10 +559,7 @@ static void ZMoveSelectionDisplayMoveType(u16 zMove, u32 battler) const u8 *GetZMoveName(u16 move) { - if (IsZMove(move)) - return GetBattleMoveName(move); - else - return GetBattleMoveName(MOVE_NONE); // Failsafe + return GetBattleMoveName(move); } #define Z_EFFECT_BS_LENGTH 5 diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 21c1f37bf02b..e80e20d1fa2b 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -6,8 +6,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 0, .type = TYPE_NORMAL, @@ -24,8 +24,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pound"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -41,8 +41,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KARATE_CHOP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Karate Chop"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_FIGHTING, @@ -58,8 +58,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SLAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Double Slap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -74,8 +74,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMET_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Comet Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -91,8 +91,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mega Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -108,8 +108,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAY_DAY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pay Day"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PAY_DAY, .power = 40, .type = TYPE_NORMAL, @@ -123,8 +123,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fire Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 75, .type = TYPE_FIRE, @@ -141,8 +141,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ice Punch"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_USE_FROSTBITE == TRUE .effect = EFFECT_FROSTBITE_HIT, #else @@ -163,8 +163,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("ThunderPunch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 75, .type = TYPE_ELECTRIC, @@ -181,8 +181,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCRATCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Scratch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -197,8 +197,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VISE_GRIP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Vise Grip"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_NORMAL, @@ -213,8 +213,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUILLOTINE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Guillotine"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -229,8 +229,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_WIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Razor Wind"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -249,8 +249,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWORDS_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Swords Dance"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -271,8 +271,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Cut"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_NORMAL, @@ -288,8 +288,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Gust"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GUST, .power = 40, .type = TYPE_FLYING, @@ -306,8 +306,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WING_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wing Attack"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -322,8 +322,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLWIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Whirlwind"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 0, #else @@ -348,8 +348,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fly"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 90, #else @@ -373,8 +373,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bind"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 85, #else @@ -394,8 +394,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Slam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -411,8 +411,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VINE_WHIP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Vine Whip"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 45, .pp = 25, @@ -435,8 +435,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Stomp"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 65, .type = TYPE_NORMAL, @@ -454,8 +454,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Double Kick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_FIGHTING, @@ -471,8 +471,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mega Kick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -487,8 +487,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUMP_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Jump Kick"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 100, .pp = 10, @@ -512,8 +512,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLING_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rolling Kick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -530,8 +530,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sand Attack"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_GROUND, @@ -547,8 +547,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADBUTT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Headbutt"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 70, .type = TYPE_NORMAL, @@ -564,8 +564,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Horn Attack"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_NORMAL, @@ -580,8 +580,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fury Attack"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -596,8 +596,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_DRILL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Horn Drill"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -612,8 +612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACKLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tackle"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 40, .accuracy = 100, @@ -636,8 +636,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_SLAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Body Slam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 85, .type = TYPE_NORMAL, @@ -655,8 +655,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wrap"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 90, #else @@ -675,8 +675,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_DOWN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Take Down"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 90, .type = TYPE_NORMAL, @@ -692,8 +692,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THRASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Thrash"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, .pp = 10, @@ -714,8 +714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_EDGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Double-Edge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_NORMAL, @@ -731,8 +731,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_WHIP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tail Whip"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -748,8 +748,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_STING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Poison Sting"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 15, .type = TYPE_POISON, @@ -764,8 +764,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWINEEDLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Twineedle"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 25, .type = TYPE_BUG, @@ -782,8 +782,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIN_MISSILE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pin Missile"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 25, .accuracy = 95, @@ -802,8 +802,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Leer"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -819,8 +819,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bite"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_DARK, @@ -837,8 +837,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Growl"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -856,8 +856,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Roar"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 0, #else @@ -882,8 +882,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sing"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -901,8 +901,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERSONIC] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Supersonic"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_NORMAL, @@ -920,8 +920,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SONIC_BOOM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sonic Boom"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SONICBOOM, .power = 1, .type = TYPE_NORMAL, @@ -935,8 +935,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISABLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Disable"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -959,8 +959,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Acid"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, #else @@ -979,8 +979,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ember"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 40, .type = TYPE_FIRE, @@ -995,8 +995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAMETHROWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flamethrower"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -1015,8 +1015,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mist"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIST, .power = 0, .type = TYPE_ICE, @@ -1034,8 +1034,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_GUN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Water Gun"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -1049,8 +1049,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_PUMP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hydro Pump"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -1068,8 +1068,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURF] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Surf"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, .target = MOVE_TARGET_FOES_AND_ALLY, @@ -1093,8 +1093,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ice Beam"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -1119,8 +1119,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLIZZARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Blizzard"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -1144,8 +1144,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psybeam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 65, .type = TYPE_PSYCHIC, @@ -1160,8 +1160,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bubble Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 65, .type = TYPE_WATER, @@ -1176,8 +1176,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aurora Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 65, .type = TYPE_ICE, @@ -1192,8 +1192,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hyper Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_NORMAL, @@ -1208,8 +1208,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PECK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Peck"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_FLYING, @@ -1224,8 +1224,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_PECK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Drill Peck"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FLYING, @@ -1240,8 +1240,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBMISSION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Submission"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -1261,8 +1261,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Low Kick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_FIGHTING, @@ -1277,8 +1277,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COUNTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Counter"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COUNTER, .power = 1, .type = TYPE_FIGHTING, @@ -1298,8 +1298,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEISMIC_TOSS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Seismic Toss"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_FIGHTING, @@ -1315,8 +1315,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Strength"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -1331,8 +1331,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ABSORB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Absorb"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .pp = 25, #else @@ -1352,8 +1352,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_DRAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mega Drain"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .pp = 15, #else @@ -1373,8 +1373,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_SEED] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Leech Seed"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LEECH_SEED, .power = 0, .type = TYPE_GRASS, @@ -1390,8 +1390,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWTH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Growth"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -1417,8 +1417,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_LEAF] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Razor Leaf"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_GRASS, @@ -1434,8 +1434,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Solar Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOLAR_BEAM, .power = 120, .type = TYPE_GRASS, @@ -1452,8 +1452,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_POWDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("PoisonPowder"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON, .power = 0, .type = TYPE_POISON, @@ -1470,8 +1470,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUN_SPORE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Stun Spore"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_GRASS, @@ -1488,8 +1488,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_POWDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sleep Powder"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -1506,8 +1506,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Petal Dance"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, .pp = 10, @@ -1532,8 +1532,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRING_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("String Shot"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .effect = EFFECT_SPEED_DOWN_2, #else @@ -1553,8 +1553,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dragon Rage"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DRAGON_RAGE, .power = 1, .type = TYPE_DRAGON, @@ -1569,8 +1569,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_SPIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fire Spin"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 35, .accuracy = 85, @@ -1590,8 +1590,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_SHOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("ThunderShock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 40, .type = TYPE_ELECTRIC, @@ -1606,8 +1606,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERBOLT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Thunderbolt"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -1626,8 +1626,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_WAVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Thunder Wave"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .accuracy = 90, #else @@ -1647,8 +1647,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Thunder"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -1668,8 +1668,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_THROW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rock Throw"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_ROCK, @@ -1683,8 +1683,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTHQUAKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Earthquake"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EARTHQUAKE, .power = 100, .type = TYPE_GROUND, @@ -1701,8 +1701,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISSURE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fissure"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_GROUND, @@ -1718,8 +1718,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dig"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 80, #else @@ -1743,8 +1743,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Toxic"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 90, #else @@ -1764,8 +1764,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Confusion"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 50, .type = TYPE_PSYCHIC, @@ -1780,8 +1780,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psychic"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_PSYCHIC, @@ -1796,8 +1796,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPNOSIS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hypnosis"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_PSYCHIC, @@ -1813,8 +1813,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEDITATE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Meditate"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_PSYCHIC, @@ -1832,8 +1832,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AGILITY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Agility"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -1851,8 +1851,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Quick Attack"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -1867,8 +1867,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rage"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAGE, .power = 20, .type = TYPE_NORMAL, @@ -1883,8 +1883,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEPORT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Teleport"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TELEPORT, .power = 0, .type = TYPE_PSYCHIC, @@ -1901,8 +1901,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SHADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Night Shade"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_GHOST, @@ -1916,8 +1916,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIMIC] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mimic"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIMIC, .power = 0, .type = TYPE_NORMAL, @@ -1940,8 +1940,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCREECH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Screech"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -1959,8 +1959,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_TEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Double Team"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EVASION_UP, .power = 0, .type = TYPE_NORMAL, @@ -1978,8 +1978,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECOVER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Recover"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -2004,8 +2004,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARDEN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Harden"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_NORMAL, @@ -2023,8 +2023,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MINIMIZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Minimize"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 10, #else @@ -2046,8 +2046,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOKESCREEN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Smokescreen"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -2063,8 +2063,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSE_RAY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Confuse Ray"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_GHOST, @@ -2080,8 +2080,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WITHDRAW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Withdraw"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_WATER, @@ -2099,8 +2099,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFENSE_CURL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Defense Curl"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_CURL, .power = 0, .type = TYPE_NORMAL, @@ -2118,8 +2118,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRIER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Barrier"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -2141,8 +2141,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_SCREEN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Light Screen"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LIGHT_SCREEN, .power = 0, .type = TYPE_PSYCHIC, @@ -2160,8 +2160,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Haze"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HAZE, .power = 0, .type = TYPE_ICE, @@ -2179,8 +2179,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Reflect"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REFLECT, .power = 0, .type = TYPE_PSYCHIC, @@ -2198,8 +2198,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_ENERGY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Focus Energy"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOCUS_ENERGY, .power = 0, .type = TYPE_NORMAL, @@ -2217,8 +2217,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIDE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bide"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, .priority = 1, @@ -2241,8 +2241,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METRONOME] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Metronome"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METRONOME, .power = 0, .type = TYPE_NORMAL, @@ -2265,8 +2265,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_MOVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mirror Move"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIRROR_MOVE, .power = 0, .type = TYPE_FLYING, @@ -2288,8 +2288,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SELF_DESTRUCT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("SelfDestruct"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXPLOSION, .power = 200, .type = TYPE_NORMAL, @@ -2304,8 +2304,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EGG_BOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Egg Bomb"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -2320,8 +2320,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lick"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 30, #else @@ -2341,8 +2341,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Smog"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 30, #else @@ -2361,8 +2361,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sludge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 65, .type = TYPE_POISON, @@ -2377,8 +2377,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_CLUB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bone Club"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 65, .type = TYPE_GROUND, @@ -2393,8 +2393,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_BLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fire Blast"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -2413,8 +2413,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATERFALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Waterfall"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_FLINCH_HIT, #else @@ -2434,8 +2434,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLAMP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Clamp"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 85, .pp = 15, @@ -2456,8 +2456,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWIFT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Swift"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_NORMAL, @@ -2471,8 +2471,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKULL_BASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Skull Bash"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 130, .pp = 10, @@ -2495,8 +2495,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKE_CANNON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spike Cannon"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 20, .type = TYPE_NORMAL, @@ -2510,8 +2510,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONSTRICT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Constrict"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 10, .type = TYPE_NORMAL, @@ -2527,8 +2527,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AMNESIA] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Amnesia"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -2546,8 +2546,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINESIS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Kinesis"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_PSYCHIC, @@ -2563,8 +2563,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOFT_BOILED] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Soft-Boiled"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -2587,8 +2587,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_JUMP_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("HighJumpKick"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 130, .pp = 10, @@ -2612,8 +2612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Glare"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_5 @@ -2635,8 +2635,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DREAM_EATER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dream Eater"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DREAM_EATER, .power = 100, .type = TYPE_PSYCHIC, @@ -2651,8 +2651,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_GAS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Poison Gas"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 90, .target = MOVE_TARGET_BOTH, @@ -2676,8 +2676,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Barrage"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -2692,8 +2692,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_LIFE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Leech Life"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 80, .pp = 10, @@ -2715,8 +2715,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOVELY_KISS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lovely Kiss"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -2732,8 +2732,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sky Attack"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_FLYING, @@ -2752,8 +2752,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRANSFORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Transform"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRANSFORM, .power = 0, .type = TYPE_NORMAL, @@ -2776,8 +2776,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bubble"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 40, #else @@ -2796,8 +2796,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIZZY_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dizzy Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 70, .type = TYPE_NORMAL, @@ -2814,8 +2814,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPORE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spore"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -2832,8 +2832,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flash"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 100, #else @@ -2853,8 +2853,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYWAVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psywave"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, #else @@ -2872,8 +2872,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Splash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -2891,8 +2891,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_ARMOR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Acid Armor"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -2914,8 +2914,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRABHAMMER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Crabhammer"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 100, .accuracy = 90, @@ -2939,8 +2939,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPLOSION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Explosion"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXPLOSION, .power = 250, .type = TYPE_NORMAL, @@ -2955,8 +2955,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_SWIPES] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fury Swipes"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -2971,8 +2971,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONEMERANG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bonemerang"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_GROUND, @@ -2987,8 +2987,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rest"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -3011,8 +3011,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SLIDE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rock Slide"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 75, .type = TYPE_ROCK, @@ -3027,8 +3027,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_FANG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hyper Fang"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_NORMAL, @@ -3045,8 +3045,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHARPEN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sharpen"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -3064,8 +3064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Conversin"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONVERSION, .power = 0, .type = TYPE_NORMAL, @@ -3083,8 +3083,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRI_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tri Attack"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRI_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -3099,8 +3099,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPER_FANG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Super Fang"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_NORMAL, @@ -3116,8 +3116,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Slash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -3134,8 +3134,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBSTITUTE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Substitute"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUBSTITUTE, .power = 0, .type = TYPE_NORMAL, @@ -3154,8 +3154,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Struggle"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, .effect = EFFECT_RECOIL_HP_25, @@ -3186,8 +3186,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKETCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sketch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKETCH, .power = 0, .type = TYPE_NORMAL, @@ -3213,8 +3213,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Triple Kick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRIPLE_KICK, .power = 10, .type = TYPE_FIGHTING, @@ -3230,8 +3230,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THIEF] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Thief"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, .pp = 25, @@ -3256,8 +3256,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIDER_WEB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spider Web"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_BUG, @@ -3274,8 +3274,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_READER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mind Reader"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, #else @@ -3294,8 +3294,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHTMARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Nightmare"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 100, #else @@ -3315,8 +3315,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_WHEEL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flame Wheel"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 60, .type = TYPE_FIRE, @@ -3333,8 +3333,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNORE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Snore"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 50, #else @@ -3356,8 +3356,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CURSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Curse"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_TYPES >= GEN_5 .type = TYPE_GHOST, #else @@ -3379,8 +3379,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flail"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_NORMAL, @@ -3395,8 +3395,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION_2] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Conversion 2"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONVERSION_2, .power = 0, .type = TYPE_NORMAL, @@ -3414,8 +3414,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AEROBLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aeroblast"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FLYING, @@ -3431,8 +3431,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_SPORE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Cotton Spore"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, .target = MOVE_TARGET_BOTH, @@ -3457,8 +3457,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVERSAL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Reversal"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_FIGHTING, @@ -3473,8 +3473,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPITE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spite"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPITE, .power = 0, .type = TYPE_GHOST, @@ -3491,8 +3491,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER_SNOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Powder Snow"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_USE_FROSTBITE == TRUE .effect = EFFECT_FROSTBITE_HIT, #else @@ -3511,8 +3511,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PROTECT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Protect"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 4, #else @@ -3535,8 +3535,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MACH_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mach Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -3552,8 +3552,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCARY_FACE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Scary Face"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 100, #else @@ -3573,8 +3573,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Feint Attack"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .makesContact = TRUE, #endif @@ -3591,8 +3591,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_KISS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sweet Kiss"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_TYPES >= GEN_6 .type = TYPE_FAIRY, #else @@ -3612,8 +3612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELLY_DRUM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Belly Drum"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BELLY_DRUM, .power = 0, .type = TYPE_NORMAL, @@ -3631,8 +3631,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_BOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sludge Bomb"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 90, .type = TYPE_POISON, @@ -3648,8 +3648,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SLAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mud-Slap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 20, .type = TYPE_GROUND, @@ -3664,8 +3664,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTAZOOKA] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Octazooka"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_WATER, @@ -3681,8 +3681,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKES] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spikes"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPIKES, .power = 0, .type = TYPE_GROUND, @@ -3702,8 +3702,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZAP_CANNON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Zap Cannon"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 120, #else @@ -3723,8 +3723,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESIGHT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Foresight"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 0, #else @@ -3745,8 +3745,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DESTINY_BOND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Destiny Bond"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DESTINY_BOND, .power = 0, .type = TYPE_GHOST, @@ -3767,8 +3767,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PERISH_SONG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Perish Song"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PERISH_SONG, .power = 0, .type = TYPE_NORMAL, @@ -3787,8 +3787,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICY_WIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Icy Wind"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 55, .type = TYPE_ICE, @@ -3804,8 +3804,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DETECT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Detect"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 4, #else @@ -3830,8 +3830,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_RUSH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bone Rush"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 90, #else @@ -3849,8 +3849,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOCK_ON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lock-On"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, #else @@ -3869,8 +3869,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OUTRAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Outrage"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, .pp = 10, @@ -3894,8 +3894,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSTORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sandstorm"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SANDSTORM, .power = 0, .type = TYPE_ROCK, @@ -3913,8 +3913,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_DRAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Giga Drain"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 75, .pp = 10, @@ -3938,8 +3938,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDURE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Endure"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 4, #else @@ -3964,8 +3964,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Charm"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_TYPES >= GEN_6 .type = TYPE_FAIRY, #else @@ -3985,8 +3985,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLOUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rollout"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ROCK, @@ -4003,8 +4003,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SWIPE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("False Swipe"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FALSE_SWIPE, .power = 40, .type = TYPE_NORMAL, @@ -4019,8 +4019,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWAGGER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Swagger"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .accuracy = 85, #else @@ -4040,8 +4040,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MILK_DRINK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Milk Drink"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -4064,8 +4064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spark"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 65, .type = TYPE_ELECTRIC, @@ -4081,8 +4081,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_CUTTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fury Cutter"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 40, #elif B_UPDATED_MOVE_DATA == GEN_5 @@ -4104,8 +4104,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_WING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Steel Wing"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_HIT, .power = 70, .type = TYPE_STEEL, @@ -4121,8 +4121,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEAN_LOOK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mean Look"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -4139,8 +4139,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTRACT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Attract"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTRACT, .power = 0, .type = TYPE_NORMAL, @@ -4157,8 +4157,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_TALK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sleep Talk"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP_TALK, .power = 0, .type = TYPE_NORMAL, @@ -4182,8 +4182,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BELL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heal Bell"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_NORMAL, @@ -4203,8 +4203,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETURN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Return"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -4219,8 +4219,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRESENT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Present"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PRESENT, .power = 1, .type = TYPE_NORMAL, @@ -4235,8 +4235,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRUSTRATION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Frustration"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FRUSTRATION, .power = 1, .type = TYPE_NORMAL, @@ -4251,8 +4251,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAFEGUARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Safeguard"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SAFEGUARD, .power = 0, .type = TYPE_NORMAL, @@ -4270,8 +4270,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAIN_SPLIT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pain Split"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PAIN_SPLIT, .power = 0, .type = TYPE_NORMAL, @@ -4286,8 +4286,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_FIRE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sacred Fire"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 100, .type = TYPE_FIRE, @@ -4303,8 +4303,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNITUDE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Magnitude"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGNITUDE, .power = 1, .type = TYPE_GROUND, @@ -4320,8 +4320,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMIC_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("DynamicPunch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -4338,8 +4338,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGAHORN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Megahorn"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_BUG, @@ -4354,8 +4354,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_BREATH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("DragonBreath"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 60, .type = TYPE_DRAGON, @@ -4371,8 +4371,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BATON_PASS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Baton Pass"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BATON_PASS, .power = 0, .type = TYPE_NORMAL, @@ -4389,8 +4389,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENCORE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Encore"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ENCORE, .power = 0, .type = TYPE_NORMAL, @@ -4408,8 +4408,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURSUIT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pursuit"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PURSUIT, .power = 40, .type = TYPE_DARK, @@ -4425,8 +4425,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAPID_SPIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rapid Spin"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 50, #else @@ -4445,8 +4445,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_SCENT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sweet Scent"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .effect = EFFECT_EVASION_DOWN_2, #else @@ -4466,8 +4466,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_TAIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Iron Tail"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 100, .type = TYPE_STEEL, @@ -4483,8 +4483,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_CLAW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Metal Claw"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_UP_HIT, .power = 50, .type = TYPE_STEEL, @@ -4500,8 +4500,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VITAL_THROW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Vital Throw"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_VITAL_THROW, .power = 70, .type = TYPE_FIGHTING, @@ -4516,8 +4516,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORNING_SUN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Morning Sun"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MORNING_SUN, .power = 0, .type = TYPE_NORMAL, @@ -4536,8 +4536,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNTHESIS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Synthesis"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SYNTHESIS, .power = 0, .type = TYPE_GRASS, @@ -4556,8 +4556,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONLIGHT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Moonlight"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_TYPES >= GEN_6 .type = TYPE_FAIRY, #else @@ -4580,8 +4580,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIDDEN_POWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hidden Power"), + .description = COMPOUND_STRING("Dummy2 description."), .power = B_HIDDEN_POWER_DMG >= GEN_6 ? 60 : 1, .effect = EFFECT_HIDDEN_POWER, .type = TYPE_NORMAL, @@ -4595,8 +4595,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_CHOP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Cross Chop"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -4612,8 +4612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWISTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Twister"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 40, .type = TYPE_DRAGON, @@ -4630,8 +4630,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAIN_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rain Dance"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAIN_DANCE, .power = 0, .type = TYPE_WATER, @@ -4648,8 +4648,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNNY_DAY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sunny Day"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUNNY_DAY, .power = 0, .type = TYPE_FIRE, @@ -4666,8 +4666,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Crunch"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_DEFENSE_DOWN_HIT, #else @@ -4688,8 +4688,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_COAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mirror Coat"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIRROR_COAT, .power = 1, .type = TYPE_PSYCHIC, @@ -4707,8 +4707,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCH_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psych Up"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYCH_UP, .power = 0, .type = TYPE_NORMAL, @@ -4727,8 +4727,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_SPEED] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("ExtremeSpeed"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 2, #else @@ -4747,8 +4747,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCIENT_POWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("AncientPower"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA < GEN_4 .makesContact = TRUE, #endif @@ -4766,8 +4766,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shadow Ball"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_GHOST, @@ -4783,8 +4783,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUTURE_SIGHT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Future Sight"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, .accuracy = 100, @@ -4810,8 +4810,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SMASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rock Smash"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 40, #else @@ -4831,8 +4831,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLPOOL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Whirlpool"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 35, .accuracy = 85, @@ -4852,8 +4852,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAT_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Beat Up"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 1, #else @@ -4871,8 +4871,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_OUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fake Out"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .priority = 3, .makesContact = TRUE, @@ -4895,8 +4895,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPROAR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Uproar"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 90, #else @@ -4918,8 +4918,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOCKPILE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Stockpile"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .pp = 20, #else @@ -4941,8 +4941,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIT_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spit Up"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 1, #else @@ -4961,8 +4961,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWALLOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Swallow"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SWALLOW, .power = 0, .type = TYPE_NORMAL, @@ -4981,8 +4981,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_WAVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heat Wave"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 95, #else @@ -5002,8 +5002,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hail"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HAIL, .power = 0, .type = TYPE_ICE, @@ -5020,8 +5020,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORMENT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Torment"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TORMENT, .power = 0, .type = TYPE_DARK, @@ -5037,8 +5037,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLATTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flatter"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLATTER, .power = 0, .type = TYPE_DARK, @@ -5054,8 +5054,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILL_O_WISP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Will-o-Wisp"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 85, #else @@ -5075,8 +5075,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEMENTO] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Memento"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MEMENTO, .power = 0, .type = TYPE_DARK, @@ -5091,8 +5091,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FACADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Facade"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FACADE, .power = 70, .type = TYPE_NORMAL, @@ -5107,8 +5107,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Focus Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOCUS_PUNCH, .power = 150, .type = TYPE_FIGHTING, @@ -5131,8 +5131,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMELLING_SALTS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("SmellngSalts"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 70, #else @@ -5152,8 +5152,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOLLOW_ME] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Follow Me"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .priority = 2, #else @@ -5177,8 +5177,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURE_POWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Nature Power"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NATURE_POWER, .power = 1, .type = TYPE_NORMAL, @@ -5199,8 +5199,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Charge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CHARGE, .power = 0, .type = TYPE_ELECTRIC, @@ -5218,8 +5218,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAUNT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Taunt"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TAUNT, .power = 0, .type = TYPE_DARK, @@ -5236,8 +5236,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HELPING_HAND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Helping Hand"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .target = MOVE_TARGET_ALLY, #else @@ -5262,8 +5262,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Trick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -5281,8 +5281,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLE_PLAY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Role Play"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROLE_PLAY, .power = 0, .type = TYPE_PSYCHIC, @@ -5300,8 +5300,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WISH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wish"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WISH, .power = 0, .type = TYPE_NORMAL, @@ -5320,8 +5320,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSIST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Assist"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ASSIST, .power = 0, .type = TYPE_NORMAL, @@ -5344,8 +5344,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INGRAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ingrain"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_INGRAIN, .power = 0, .type = TYPE_GRASS, @@ -5364,8 +5364,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERPOWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Superpower"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPERPOWER, .power = 120, .type = TYPE_FIGHTING, @@ -5380,8 +5380,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_COAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Magic Coat"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGIC_COAT, .power = 0, .type = TYPE_PSYCHIC, @@ -5398,8 +5398,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECYCLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Recycle"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECYCLE, .power = 0, .type = TYPE_NORMAL, @@ -5417,8 +5417,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVENGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Revenge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REVENGE, .power = 60, .type = TYPE_FIGHTING, @@ -5433,8 +5433,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRICK_BREAK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Brick Break"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BRICK_BREAK, .power = 75, .type = TYPE_FIGHTING, @@ -5449,8 +5449,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_YAWN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Yawn"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_YAWN, .power = 0, .type = TYPE_NORMAL, @@ -5466,8 +5466,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KNOCK_OFF] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Knock Off"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 65, #else @@ -5486,8 +5486,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDEAVOR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Endeavor"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ENDEAVOR, .power = 1, .type = TYPE_NORMAL, @@ -5503,8 +5503,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ERUPTION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Eruption"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_FIRE, @@ -5518,8 +5518,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKILL_SWAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Skill Swap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKILL_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -5535,8 +5535,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IMPRISON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Imprison"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_IMPRISON, .power = 0, .type = TYPE_PSYCHIC, @@ -5556,8 +5556,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFRESH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Refresh"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REFRESH, .power = 0, .type = TYPE_NORMAL, @@ -5575,8 +5575,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRUDGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Grudge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRUDGE, .power = 0, .type = TYPE_GHOST, @@ -5594,8 +5594,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNATCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Snatch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SNATCH, .power = 0, .type = TYPE_DARK, @@ -5615,8 +5615,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_POWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Secret Power"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SECRET_POWER, .power = 70, .type = TYPE_NORMAL, @@ -5631,8 +5631,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dive"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 80, #else @@ -5656,8 +5656,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARM_THRUST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Arm Thrust"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_FIGHTING, @@ -5672,8 +5672,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAMOUFLAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Camouflage"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CAMOUFLAGE, .power = 0, .type = TYPE_NORMAL, @@ -5691,8 +5691,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_GLOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tail Glow"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .effect = EFFECT_SPECIAL_ATTACK_UP_3, #else @@ -5714,8 +5714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUSTER_PURGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Luster Purge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, @@ -5730,8 +5730,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST_BALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mist Ball"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, @@ -5747,8 +5747,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEATHER_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("FeatherDance"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_2, .power = 0, .type = TYPE_FLYING, @@ -5765,8 +5765,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEETER_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Teeter Dance"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TEETER_DANCE, .power = 0, .type = TYPE_NORMAL, @@ -5783,8 +5783,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZE_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Blaze Kick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 85, .type = TYPE_FIRE, @@ -5801,8 +5801,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SPORT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mud Sport"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MUD_SPORT, .power = 0, .type = TYPE_GROUND, @@ -5820,8 +5820,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ice Ball"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ICE, @@ -5839,8 +5839,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NEEDLE_ARM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Needle Arm"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_GRASS, @@ -5857,8 +5857,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLACK_OFF] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Slack Off"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -5881,8 +5881,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_VOICE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hyper Voice"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -5898,8 +5898,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_FANG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Poison Fang"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .secondaryEffectChance = 50, #else @@ -5920,8 +5920,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_CLAW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Crush Claw"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 75, .type = TYPE_NORMAL, @@ -5937,8 +5937,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAST_BURN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Blast Burn"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_FIRE, @@ -5952,8 +5952,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_CANNON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hydro Cannon"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_WATER, @@ -5967,8 +5967,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_MASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Meteor Mash"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, .accuracy = 90, @@ -5990,8 +5990,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTONISH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Astonish"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 30, .type = TYPE_GHOST, @@ -6008,8 +6008,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WEATHER_BALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Weather Ball"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WEATHER_BALL, .power = 50, .type = TYPE_NORMAL, @@ -6024,8 +6024,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATHERAPY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aromatherapy"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_GRASS, @@ -6043,8 +6043,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_TEARS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fake Tears"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_DARK, @@ -6060,8 +6060,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_CUTTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Air Cutter"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -6082,8 +6082,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERHEAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Overheat"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 130, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -6104,8 +6104,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ODOR_SLEUTH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Odor Sleuth"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .accuracy = 0, #else @@ -6126,8 +6126,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_TOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rock Tomb"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, .accuracy = 95, @@ -6148,8 +6148,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILVER_WIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Silver Wind"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ALL_STATS_UP_HIT, .power = 60, .type = TYPE_BUG, @@ -6165,8 +6165,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_SOUND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Metal Sound"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_STEEL, @@ -6184,8 +6184,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_WHISTLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("GrassWhistle"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -6203,8 +6203,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TICKLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tickle"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TICKLE, .power = 0, .type = TYPE_NORMAL, @@ -6220,8 +6220,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COSMIC_POWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Cosmic Power"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_PSYCHIC, @@ -6239,8 +6239,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPOUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Water Spout"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_WATER, @@ -6254,8 +6254,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIGNAL_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Signal Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 75, .type = TYPE_BUG, @@ -6270,8 +6270,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("hadow Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GHOST, @@ -6287,8 +6287,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTRASENSORY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Extrasensory"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 20, #else @@ -6308,8 +6308,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_UPPERCUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sky Uppercut"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKY_UPPERCUT, .power = 85, .type = TYPE_FIGHTING, @@ -6326,8 +6326,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_TOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sand Tomb"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 35, .accuracy = 85, @@ -6346,8 +6346,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHEER_COLD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sheer Cold"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_ICE, @@ -6361,8 +6361,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUDDY_WATER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Muddy Water"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -6382,8 +6382,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_SEED] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bullet Seed"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 25, #else @@ -6402,8 +6402,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AERIAL_ACE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aerial Ace"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -6419,8 +6419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_SPEAR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Icicle Spear"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 25, #else @@ -6438,8 +6438,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_DEFENSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Iron Defense"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -6457,8 +6457,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Block"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -6475,8 +6475,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOWL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Howl"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .effect = EFFECT_ATTACK_UP_USER_ALLY, #else @@ -6499,8 +6499,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CLAW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dragon Claw"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DRAGON, @@ -6515,8 +6515,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRENZY_PLANT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Frenzy Plant"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_GRASS, @@ -6531,8 +6531,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULK_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bulk Up"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BULK_UP, .power = 0, .type = TYPE_FIGHTING, @@ -6550,8 +6550,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bounce"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 85, .type = TYPE_FLYING, @@ -6573,8 +6573,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mud Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 55, .type = TYPE_GROUND, @@ -6589,8 +6589,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_TAIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Poison Tail"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 50, .type = TYPE_POISON, @@ -6607,8 +6607,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COVET] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Covet"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, .pp = 25, @@ -6640,8 +6640,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_TACKLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Volt Tackle"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .argument = STATUS1_PARALYSIS, #endif @@ -6661,8 +6661,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_LEAF] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Magical Leaf"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GRASS, @@ -6676,8 +6676,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPORT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Water Sport"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WATER_SPORT, .power = 0, .type = TYPE_WATER, @@ -6695,8 +6695,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CALM_MIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Calm Mind"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CALM_MIND, .power = 0, .type = TYPE_PSYCHIC, @@ -6714,8 +6714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_BLADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Leaf Blade"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .power = 90, #else @@ -6736,8 +6736,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dragon Dance"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DRAGON_DANCE, .power = 0, .type = TYPE_DRAGON, @@ -6756,8 +6756,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_BLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rock Blast"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 90, #else @@ -6776,8 +6776,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHOCK_WAVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shock Wave"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_ELECTRIC, @@ -6791,8 +6791,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PULSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Water Pulse"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 60, .type = TYPE_WATER, @@ -6808,8 +6808,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOOM_DESIRE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Doom Desire"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 140, .accuracy = 100, @@ -6830,8 +6830,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_BOOST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psycho Boost"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OVERHEAT, .power = 140, .type = TYPE_PSYCHIC, @@ -6845,8 +6845,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROOST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Roost"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -6869,8 +6869,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAVITY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Gravity"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRAVITY, .power = 0, .type = TYPE_PSYCHIC, @@ -6888,8 +6888,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRACLE_EYE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Miracle Eye"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIRACLE_EYE, .power = 0, .type = TYPE_PSYCHIC, @@ -6906,8 +6906,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAKE_UP_SLAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wake-Up Slap"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 70, #else @@ -6927,8 +6927,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAMMER_ARM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hammer Arm"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HAMMER_ARM, .power = 100, .type = TYPE_FIGHTING, @@ -6944,8 +6944,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GYRO_BALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Gyro Ball"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GYRO_BALL, .power = 1, .type = TYPE_STEEL, @@ -6961,8 +6961,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEALING_WISH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Healing Wish"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEALING_WISH, .power = 0, .type = TYPE_PSYCHIC, @@ -6980,8 +6980,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRINE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Brine"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BRINE, .power = 65, .type = TYPE_WATER, @@ -6995,8 +6995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURAL_GIFT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Natural Gift"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NATURAL_GIFT, .power = 1, .type = TYPE_NORMAL, @@ -7010,8 +7010,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Feint"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 30, #else @@ -7034,8 +7034,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLUCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pluck"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BUG_BITE, .power = 60, .type = TYPE_FLYING, @@ -7050,8 +7050,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAILWIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tailwind"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 15, #else @@ -7074,8 +7074,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACUPRESSURE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Acupressure"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACUPRESSURE, .power = 0, .type = TYPE_NORMAL, @@ -7093,8 +7093,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_BURST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Metal Burst"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METAL_BURST, .power = 1, .type = TYPE_STEEL, @@ -7109,8 +7109,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_U_TURN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("U-Turn"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ESCAPE, .power = 70, .type = TYPE_BUG, @@ -7125,8 +7125,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLOSE_COMBAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Close Combat"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CLOSE_COMBAT, .power = 120, .type = TYPE_FIGHTING, @@ -7141,8 +7141,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAYBACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Payback"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PAYBACK, .power = 50, .type = TYPE_DARK, @@ -7157,8 +7157,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSURANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Asurance"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -7177,8 +7177,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBARGO] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Embargo"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EMBARGO, .power = 0, .type = TYPE_DARK, @@ -7194,8 +7194,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fling"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLING, .power = 1, .type = TYPE_DARK, @@ -7210,8 +7210,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_SHIFT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psycho Shift"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, #else @@ -7230,8 +7230,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRUMP_CARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Trump Card"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRUMP_CARD, .power = 1, .type = TYPE_NORMAL, @@ -7246,8 +7246,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BLOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heal Block"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_BLOCK, .power = 0, .type = TYPE_PSYCHIC, @@ -7263,8 +7263,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRING_OUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wring Out"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_NORMAL, @@ -7279,8 +7279,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Power Trick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWER_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -7298,8 +7298,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GASTRO_ACID] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Gastro Acid"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GASTRO_ACID, .power = 0, .type = TYPE_POISON, @@ -7315,8 +7315,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUCKY_CHANT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lucky Chant"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LUCKY_CHANT, .power = 0, .type = TYPE_NORMAL, @@ -7334,8 +7334,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ME_FIRST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Me First"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ME_FIRST, .power = 0, .type = TYPE_NORMAL, @@ -7360,8 +7360,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COPYCAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Copycat"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COPYCAT, .power = 0, .type = TYPE_NORMAL, @@ -7385,8 +7385,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SWAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Power Swap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWER_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -7402,8 +7402,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SWAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Guard Swap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GUARD_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -7419,8 +7419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PUNISHMENT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Punishment"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PUNISHMENT, .power = 60, .type = TYPE_DARK, @@ -7435,8 +7435,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESORT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Last Resort"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 140, #else @@ -7455,8 +7455,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORRY_SEED] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Worry Seed"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WORRY_SEED, .power = 0, .type = TYPE_GRASS, @@ -7472,8 +7472,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUCKER_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sucker Punch"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 70, #else @@ -7492,8 +7492,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_SPIKES] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Toxic Spikes"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TOXIC_SPIKES, .power = 0, .type = TYPE_POISON, @@ -7513,8 +7513,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_SWAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heart Swap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEART_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -7530,8 +7530,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_RING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aqua Ring"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AQUA_RING, .power = 0, .type = TYPE_WATER, @@ -7549,8 +7549,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_RISE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Magnet Rise"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGNET_RISE, .power = 0, .type = TYPE_ELECTRIC, @@ -7569,8 +7569,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLARE_BLITZ] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flare Blitz"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_FIRE, @@ -7589,8 +7589,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORCE_PALM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Force Palm"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -7606,8 +7606,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_SPHERE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aura Sphere"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -7627,8 +7627,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_POLISH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rock Polish"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_ROCK, @@ -7646,8 +7646,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_JAB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Poison Jab"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 80, .type = TYPE_POISON, @@ -7663,8 +7663,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_PULSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dark Pulse"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_DARK, @@ -7680,8 +7680,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SLASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Night Slash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_DARK, @@ -7698,8 +7698,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_TAIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aqua Tail"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -7714,8 +7714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_BOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Seed Bomb"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GRASS, @@ -7730,8 +7730,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_SLASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Air Slash"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 15, #else @@ -7751,8 +7751,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_X_SCISSOR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("X-Scissor"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_BUG, @@ -7768,8 +7768,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BUZZ] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bug Buzz"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_BUG, @@ -7786,8 +7786,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_PULSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dragon Pulse"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 85, #else @@ -7806,8 +7806,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RUSH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dragon Rush"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 100, .type = TYPE_DRAGON, @@ -7824,8 +7824,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_GEM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Power Gem"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -7843,8 +7843,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAIN_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Drain Punch"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 75, .pp = 10, @@ -7866,8 +7866,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VACUUM_WAVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Vacuum Wave"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -7881,8 +7881,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_BLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Focus Blast"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 120, .type = TYPE_FIGHTING, @@ -7898,8 +7898,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENERGY_BALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Energy Ball"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 90, #else @@ -7919,8 +7919,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRAVE_BIRD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Brave Bird"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_FLYING, @@ -7936,8 +7936,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTH_POWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Earth Power"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_GROUND, @@ -7953,8 +7953,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWITCHEROO] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Switcheroo"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRICK, .power = 0, .type = TYPE_DARK, @@ -7972,8 +7972,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_IMPACT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Giga Impact"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_NORMAL, @@ -7988,8 +7988,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NASTY_PLOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Nasty Plot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, .type = TYPE_DARK, @@ -8007,8 +8007,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bullet Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_STEEL, @@ -8024,8 +8024,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AVALANCHE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Avalanche"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REVENGE, .power = 60, .type = TYPE_ICE, @@ -8040,8 +8040,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SHARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ice Shard"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ICE, @@ -8055,8 +8055,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_CLAW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shadow Claw"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GHOST, @@ -8072,8 +8072,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_FANG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Thunder Fang"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_STATUS, .power = 65, .type = TYPE_ELECTRIC, @@ -8091,8 +8091,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_FANG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ice Fang"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_USE_FROSTBITE == TRUE .argument = STATUS1_FROSTBITE, #else @@ -8114,8 +8114,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_FANG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fire Fang"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_STATUS, .power = 65, .type = TYPE_FIRE, @@ -8133,8 +8133,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_SNEAK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shadow Sneak"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GHOST, @@ -8149,8 +8149,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_BOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mud Bomb"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_GROUND, @@ -8166,8 +8166,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_CUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psycho Cut"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -8183,8 +8183,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZEN_HEADBUTT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Zen Headbutt"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -8200,8 +8200,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mirro Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_STEEL, @@ -8216,8 +8216,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH_CANNON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flash Cannon"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_STEEL, @@ -8232,8 +8232,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_CLIMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rock Climb"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 90, .type = TYPE_NORMAL, @@ -8249,8 +8249,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFOG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Defog"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFOG, .power = 0, .type = TYPE_FLYING, @@ -8267,8 +8267,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_ROOM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Trick Room"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRICK_ROOM, .power = 0, .type = TYPE_PSYCHIC, @@ -8284,8 +8284,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRACO_METEOR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Draco Meteor"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 130, #else @@ -8303,8 +8303,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISCHARGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Discharge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -8319,8 +8319,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAVA_PLUME] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lava Plume"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 80, .type = TYPE_FIRE, @@ -8335,8 +8335,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_STORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Leaf Storm"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 130, #else @@ -8354,8 +8354,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_WHIP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Power Whip"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GRASS, @@ -8370,8 +8370,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_WRECKER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rock Wrecker"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_ROCK, @@ -8386,8 +8386,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_POISON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Cross Poison"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 70, .type = TYPE_POISON, @@ -8405,8 +8405,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUNK_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Gunk Shot"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 80, #else @@ -8425,8 +8425,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_HEAD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Iron Head"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_STEEL, @@ -8442,8 +8442,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_BOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Magnet Bomb"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_STEEL, @@ -8458,8 +8458,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_EDGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Stone Edge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_ROCK, @@ -8474,8 +8474,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAPTIVATE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Captivate"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CAPTIVATE, .power = 0, .type = TYPE_NORMAL, @@ -8491,8 +8491,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEALTH_ROCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Stealth Rock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STEALTH_ROCK, .power = 0, .type = TYPE_ROCK, @@ -8511,8 +8511,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_KNOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Grass Knot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_GRASS, @@ -8528,8 +8528,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHATTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Chatter"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 65, .secondaryEffectChance = 100, @@ -8561,8 +8561,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUDGMENT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Judgment"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = 100, .type = TYPE_NORMAL, @@ -8577,8 +8577,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BITE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bug Bite"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BUG_BITE, .power = 60, .type = TYPE_BUG, @@ -8593,8 +8593,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Charge Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SP_ATTACK_UP_HIT, .power = 50, .type = TYPE_ELECTRIC, @@ -8609,8 +8609,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WOOD_HAMMER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wood Hammer"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_GRASS, @@ -8626,8 +8626,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_JET] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aqua Jet"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -8642,8 +8642,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTACK_ORDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Attack Order"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_BUG, @@ -8658,8 +8658,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFEND_ORDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Defend Order"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_BUG, @@ -8677,8 +8677,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_ORDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heal Order"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_BUG, @@ -8697,8 +8697,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_SMASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Head Smash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 150, .type = TYPE_ROCK, @@ -8714,8 +8714,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_HIT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Double Hit"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_NORMAL, @@ -8731,8 +8731,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR_OF_TIME] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Roar of Time"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_DRAGON, @@ -8746,8 +8746,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPACIAL_REND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spacial Rend"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -8762,8 +8762,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lunar Dance"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEALING_WISH, .power = 0, .type = TYPE_PSYCHIC, @@ -8782,8 +8782,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_GRIP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Crush Grip"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_NORMAL, @@ -8798,8 +8798,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGMA_STORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Magma Storm"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 100, .accuracy = 75, @@ -8821,8 +8821,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_VOID] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dark Void"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .accuracy = 50, #else @@ -8843,8 +8843,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_FLARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Seed Flare"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2, .power = 120, .type = TYPE_GRASS, @@ -8859,8 +8859,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OMINOUS_WIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ominous Wind"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ALL_STATS_UP_HIT, .power = 60, .type = TYPE_GHOST, @@ -8876,8 +8876,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_FORCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shadow Force"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 120, .type = TYPE_GHOST, @@ -8899,8 +8899,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HONE_CLAWS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hone Claws"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_ACCURACY_UP, .power = 0, .type = TYPE_DARK, @@ -8918,8 +8918,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WIDE_GUARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wide Guard"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_ROCK, @@ -8940,8 +8940,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SPLIT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Guard Split"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GUARD_SPLIT, .power = 0, .type = TYPE_PSYCHIC, @@ -8957,8 +8957,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SPLIT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Power Split"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWER_SPLIT, .power = 0, .type = TYPE_PSYCHIC, @@ -8974,8 +8974,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WONDER_ROOM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wonder Room"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .priority = 0, #else @@ -8995,8 +8995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psyshock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYSHOCK, .power = 80, .type = TYPE_PSYCHIC, @@ -9010,8 +9010,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOSHOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Venoshock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_VENOSHOCK, .power = 65, .type = TYPE_POISON, @@ -9025,8 +9025,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AUTOTOMIZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Autotomize"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AUTOTOMIZE, .power = 0, .type = TYPE_STEEL, @@ -9044,8 +9044,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_POWDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rage Powder"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .priority = 2, #else @@ -9070,8 +9070,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEKINESIS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Telekinesis"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TELEKINESIS, .power = 0, .type = TYPE_PSYCHIC, @@ -9088,8 +9088,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_ROOM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Magic Room"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .priority = 0, #else @@ -9109,8 +9109,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMACK_DOWN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Smack Down"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SMACK_DOWN, .power = 50, .type = TYPE_ROCK, @@ -9126,8 +9126,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORM_THROW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Storm Throw"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -9147,8 +9147,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_BURST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flame Burst"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLAME_BURST, .power = 70, .type = TYPE_FIRE, @@ -9162,8 +9162,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_WAVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sludge Wave"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 95, .type = TYPE_POISON, @@ -9178,8 +9178,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUIVER_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Quiver Dance"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_QUIVER_DANCE, .power = 0, .type = TYPE_BUG, @@ -9198,8 +9198,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAVY_SLAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heavy Slam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAT_CRASH, .power = 1, .type = TYPE_STEEL, @@ -9216,8 +9216,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNCHRONOISE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Synchronoise"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, .pp = 10, @@ -9236,8 +9236,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_BALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Electro Ball"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ELECTRO_BALL, .power = 1, .type = TYPE_ELECTRIC, @@ -9252,8 +9252,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOAK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Soak"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_WATER, @@ -9269,8 +9269,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_CHARGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flame Charge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_UP_HIT, .power = 50, .type = TYPE_FIRE, @@ -9286,8 +9286,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Coil"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COIL, .power = 0, .type = TYPE_POISON, @@ -9305,8 +9305,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_SWEEP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Low Sweep"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 65, #else @@ -9326,8 +9326,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_SPRAY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Acid Spray"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2, .power = 40, .type = TYPE_POISON, @@ -9343,8 +9343,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOUL_PLAY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Foul Play"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOUL_PLAY, .power = 95, .type = TYPE_DARK, @@ -9359,8 +9359,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIMPLE_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Simple Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SIMPLE_BEAM, .power = 0, .type = TYPE_NORMAL, @@ -9376,8 +9376,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENTRAINMENT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Entrainment"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ENTRAINMENT, .power = 0, .type = TYPE_NORMAL, @@ -9393,8 +9393,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AFTER_YOU] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("After You"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AFTER_YOU, .power = 0, .type = TYPE_NORMAL, @@ -9413,8 +9413,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROUND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Round"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROUND, .power = 60, .type = TYPE_NORMAL, @@ -9430,8 +9430,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ECHOED_VOICE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Echoed Voice"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ECHOED_VOICE, .power = 40, .type = TYPE_NORMAL, @@ -9447,8 +9447,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHIP_AWAY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Chip Away"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -9464,8 +9464,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLEAR_SMOG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Clear Smog"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CLEAR_SMOG, .power = 50, .type = TYPE_POISON, @@ -9479,8 +9479,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORED_POWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Stored Power"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STORED_POWER, .power = 20, .type = TYPE_PSYCHIC, @@ -9494,8 +9494,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_GUARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Quick Guard"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIGHTING, @@ -9516,8 +9516,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLY_SWITCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ally Switch"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .priority = 2, #else @@ -9538,8 +9538,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Scald"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 80, .type = TYPE_WATER, @@ -9555,8 +9555,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SMASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shell Smash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHELL_SMASH, .power = 0, .type = TYPE_NORMAL, @@ -9574,8 +9574,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_PULSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heal Pulse"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_PULSE, .power = 0, .type = TYPE_PSYCHIC, @@ -9594,8 +9594,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEX] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hex"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 65, #else @@ -9613,8 +9613,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_DROP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sky Drop"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKY_DROP, .power = 60, .type = TYPE_FLYING, @@ -9634,8 +9634,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHIFT_GEAR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shift Gear"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHIFT_GEAR, .power = 0, .type = TYPE_STEEL, @@ -9653,8 +9653,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CIRCLE_THROW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Circle Throw"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, .type = TYPE_FIGHTING, @@ -9671,8 +9671,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INCINERATE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Incinerate"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -9690,8 +9690,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Quash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_QUASH, .power = 0, .type = TYPE_DARK, @@ -9707,8 +9707,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACROBATICS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Acrobatics"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACROBATICS, .power = 55, .type = TYPE_FLYING, @@ -9723,8 +9723,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT_TYPE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Reflect Type"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REFLECT_TYPE, .power = 0, .type = TYPE_NORMAL, @@ -9741,8 +9741,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETALIATE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Retaliate"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RETALIATE, .power = 70, .type = TYPE_NORMAL, @@ -9757,8 +9757,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FINAL_GAMBIT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Final Gambit"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FINAL_GAMBIT, .power = 1, .type = TYPE_FIGHTING, @@ -9774,8 +9774,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BESTOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bestow"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BESTOW, .power = 0, .type = TYPE_NORMAL, @@ -9795,8 +9795,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNO] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Inferno"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 100, .type = TYPE_FIRE, @@ -9811,8 +9811,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PLEDGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Water Pledge"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -9831,8 +9831,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PLEDGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fire Pledge"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -9851,8 +9851,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_PLEDGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Grass Pledge"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 80, #else @@ -9871,8 +9871,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_SWITCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Volt Switch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ESCAPE, .power = 70, .type = TYPE_ELECTRIC, @@ -9886,8 +9886,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE_BUG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Strugle Bug"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 50, #else @@ -9906,8 +9906,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLDOZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bulldoze"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BULLDOZE, .power = 60, .type = TYPE_GROUND, @@ -9923,8 +9923,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FROST_BREATH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Frost Breath"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 60, #else @@ -9943,8 +9943,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_TAIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dragon Tail"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, .type = TYPE_DRAGON, @@ -9961,8 +9961,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORK_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Work Up"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_SPATK_UP, .power = 0, .type = TYPE_NORMAL, @@ -9980,8 +9980,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTROWEB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Electroweb"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 55, .type = TYPE_ELECTRIC, @@ -9996,8 +9996,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILD_CHARGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wild Chagre"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 90, .type = TYPE_ELECTRIC, @@ -10013,8 +10013,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_RUN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Drill Run"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GROUND, @@ -10030,8 +10030,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_CHOP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dual Chop"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_DRAGON, @@ -10047,8 +10047,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_STAMP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heart Stamp"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_PSYCHIC, @@ -10064,8 +10064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_LEECH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Horn Leech"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = 75, .type = TYPE_GRASS, @@ -10081,8 +10081,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_SWORD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sacred Sword"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 15, #else @@ -10103,8 +10103,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_SHELL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Razor Shell"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 75, .type = TYPE_WATER, @@ -10121,8 +10121,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_CRASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Heat Crash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAT_CRASH, .power = 1, .type = TYPE_FIRE, @@ -10138,8 +10138,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_TORNADO] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Leaf Tornado"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_GRASS, @@ -10155,8 +10155,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAMROLLER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Steamroller"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 65, .type = TYPE_BUG, @@ -10173,8 +10173,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_GUARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Cotton Guard"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_3, .power = 0, .type = TYPE_GRASS, @@ -10192,8 +10192,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_DAZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Night Daze"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 85, .type = TYPE_DARK, @@ -10208,8 +10208,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSTRIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psystrike"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYSHOCK, .power = 100, .type = TYPE_PSYCHIC, @@ -10223,8 +10223,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_SLAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tail Slap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_NORMAL, @@ -10239,8 +10239,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HURRICANE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hurricane"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 110, #else @@ -10261,8 +10261,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_CHARGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Head Charge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_NORMAL, @@ -10278,8 +10278,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_GRIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Gear Grind"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -10295,8 +10295,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEARING_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Searing Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 100, .type = TYPE_FIRE, @@ -10312,8 +10312,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TECHNO_BLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Techno Blast"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, #else @@ -10333,8 +10333,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RELIC_SONG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Relic Song"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RELIC_SONG, .power = 75, .type = TYPE_NORMAL, @@ -10353,8 +10353,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_SWORD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Secret Sword"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYSHOCK, .power = 85, .type = TYPE_FIGHTING, @@ -10370,8 +10370,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIATE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Glaciate"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 65, .type = TYPE_ICE, @@ -10386,8 +10386,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_STRIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bolt Strike"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 130, .type = TYPE_ELECTRIC, @@ -10403,8 +10403,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLUE_FLARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Blue Flare"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 130, .type = TYPE_FIRE, @@ -10419,8 +10419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fiery Dance"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SP_ATTACK_UP_HIT, .power = 80, .type = TYPE_FIRE, @@ -10436,8 +10436,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_SHOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Freeze Shock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_ICE, @@ -10457,8 +10457,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BURN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ice Burn"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_ICE, @@ -10478,8 +10478,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNARL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Snarl"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 55, .type = TYPE_DARK, @@ -10497,8 +10497,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_CRASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Icicle Crash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 85, .type = TYPE_ICE, @@ -10513,8 +10513,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_V_CREATE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("V-create"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_V_CREATE, .power = 180, .type = TYPE_FIRE, @@ -10530,8 +10530,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_FLARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fusion Flare"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FUSION_COMBO, .power = 100, .type = TYPE_FIRE, @@ -10546,8 +10546,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_BOLT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fusion Bolt"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FUSION_COMBO, .power = 100, .type = TYPE_ELECTRIC, @@ -10561,8 +10561,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLYING_PRESS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flying Press"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 100, #else @@ -10585,8 +10585,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAT_BLOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mat Block"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAT_BLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -10609,8 +10609,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Belch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BELCH, .power = 120, .type = TYPE_POISON, @@ -10632,8 +10632,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROTOTILLER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rototiller"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROTOTILLER, .power = 0, .type = TYPE_GROUND, @@ -10651,8 +10651,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STICKY_WEB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sticky Web"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STICKY_WEB, .power = 0, .type = TYPE_BUG, @@ -10671,8 +10671,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FELL_STINGER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fell Stinger"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 50, #else @@ -10691,8 +10691,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PHANTOM_FORCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Phantom Force"), + #else + .name = _("PhantomForce"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 90, .type = TYPE_GHOST, @@ -10714,8 +10718,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_OR_TREAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Trick-or-Treat"), + #else + .name = _("TrickOrTreat"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GHOST, @@ -10732,8 +10740,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOBLE_ROAR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Noble Roar"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NOBLE_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -10751,8 +10759,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ION_DELUGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ion Deluge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ION_DELUGE, .power = 0, .type = TYPE_ELECTRIC, @@ -10769,8 +10777,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARABOLIC_CHARGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Parabolic Charge"), + #else + .name = _("ParaboldChrg"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 65, #else @@ -10789,8 +10801,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESTS_CURSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Forest's Curse"), + #else + .name = _("Forest'sCurs"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GRASS, @@ -10807,8 +10823,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_BLIZZARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Petal Blizzard"), + #else + .name = _("PetalBlizzrd"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GRASS, @@ -10823,8 +10843,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_DRY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Freeze-Dry"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FREEZE_DRY, .power = 70, .type = TYPE_ICE, @@ -10839,8 +10859,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISARMING_VOICE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Disarming Voice"), + #else + .name = _("DisrmngVoice"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FAIRY, @@ -10856,8 +10880,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARTING_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Parting Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARTING_SHOT, .power = 0, .type = TYPE_DARK, @@ -10875,8 +10899,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOPSY_TURVY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Topsy-Turvy"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .accuracy = 0, #else @@ -10896,8 +10920,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAINING_KISS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Draining Kiss"), + #else + .name = _("DrainingKiss"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = 50, .type = TYPE_FAIRY, @@ -10914,8 +10942,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRAFTY_SHIELD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Crafty Shield"), + #else + .name = _("CraftyShield"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FAIRY, @@ -10934,8 +10966,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_SHIELD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Flower Shield"), + #else + .name = _("FlowerShield"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLOWER_SHIELD, .power = 0, .type = TYPE_FAIRY, @@ -10952,8 +10988,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_TERRAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Grassy Terrain"), + #else + .name = _("GrssyTerrain"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRASSY_TERRAIN, .power = 0, .type = TYPE_GRASS, @@ -10971,8 +11011,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_TERRAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Misty Terrain"), + #else + .name = _("MistyTerrain"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MISTY_TERRAIN, .power = 0, .type = TYPE_FAIRY, @@ -10990,8 +11034,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIFY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Electrify"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ELECTRIFY, .power = 0, .type = TYPE_ELECTRIC, @@ -11006,8 +11050,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_ROUGH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Play Rough"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 90, .type = TYPE_FAIRY, @@ -11023,8 +11067,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_WIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fairy Wind"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FAIRY, @@ -11039,8 +11083,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONBLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Moonblast"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 95, .type = TYPE_FAIRY, @@ -11055,8 +11099,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOOMBURST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Boomburst"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_NORMAL, @@ -11072,8 +11116,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_LOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fairy Lock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FAIRY_LOCK, .power = 0, .type = TYPE_FAIRY, @@ -11090,8 +11134,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINGS_SHIELD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("King's Shield"), + #else + .name = _("King'sShield"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_STEEL, @@ -11113,8 +11161,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_NICE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Play Nice"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -11132,8 +11180,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFIDE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Confide"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -11152,8 +11200,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIAMOND_STORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Diamond Storm"), + #else + .name = _("DiamondStorm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .effect = EFFECT_DEFENSE_UP2_HIT, #else @@ -11173,8 +11225,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAM_ERUPTION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Steam Eruption"), + #else + .name = _("SteamErption"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 110, .type = TYPE_WATER, @@ -11191,8 +11247,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_HOLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Hyperspace Hole"), + #else + .name = _("HyprspceHole"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FEINT, .power = 80, .type = TYPE_PSYCHIC, @@ -11209,8 +11269,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SHURIKEN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Water Shuriken"), + #else + .name = _("WatrShuriken"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .category = BATTLE_CATEGORY_SPECIAL, #else @@ -11229,8 +11293,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_FIRE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Mystical Fire"), + #else + .name = _("MysticalFire"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 75, #else @@ -11249,8 +11317,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKY_SHIELD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spiky Shield"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_GRASS, @@ -11271,8 +11339,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATIC_MIST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Aromatic Mist"), + #else + .name = _("AromaticMist"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AROMATIC_MIST, .power = 0, .type = TYPE_FAIRY, @@ -11290,8 +11362,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_IMPULSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Eerie Impulse"), + #else + .name = _("EerieImpulse"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_2, .power = 0, .type = TYPE_ELECTRIC, @@ -11307,8 +11383,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOM_DRENCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Venom Drench"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_VENOM_DRENCH, .power = 0, .type = TYPE_POISON, @@ -11324,8 +11400,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Powder"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWDER, .power = 0, .type = TYPE_BUG, @@ -11342,8 +11418,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEOMANCY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Geomancy"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GEOMANCY, .power = 0, .type = TYPE_FAIRY, @@ -11362,8 +11438,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNETIC_FLUX] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Magnetic Flux"), + #else + .name = _("MagneticFlux"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGNETIC_FLUX, .power = 0, .type = TYPE_ELECTRIC, @@ -11382,8 +11462,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAPPY_HOUR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Happy Hour"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -11400,8 +11480,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIC_TERRAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Electric Terrain"), + #else + .name = _("ElctrcTrrain"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ELECTRIC_TERRAIN, .power = 0, .type = TYPE_ELECTRIC, @@ -11419,8 +11503,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DAZZLING_GLEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Dazzling Gleam"), + #else + .name = _("DazzlngGleam"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FAIRY, @@ -11434,8 +11522,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CELEBRATE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Celebrate"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -11458,8 +11546,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_HANDS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hold Hands"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -11482,8 +11570,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BABY_DOLL_EYES] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Baby-Doll Eyes"), + #else + .name = _("BabyDollEyes"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_FAIRY, @@ -11499,8 +11591,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NUZZLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Nuzzle"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 20, .type = TYPE_ELECTRIC, @@ -11516,8 +11608,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_BACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hold Back"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FALSE_SWIPE, .power = 40, .type = TYPE_NORMAL, @@ -11532,8 +11624,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFESTATION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Infestation"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRAP, .power = 20, .type = TYPE_BUG, @@ -11548,8 +11640,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_UP_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Power-Up Punch"), + #else + .name = _("PowerUpPunch"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_UP_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -11566,8 +11662,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBLIVION_WING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Oblivion Wing"), + #else + .name = _("OblivionWing"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = 80, .type = TYPE_FLYING, @@ -11583,8 +11683,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_ARROWS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Thousand Arrows"), + #else + .name = _("ThousndArrws"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SMACK_DOWN, .power = 90, .type = TYPE_GROUND, @@ -11602,8 +11706,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_WAVES] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Thousand Waves"), + #else + .name = _("ThousndWaves"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_PREVENT_ESCAPE, .power = 90, .type = TYPE_GROUND, @@ -11619,8 +11727,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LANDS_WRATH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Land's Wrath"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -11635,8 +11743,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_OF_RUIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Light of Ruin"), + #else + .name = _("LightOfRuin"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL, .power = 140, .type = TYPE_FAIRY, @@ -11652,8 +11764,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORIGIN_PULSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Origin Pulse"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 110, .type = TYPE_WATER, @@ -11669,8 +11781,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRECIPICE_BLADES] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Precipice Blades"), + #else + .name = _("PrcipceBldes"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GROUND, @@ -11685,8 +11801,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ASCENT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Dragon Ascent"), + #else + .name = _("DragonAscent"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CLOSE_COMBAT, .power = 120, .type = TYPE_FLYING, @@ -11702,8 +11822,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_FURY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Hyperspace Fury"), + #else + .name = _("HyprspceFury"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HYPERSPACE_FURY, .power = 100, .type = TYPE_DARK, @@ -11721,8 +11845,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHORE_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shore Up"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #else @@ -11745,8 +11869,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRST_IMPRESSION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("First Impression"), + #else + .name = _("FrstImpressn"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FAKE_OUT, .power = 90, .type = TYPE_BUG, @@ -11761,8 +11889,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BANEFUL_BUNKER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Baneful Bunker"), + #else + .name = _("BanefulBunkr"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_POISON, @@ -11783,8 +11915,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_SHACKLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Spirit Shackle"), + #else + .name = _("SpiritShackl"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_PREVENT_ESCAPE, .power = 80, .type = TYPE_GHOST, @@ -11799,8 +11935,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARKEST_LARIAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Darkest Lariat"), + #else + .name = _("DarkstLariat"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -11816,8 +11956,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLING_ARIA] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Sparkling Aria"), + #else + .name = _("SparklngAria"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPARKLING_ARIA, .power = 90, .type = TYPE_WATER, @@ -11835,8 +11979,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_HAMMER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ice Hammer"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HAMMER_ARM, .power = 100, .type = TYPE_ICE, @@ -11852,8 +11996,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLORAL_HEALING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Floral Healing"), + #else + .name = _("FloralHealng"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_PULSE, .power = 0, .type = TYPE_FAIRY, @@ -11872,8 +12020,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_HORSEPOWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("High Horsepower"), + #else + .name = _("HighHorseprw"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 95, .type = TYPE_GROUND, @@ -11888,8 +12040,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH_SAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Strength Sap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STRENGTH_SAP, .power = 0, .type = TYPE_GRASS, @@ -11906,8 +12058,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BLADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Solar Blade"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOLAR_BEAM, .power = 125, .type = TYPE_GRASS, @@ -11926,8 +12078,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAFAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Leafage"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GRASS, @@ -11941,8 +12093,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPOTLIGHT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spotlight"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_NORMAL, @@ -11962,8 +12114,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_THREAD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Toxic Thread"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TOXIC_THREAD, .power = 0, .type = TYPE_POISON, @@ -11979,8 +12131,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASER_FOCUS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Laser Focus"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LASER_FOCUS, .power = 0, .type = TYPE_NORMAL, @@ -11998,8 +12150,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Gear Up"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GEAR_UP, .power = 0, .type = TYPE_STEEL, @@ -12018,8 +12170,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THROAT_CHOP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Throat Chop"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_THROAT_CHOP, .power = 80, .type = TYPE_DARK, @@ -12035,8 +12187,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLLEN_PUFF] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pollen Puff"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ENEMY_HEAL_ALLY, .power = 90, .type = TYPE_BUG, @@ -12051,8 +12203,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCHOR_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Anchor Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_PREVENT_ESCAPE, .power = 80, .type = TYPE_STEEL, @@ -12068,8 +12220,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_TERRAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Psychic Terrain"), + #else + .name = _("PsychcTrrain"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYCHIC_TERRAIN, .power = 0, .type = TYPE_PSYCHIC, @@ -12086,8 +12242,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lunge"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 80, .type = TYPE_BUG, @@ -12103,8 +12259,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_LASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fire Lash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_FIRE, @@ -12120,8 +12276,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRIP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Power Trip"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STORED_POWER, .power = 20, .type = TYPE_DARK, @@ -12136,8 +12292,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURN_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Burn Up"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_UP, .power = 130, .type = TYPE_FIRE, @@ -12152,8 +12308,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPEED_SWAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Speed Swap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -12169,8 +12325,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMART_STRIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Smart Strike"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_STEEL, @@ -12185,8 +12341,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURIFY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Purify"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PURIFY, .power = 0, .type = TYPE_POISON, @@ -12204,8 +12360,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVELATION_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Revelation Dance"), + #else + .name = _("RvlationDnce"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REVELATION_DANCE, .power = 90, .type = TYPE_NORMAL, @@ -12220,8 +12380,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORE_ENFORCER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Core Enforcer"), + #else + .name = _("CoreEnforcer"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CORE_ENFORCER, .power = 100, .type = TYPE_DRAGON, @@ -12236,8 +12400,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TROP_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Trop kick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 70, .type = TYPE_GRASS, @@ -12253,8 +12417,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INSTRUCT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Instruct"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_INSTRUCT, .power = 0, .type = TYPE_PSYCHIC, @@ -12273,8 +12437,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAK_BLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Beak Blast"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BEAK_BLAST, .power = 100, .type = TYPE_FLYING, @@ -12296,8 +12460,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGING_SCALES] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Clanging Scales"), + #else + .name = _("ClngngScales"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACKER_DEFENSE_DOWN_HIT, .power = 110, .type = TYPE_DRAGON, @@ -12313,8 +12481,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_HAMMER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Dragon Hammer"), + #else + .name = _("DragonHammer"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_DRAGON, @@ -12329,8 +12501,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRUTAL_SWING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Brutal Swing"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DARK, @@ -12345,8 +12517,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_VEIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aurora Veil"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AURORA_VEIL, .power = 0, .type = TYPE_ICE, @@ -12364,8 +12536,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_TRAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shell Trap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHELL_TRAP, .power = 150, .type = TYPE_FIRE, @@ -12386,8 +12558,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLEUR_CANNON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fleur Cannon"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OVERHEAT, .power = 130, .type = TYPE_FAIRY, @@ -12402,8 +12574,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_FANGS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Psychic Fangs"), + #else + .name = _("PsychicFangs"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BRICK_BREAK, .power = 85, .type = TYPE_PSYCHIC, @@ -12419,8 +12595,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMPING_TANTRUM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Stomping Tantrum"), + #else + .name = _("StmpngTantrm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, .type = TYPE_GROUND, @@ -12436,8 +12616,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BONE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shadow Bone"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 85, .type = TYPE_GHOST, @@ -12452,8 +12632,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACCELEROCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Accelerock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ROCK, @@ -12468,8 +12648,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIQUIDATION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Liquidation"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 85, .type = TYPE_WATER, @@ -12485,8 +12665,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRISMATIC_LASER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Prismatic Laser"), + #else + .name = _("PrsmaticLasr"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 160, .type = TYPE_PSYCHIC, @@ -12500,8 +12684,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPECTRAL_THIEF] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Spectral Thief"), + #else + .name = _("SpectrlThief"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECTRAL_THIEF, .power = 90, .type = TYPE_GHOST, @@ -12518,8 +12706,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNSTEEL_STRIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Sunsteel Strike"), + #else + .name = _("SnsteelStrke"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_STEEL, @@ -12536,8 +12728,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONGEIST_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Moongeist Beam"), + #else + .name = _("MoongestBeam"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_GHOST, @@ -12553,8 +12749,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEARFUL_LOOK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tearful Look"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NOBLE_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -12571,8 +12767,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZING_ZAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Zing Zap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -12587,8 +12783,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURES_MADNESS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Nature's Madness"), + #else + .name = _("Natur'sMadns"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_FAIRY, @@ -12603,8 +12803,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MULTI_ATTACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Multi-Attack"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 120, #else @@ -12624,8 +12824,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_BLOWN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mind Blown"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIND_BLOWN, .power = 150, .type = TYPE_FIRE, @@ -12640,8 +12840,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLASMA_FISTS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Plasma Fists"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLASMA_FISTS, .power = 100, .type = TYPE_ELECTRIC, @@ -12658,8 +12858,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PHOTON_GEYSER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Photon Geyser"), + #else + .name = _("PhotonGeyser"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PHOTON_GEYSER, .power = 100, .type = TYPE_PSYCHIC, @@ -12675,8 +12879,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZIPPY_ZAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Zippy Zap"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 80, .effect = EFFECT_EVASION_UP_HIT, @@ -12700,8 +12904,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLISHY_SPLASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Splishy Splash"), + #else + .name = _("SplishySplsh"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 90, .type = TYPE_WATER, @@ -12718,8 +12926,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOATY_FALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Floaty Fall"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 90, .type = TYPE_FLYING, @@ -12738,8 +12946,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIKA_PAPOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pika Papow"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_ELECTRIC, @@ -12755,8 +12963,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCY_BUBBLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Bouncy Bubble"), + #else + .name = _("BouncyBubble"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 60, .pp = 20, @@ -12779,8 +12991,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUZZY_BUZZ] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Buzzy Buzz"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 60, .pp = 20, @@ -12801,8 +13013,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIZZLY_SLIDE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sizzly Slide"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 60, .pp = 20, @@ -12825,8 +13037,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLITZY_GLOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Glitzy Glow"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 80, .accuracy = 95, @@ -12847,8 +13059,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BADDY_BAD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Baddy Bad"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 80, .accuracy = 95, @@ -12869,8 +13081,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAPPY_SEED] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Sappy Seed"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 100, .accuracy = 90, @@ -12893,8 +13105,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZY_FROST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Freezy Frost"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 100, .accuracy = 90, @@ -12916,8 +13128,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLY_SWIRL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Sparkly Swirl"), + #else + .name = _("SparklySwirl"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 120, .accuracy = 85, @@ -12939,8 +13155,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VEEVEE_VOLLEY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Veevee Volley"), + #else + .name = _("VeeveeVolley"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -12957,8 +13177,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_IRON_BASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Double Iron Bash"), + #else + .name = _("DublIronBash"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_STEEL, @@ -12978,8 +13202,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMAX_CANNON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Dynamax Cannon"), + #else + .name = _("DynamxCannon"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_DRAGON, @@ -13002,8 +13230,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNIPE_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Snipe Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SNIPE_SHOT, .power = 80, .type = TYPE_WATER, @@ -13018,8 +13246,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JAW_LOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Jaw Lock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_JAW_LOCK, .power = 80, .type = TYPE_DARK, @@ -13035,8 +13263,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUFF_CHEEKS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Stuff Cheeks"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STUFF_CHEEKS, .power = 0, .type = TYPE_NORMAL, @@ -13053,8 +13281,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NO_RETREAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("No Retreat"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NO_RETREAT, .power = 0, .type = TYPE_FIGHTING, @@ -13071,8 +13299,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAR_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tar Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TAR_SHOT, .power = 0, .type = TYPE_ROCK, @@ -13087,8 +13315,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_POWDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Magic Powder"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_PSYCHIC, @@ -13105,8 +13333,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DARTS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dragon Darts"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, //TODO .power = 50, .type = TYPE_DRAGON, @@ -13122,8 +13350,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEATIME] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Teatime"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TEATIME, .power = 0, .type = TYPE_NORMAL, @@ -13140,8 +13368,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTOLOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Octolock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OCTOLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -13155,8 +13383,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_BEAK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bolt Beak"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BOLT_BEAK, .power = 85, .type = TYPE_ELECTRIC, @@ -13171,8 +13399,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISHIOUS_REND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Fishious Rend"), + #else + .name = _("FishiousRend"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BOLT_BEAK, .power = 85, .type = TYPE_WATER, @@ -13188,8 +13420,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COURT_CHANGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Court Change"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COURT_CHANGE, .power = 0, .type = TYPE_NORMAL, @@ -13204,8 +13436,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGOROUS_SOUL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Clangorous Soul"), + #else + .name = _("ClngrousSoul"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CLANGOROUS_SOUL, .power = 0, .type = TYPE_DRAGON, @@ -13225,8 +13461,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_PRESS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Body Press"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BODY_PRESS, .power = 80, .type = TYPE_FIGHTING, @@ -13243,8 +13479,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DECORATE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Decorate"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DECORATE, .power = 0, .type = TYPE_FAIRY, @@ -13261,8 +13497,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRUM_BEATING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Drum Beating"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 80, .type = TYPE_GRASS, @@ -13278,8 +13514,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNAP_TRAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Snap Trap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRAP, .power = 35, .type = TYPE_GRASS, @@ -13296,8 +13532,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PYRO_BALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pyro Ball"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 120, .type = TYPE_FIRE, @@ -13315,8 +13551,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BLADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Behemoth Blade"), + #else + .name = _("BehemthBlade"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_STEEL, @@ -13336,8 +13576,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Behemoth Bash"), + #else + .name = _("BehemothBash"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_STEEL, @@ -13356,8 +13600,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_WHEEL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aura Wheel"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AURA_WHEEL, .power = 110, .type = TYPE_ELECTRIC, @@ -13372,8 +13616,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BREAKING_SWIPE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Breaking Swipe"), + #else + .name = _("BreakngSwipe"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 60, .type = TYPE_DRAGON, @@ -13390,8 +13638,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRANCH_POKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Branch Poke"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GRASS, @@ -13407,8 +13655,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERDRIVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Overdrive"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -13425,8 +13673,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_APPLE_ACID] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Apple Acid"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_GRASS, @@ -13442,8 +13690,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAV_APPLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Grav Apple"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRAV_APPLE, .power = 80, .type = TYPE_GRASS, @@ -13459,8 +13707,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_BREAK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spirit Break"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 75, .type = TYPE_FAIRY, @@ -13477,8 +13725,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRANGE_STEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Strange Steam"), + #else + .name = _("StrangeSteam"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 90, .type = TYPE_FAIRY, @@ -13494,8 +13746,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIFE_DEW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Life Dew"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_WATER, @@ -13515,8 +13767,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBSTRUCT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Obstruct"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_DARK, @@ -13535,8 +13787,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SURRENDER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("False Surrender"), + #else + .name = _("FalsSurrendr"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -13552,8 +13808,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_ASSAULT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Meteor Assault"), + #else + .name = _("MeteorAssalt"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_FIGHTING, @@ -13569,8 +13829,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ETERNABEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Eternabeam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECHARGE, .power = 160, .type = TYPE_DRAGON, @@ -13585,8 +13845,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Steel Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STEEL_BEAM, .power = 140, .type = TYPE_STEEL, @@ -13601,8 +13861,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPANDING_FORCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Expanding Force"), + #else + .name = _("ExpandngForc"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXPANDING_FORCE, .power = 80, .type = TYPE_PSYCHIC, @@ -13616,8 +13880,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_ROLLER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Steel Roller"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 130, .type = TYPE_STEEL, @@ -13634,8 +13898,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALE_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Scale Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_DRAGON, @@ -13650,8 +13914,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Meteor Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METEOR_BEAM, .power = 120, .type = TYPE_ROCK, @@ -13667,8 +13931,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SIDE_ARM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Shell Side Arm"), + #else + .name = _("ShellSideArm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHELL_SIDE_ARM, .power = 90, .type = TYPE_POISON, @@ -13683,8 +13951,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_EXPLOSION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Misty Explosion"), + #else + .name = _("MstyExplsion"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXPLOSION, .power = 100, .type = TYPE_FAIRY, @@ -13698,8 +13970,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_GLIDE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Grassy Glide"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 55, #else @@ -13719,8 +13991,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RISING_VOLTAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Rising Voltage"), + #else + .name = _("RisngVoltage"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RISING_VOLTAGE, .power = 70, .type = TYPE_ELECTRIC, @@ -13734,8 +14010,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERRAIN_PULSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Terrain Pulse"), + #else + .name = _("TerrainPulse"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TERRAIN_PULSE, .power = 50, .type = TYPE_NORMAL, @@ -13750,8 +14030,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKITTER_SMACK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Skitter Smack"), + #else + .name = _("SkitterSmack"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 70, .type = TYPE_BUG, @@ -13767,8 +14051,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_JEALOUSY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Burning Jealousy"), + #else + .name = _("BrningJelosy"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 70, .type = TYPE_FIRE, @@ -13783,8 +14071,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASH_OUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lash Out"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LASH_OUT, .power = 75, .type = TYPE_DARK, @@ -13799,8 +14087,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLTERGEIST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Poltergeist"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POLTERGEIST, .power = 110, .type = TYPE_GHOST, @@ -13814,8 +14102,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORROSIVE_GAS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Corrosive Gas"), + #else + .name = _("CorrosiveGas"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CORROSIVE_GAS, .power = 0, .type = TYPE_POISON, @@ -13830,8 +14122,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COACHING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Coaching"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COACHING, .power = 0, .type = TYPE_FIGHTING, @@ -13848,8 +14140,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLIP_TURN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flip Turn"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ESCAPE, .power = 60, .type = TYPE_WATER, @@ -13864,8 +14156,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_AXEL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Triple Axel"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRIPLE_KICK, .power = 20, .type = TYPE_ICE, @@ -13881,8 +14173,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_WINGBEAT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Dual Wingbeat"), + #else + .name = _("DualWingbeat"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FLYING, @@ -13898,8 +14194,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCORCHING_SANDS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Scorching Sands"), + #else + .name = _("ScorchngSnds"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 70, .type = TYPE_GROUND, @@ -13915,8 +14215,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUNGLE_HEALING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Jungle Healing"), + #else + .name = _("JungleHealng"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_GRASS, @@ -13935,8 +14239,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_BLOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wicked Blow"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 75, #else @@ -13958,8 +14262,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURGING_STRIKES] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Surging Strikes"), + #else + .name = _("SrgngStrkes"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 25, .type = TYPE_WATER, @@ -13978,8 +14286,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_CAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Thunder Cage"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRAP, .power = 80, .type = TYPE_ELECTRIC, @@ -13994,8 +14302,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ENERGY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Dragon Energy"), + #else + .name = _("DragonEnergy"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_DRAGON, @@ -14010,8 +14322,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZING_GLARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Freezing Glare"), + #else + .name = _("FreezngGlare"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .power = 90, #if B_USE_FROSTBITE == TRUE .effect = EFFECT_FROSTBITE_HIT, @@ -14031,8 +14347,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_WRATH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fiery Wrath"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 90, .type = TYPE_DARK, @@ -14047,8 +14363,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDEROUS_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Thunderous Kick"), + #else + .name = _("ThnderusKick"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_FIGHTING, @@ -14065,8 +14385,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIAL_LANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Glacial Lance"), + #else + .name = _("GlacialLance"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 120, #else @@ -14085,8 +14409,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTRAL_BARRAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Astral Barrage"), + #else + .name = _("AstrlBarrage"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GHOST, @@ -14101,8 +14429,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_SPELL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Eerie Spell"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EERIE_SPELL, .power = 80, .type = TYPE_PSYCHIC, @@ -14119,8 +14447,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIRE_CLAW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dire Claw"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 80, #else @@ -14140,8 +14468,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHIELD_BASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Psyshield Bash"), + #else + .name = _("PsyshieldBsh"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -14157,8 +14489,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SHIFT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Power Shift"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWER_TRICK, .power = 0, .type = TYPE_NORMAL, @@ -14176,8 +14508,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_AXE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Stone Axe"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_ENTRY_HAZARD, .power = 65, .type = TYPE_ROCK, @@ -14195,8 +14527,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPRINGTIDE_STORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Springtide Storm"), + #else + .name = _("SprngtdeStrm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 100, #else @@ -14217,8 +14553,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_POWER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Mystical Power"), + #else + .name = _("MystcalPower"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_UP_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -14233,8 +14573,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_FURY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Raging Fury"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 120, #else @@ -14253,8 +14593,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAVE_CRASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Wave Crash"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 120, #else @@ -14275,8 +14615,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHLOROBLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Chloroblast"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 150, #else @@ -14294,8 +14634,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOUNTAIN_GALE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Mountain Gale"), + #else + .name = _("MountainGale"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLINCH_HIT, .power = 100, .type = TYPE_ICE, @@ -14310,8 +14654,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VICTORY_DANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Victory Dance"), + #else + .name = _("VictoryDance"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_VICTORY_DANCE, .power = 0, .type = TYPE_FIGHTING, @@ -14329,8 +14677,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADLONG_RUSH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Headlong Rush"), + #else + .name = _("HeadlongRush"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 120, #else @@ -14350,8 +14702,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARB_BARRAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Barb Barrage"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BARB_BARRAGE, .power = 60, .type = TYPE_POISON, @@ -14370,8 +14722,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ESPER_WING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Esper Wing"), + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 80, .accuracy = 100, @@ -14392,8 +14744,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_MALICE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Bitter Malice"), + #else + .name = _("BitterMalice"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 75, #else @@ -14412,8 +14768,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shelter"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -14430,8 +14786,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_ARROWS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Triple Arrows"), + #else + .name = _("TripleArrows"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 90, .pp = 10, @@ -14452,8 +14812,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNAL_PARADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Infernal Parade"), + #else + .name = _("InfrnlParade"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_INFERNAL_PARADE, .power = 60, .type = TYPE_GHOST, @@ -14468,8 +14832,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CEASELESS_EDGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Ceasless Edge"), + #else + .name = _("CeaslessEdge"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_ENTRY_HAZARD, .power = 65, .type = TYPE_DARK, @@ -14487,8 +14855,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLEAKWIND_STORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Bleakwind Storm"), + #else + .name = _("BlekwndStorm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 100, .pp = 10, @@ -14509,8 +14881,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILDBOLT_STORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Wildbolt Storm"), + #else + .name = _("WildbltStorm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 100, .pp = 10, @@ -14531,8 +14907,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSEAR_STORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Sandsear Storm"), + #else + .name = _("SndsearStorm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .power = 100, .pp = 10, @@ -14553,8 +14933,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_BLESSING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Lunar Blessing"), + #else + .name = _("LunarBlessng"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_PSYCHIC, @@ -14572,8 +14956,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_HEART] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Take Heart"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TAKE_HEART, .power = 0, .type = TYPE_PSYCHIC, @@ -14590,8 +14974,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_BLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tera Blast"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TERA_BLAST, .power = 80, .type = TYPE_NORMAL, @@ -14607,8 +14991,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILK_TRAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Silk Trap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_BUG, @@ -14626,8 +15010,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AXE_KICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Axe Kick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AXE_KICK, .power = 120, .type = TYPE_FIGHTING, @@ -14643,8 +15027,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESPECTS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Last Respects"), + #else + .name = _("LastRespects"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_LAST_RESPECTS .power = 50, .type = TYPE_GHOST, @@ -14659,8 +15047,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUMINA_CRASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Lumina Crash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2, .power = 80, .type = TYPE_PSYCHIC, @@ -14675,8 +15063,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORDER_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Order Up"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_ORDER_UP .power = 80, .type = TYPE_DRAGON, @@ -14693,8 +15081,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JET_PUNCH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Jet Punch"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_WATER, @@ -14712,8 +15100,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPICY_EXTRACT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Spicy Extract"), + #else + .name = _("SpicyExtract"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SPICY_EXTRACT .power = 0, .type = TYPE_GRASS, @@ -14729,8 +15121,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIN_OUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Spin Out"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPIN_OUT, .power = 100, .type = TYPE_STEEL, @@ -14746,8 +15138,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POPULATION_BOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Population Bomb"), + #else + .name = _("PoplatinBomb"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POPULATION_BOMB, .power = 20, .type = TYPE_NORMAL, @@ -14765,8 +15161,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SPINNER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ice Spinner"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 80, .type = TYPE_ICE, @@ -14783,8 +15179,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLAIVE_RUSH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Glaive Rush"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GLAIVE_RUSH, .power = 120, .type = TYPE_DRAGON, @@ -14800,8 +15196,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVIVAL_BLESSING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Revival Blessing"), + #else + .name = _("RevivlBlesng"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REVIVAL_BLESSING, .power = 0, .type = TYPE_NORMAL, @@ -14820,8 +15220,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SALT_CURE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Salt Cure"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SALT_CURE, .power = 40, .type = TYPE_ROCK, @@ -14837,8 +15237,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_DIVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Triple Dive"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_WATER, @@ -14854,8 +15254,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORTAL_SPIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Mortal Spin"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MORTAL_SPIN, .power = 30, .type = TYPE_POISON, @@ -14871,8 +15271,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOODLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Doodle"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOODLE, .power = 0, .type = TYPE_NORMAL, @@ -14889,8 +15289,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FILLET_AWAY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fillet Away"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FILLET_AWAY, .power = 0, .type = TYPE_NORMAL, @@ -14909,8 +15309,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KOWTOW_CLEAVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Kowtow Cleave"), + #else + .name = _("KowtowCleave"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -14926,8 +15330,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_TRICK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Flower Trick"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GRASS, @@ -14942,8 +15346,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORCH_SONG] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Torch Song"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SP_ATTACK_UP_HIT, .power = 80, .type = TYPE_FIRE, @@ -14960,8 +15364,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_STEP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aqua Step"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_UP_HIT, .power = 80, .type = TYPE_WATER, @@ -14978,8 +15382,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_BULL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Raging Bull"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAGING_BULL, .power = 90, .type = TYPE_NORMAL, @@ -14995,8 +15399,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAKE_IT_RAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Make It Rain"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAKE_IT_RAIN, .power = 120, .type = TYPE_STEEL, @@ -15011,8 +15415,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RUINATION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ruination"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_DARK, @@ -15027,8 +15431,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COLLISION_COURSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Colision Course"), + #else + .name = _("ColisinCours"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COLLISION_COURSE, .power = 100, .type = TYPE_FIGHTING, @@ -15044,8 +15452,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_DRIFT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Electro Drift"), + #else + .name = _("ElectroDrift"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COLLISION_COURSE, .power = 100, .type = TYPE_ELECTRIC, @@ -15061,8 +15473,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHED_TAIL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Shed Tail"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SHED_TAIL .power = 0, .type = TYPE_NORMAL, @@ -15080,8 +15492,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLY_RECEPTION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Chilly Reception"), + #else + .name = _("ChilReceptin"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CHILLY_RECEPTION, .power = 0, .type = TYPE_ICE, @@ -15099,8 +15515,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TIDY_UP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Tidy Up"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TIDY_UP .power = 0, .type = TYPE_NORMAL, @@ -15117,8 +15533,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNOWSCAPE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Snowscape"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SNOWSCAPE, .power = 0, .type = TYPE_ICE, @@ -15136,8 +15552,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUNCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Pounce"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_HIT, .power = 50, .type = TYPE_BUG, @@ -15153,8 +15569,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRAILBLAZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Trailblaze"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_UP_HIT, .power = 50, .type = TYPE_GRASS, @@ -15170,8 +15586,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLING_WATER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Chilling Water"), + #else + .name = _("ChillingWatr"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_HIT, .power = 50, .type = TYPE_WATER, @@ -15186,8 +15606,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_DRILL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hyper Drill"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -15204,8 +15624,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWIN_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Twin Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_PSYCHIC, @@ -15221,8 +15641,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_FIST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Rage Fist"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAGE_FIST, .power = 50, .type = TYPE_GHOST, @@ -15239,8 +15659,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARMOR_CANNON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Armor Cannon"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CLOSE_COMBAT, .power = 120, .type = TYPE_FIRE, @@ -15255,8 +15675,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_BLADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Bitter Blade"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = 90, .type = TYPE_FIRE, @@ -15273,8 +15693,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SHOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Double Shock"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOUBLE_SHOCK, .power = 120, .type = TYPE_ELECTRIC, @@ -15290,8 +15710,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGATON_HAMMER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Gigaton Hammer"), + #else + .name = _("GigatonHammr"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 160, .type = TYPE_STEEL, @@ -15306,8 +15730,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMEUPPANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Comeuppance"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METAL_BURST, .power = 1, .type = TYPE_DARK, @@ -15324,8 +15748,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_CUTTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Aqua Cutter"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_WATER, @@ -15341,8 +15765,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZING_TORQUE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Blazing Torque"), + #else + .name = _("BlazngTorque"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BURN_HIT, .power = 80, .type = TYPE_FIRE, @@ -15367,8 +15795,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_TORQUE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Wicked Torque"), + #else + .name = _("WickedTorque"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP_HIT, .power = 80, .type = TYPE_DARK, @@ -15393,8 +15825,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOXIOUS_TORQUE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Noxius Torque"), + #else + .name = _("NoxiusTorque"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_HIT, .power = 100, .type = TYPE_POISON, @@ -15419,8 +15855,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMBAT_TORQUE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Combat Torque"), + #else + .name = _("CombatTorque"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -15445,8 +15885,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_TORQUE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Magical Torque"), + #else + .name = _("MagiclTorque"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 100, .type = TYPE_FAIRY, @@ -15471,8 +15915,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBLADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Psyblade"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYBLADE, .power = 80, .type = TYPE_PSYCHIC, @@ -15488,8 +15932,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_STEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hydro Steam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HYDRO_STEAM, .power = 80, .type = TYPE_WATER, @@ -15504,8 +15948,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOOD_MOON] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Blood Moon"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_NORMAL, @@ -15520,8 +15964,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MATCHA_GOTCHA] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Matcha Gotcha"), + #else + .name = _("MatchaGotcha"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MATCHA_GOTCHA, .power = 80, .type = TYPE_GRASS, @@ -15538,8 +15986,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYRUP_BOMB] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Syrup Bomb"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SYRUP_BOMB, .power = 60, .type = TYPE_GRASS, @@ -15555,8 +16003,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IVY_CUDGEL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Ivy Cudgel"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_IVY_CUDGEL, .power = 100, .type = TYPE_GRASS, @@ -15572,8 +16020,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_SHOT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Electro Shot"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METEOR_BEAM, .power = 130, .type = TYPE_ELECTRIC, @@ -15588,8 +16036,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_STARSTORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Tera Starstorm"), + #else + .name = _("TeraStarstrm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_TERA_STARSTORM .power = 120, .type = TYPE_NORMAL, // Stellar type if used by Terapagos-Stellar @@ -15607,8 +16059,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FICKLE_BEAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Fickle Beam"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FICKLE_BEAM, .power = 80, .type = TYPE_DRAGON, @@ -15622,8 +16074,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_BULWARK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Burning Bulwark"), + #else + .name = _("BurnngBulwrk"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIRE, @@ -15644,8 +16100,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERCLAP] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Thunderclap"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUCKER_PUNCH, .power = 70, .type = TYPE_ELECTRIC, @@ -15659,8 +16115,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIGHTY_CLEAVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Mighty Cleave"), + #else + .name = _("MightyCleave"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FEINT, .power = 95, .type = TYPE_ROCK, @@ -15676,8 +16136,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACHYON_CUTTER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Tachyon Cutter"), + #else + .name = _("TachyonCuttr"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -15693,8 +16157,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARD_PRESS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Hard Press"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_STEEL, @@ -15709,8 +16173,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CHEER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Dragon Cheer"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_DRAGON_CHEER .power = 0, .type = TYPE_DRAGON, @@ -15725,8 +16189,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLURING_VOICE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Alluring Voice"), + #else + .name = _("AllurngVoice"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE_HIT, .power = 80, .type = TYPE_FAIRY, @@ -15743,8 +16211,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEMPER_FLARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Temper Flare"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, .type = TYPE_FIRE, @@ -15759,8 +16227,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERCELL_SLAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Supercell Slam"), + #else + .name = _("SuprcellSlam"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL_IF_MISS, .power = 100, .type = TYPE_ELECTRIC, @@ -15775,8 +16247,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_NOISE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Psychic Noise"), + #else + .name = _("PsychicNoise"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_PSYCHIC_NOISE .power = 75, .type = TYPE_PSYCHIC, @@ -15792,8 +16268,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPPER_HAND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("Upper Hand"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_UPPER_HAND .power = 65, .type = TYPE_FIGHTING, @@ -15808,8 +16284,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MALIGNANT_CHAIN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Malignant Chain"), + #else + .name = _("MalignntChan"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON_FANG, .power = 100, .type = TYPE_POISON, @@ -15824,8 +16304,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = // Z-Moves [MOVE_BREAKNECK_BLITZ] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Breakneck Blitz"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_NORMAL, @@ -15838,8 +16319,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ALL_OUT_PUMMELING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("All Out Pummeling"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_FIGHTING, @@ -15852,8 +16334,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUPERSONIC_SKYSTRIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Supersonic Skystrike"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_FLYING, @@ -15866,8 +16349,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ACID_DOWNPOUR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Acid Downpour"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_POISON, @@ -15880,8 +16364,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TECTONIC_RAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Tectonic Rage"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_GROUND, @@ -15895,8 +16380,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CONTINENTAL_CRUSH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Continental Crush"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_ROCK, @@ -15909,8 +16395,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SAVAGE_SPIN_OUT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Savage Spin Out"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_BUG, @@ -15923,8 +16410,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_NEVER_ENDING_NIGHTMARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Never Ending Nightmare"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_GHOST, @@ -15937,8 +16425,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CORKSCREW_CRASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Corkscrew Crash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_STEEL, @@ -15951,8 +16440,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_INFERNO_OVERDRIVE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Inferno Overdrive"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_FIRE, @@ -15965,8 +16455,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_HYDRO_VORTEX] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Hydro Vortex"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_WATER, @@ -15979,8 +16470,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLOOM_DOOM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Bloom Doom"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_GRASS, @@ -15993,8 +16485,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GIGAVOLT_HAVOC] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Gigavolt Havoc"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_ELECTRIC, @@ -16007,8 +16500,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SHATTERED_PSYCHE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Shattered Psyche"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_PSYCHIC, @@ -16021,8 +16515,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUBZERO_SLAMMER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Subzero Slammer"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_ICE, @@ -16035,8 +16530,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_DEVASTATING_DRAKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Devastating Drake"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_DRAGON, @@ -16049,8 +16545,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLACK_HOLE_ECLIPSE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Black Hole Eclipse"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_DARK, @@ -16063,8 +16560,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TWINKLE_TACKLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Twinkle Tackle"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, .type = TYPE_FAIRY, @@ -16077,8 +16575,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CATASTROPIKA] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Catastropika"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 210, .type = TYPE_ELECTRIC, @@ -16091,8 +16590,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_10000000_VOLT_THUNDERBOLT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("10000000 Volt Thunderbolt"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, .type = TYPE_ELECTRIC, @@ -16106,8 +16606,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_STOKED_SPARKSURFER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Stoked Sparksurfer"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 175, .type = TYPE_ELECTRIC, @@ -16120,8 +16621,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_EXTREME_EVOBOOST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Extreme Evoboost"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, .type = TYPE_NORMAL, @@ -16134,8 +16636,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_PULVERIZING_PANCAKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Pulverizing Pancake"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 210, .type = TYPE_NORMAL, @@ -16148,8 +16651,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GENESIS_SUPERNOVA] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Genesis Supernova"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, .type = TYPE_PSYCHIC, @@ -16163,8 +16667,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SINISTER_ARROW_RAID] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Sinister Arrow Raid"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, .type = TYPE_GHOST, @@ -16177,8 +16682,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MALICIOUS_MOONSAULT] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Malicious Moonsault"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, .type = TYPE_DARK, @@ -16191,8 +16697,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_OCEANIC_OPERETTA] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Oceaning Operetta"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, .type = TYPE_WATER, @@ -16205,8 +16712,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SPLINTERED_STORMSHARDS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Splintered Stormshards"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, .type = TYPE_ROCK, @@ -16220,8 +16728,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LETS_SNUGGLE_FOREVER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Let's Snuggle Forever"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 190, .type = TYPE_FAIRY, @@ -16234,8 +16743,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CLANGOROUS_SOULBLAZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Clangorous Soulblaze"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ALL_STATS_UP_HIT, .power = 185, .type = TYPE_DRAGON, @@ -16250,8 +16760,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GUARDIAN_OF_ALOLA] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Guardian Of Alola"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_FAIRY, @@ -16264,8 +16775,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SEARING_SUNRAZE_SMASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Searing Sunraze Smash"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, .type = TYPE_STEEL, @@ -16278,8 +16790,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Menacing Moonraze Maelstrom"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, .type = TYPE_GHOST, @@ -16292,8 +16805,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Light That Burns The Sky"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, .type = TYPE_PSYCHIC, @@ -16306,8 +16820,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + .name = _("-"), + .zMoveName = _("Soul Stealing 7 Star Strike"), + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, .type = TYPE_GHOST, @@ -16321,8 +16836,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Guard"), + #else + .name = _("M-Guard"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_NORMAL, @@ -16337,8 +16856,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Flare"), + #else + .name = _("M-Flare"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FIRE, @@ -16353,8 +16876,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Flutterby"), + #else + .name = _("M-Flutterby"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_BUG, @@ -16369,8 +16896,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Lightning"), + #else + .name = _("M-Lightning"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ELECTRIC, @@ -16385,8 +16916,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Strike"), + #else + .name = _("M-Strike"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_NORMAL, @@ -16401,8 +16936,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Knuckle"), + #else + .name = _("M-Knuckle"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FIGHTING, @@ -16417,8 +16956,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Phantasm"), + #else + .name = _("M-Phantasm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_GHOST, @@ -16433,8 +16976,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Hailstorm"), + #else + .name = _("M-Hailstorm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ICE, @@ -16449,8 +16996,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Ooze"), + #else + .name = _("M-Ooze"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_POISON, @@ -16465,8 +17016,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Geyser"), + #else + .name = _("M-Geyser"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_WATER, @@ -16481,8 +17036,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Airstream"), + #else + .name = _("M-Airstream"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FLYING, @@ -16497,8 +17056,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Starfall"), + #else + .name = _("M-Starfall"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FAIRY, @@ -16513,8 +17076,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Wyrmwind"), + #else + .name = _("M-Wyrmwind"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_DRAGON, @@ -16529,8 +17096,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Mindstorm"), + #else + .name = _("M-Mindstorm"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_PSYCHIC, @@ -16545,8 +17116,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Rockfall"), + #else + .name = _("M-Rockfall"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ROCK, @@ -16561,8 +17136,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Quake"), + #else + .name = _("M-Quake"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_GROUND, @@ -16578,8 +17157,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Darkness"), + #else + .name = _("M-Darkness"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_DARK, @@ -16594,8 +17177,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Overgrowth"), + #else + .name = _("M-Overgrowth"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16610,8 +17197,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("Max Steelspike"), + #else + .name = _("M-Steelspike"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -16626,8 +17217,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VINE_LASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), //ANIM TODO + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Vine Lash"), + #else + .name = _("G-Vine Lash"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16642,8 +17237,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Wildfire"), + #else + .name = _("G-Wildfire"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -16658,8 +17257,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CANNONADE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), //ANIM TODO + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Canonade"), + #else + .name = _("G-Canonade"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -16674,8 +17277,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Befuddle"), + #else + .name = _("G-Befuddle"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_BUG, @@ -16690,8 +17297,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Volt Crash") + #else + .name = _("G-Volt Crash"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ELECTRIC, @@ -16706,8 +17317,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Gold Rush"), + #else + .name = _("G-Gold Rush"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -16722,8 +17337,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Chi Strike") + #else + .name = _("G-Chi Strike"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIGHTING, @@ -16738,8 +17357,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Terror"), + #else + .name = _("G-Terror"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GHOST, @@ -16754,8 +17377,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Foam Burst"), + #else + .name = _("G-Foam Burst"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -16770,8 +17397,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Resonance"), + #else + .name = _("G-Resonance"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ICE, @@ -16786,8 +17417,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Cuddle"), + #else + .name = _("G-Cuddle"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -16802,8 +17437,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Replenish"), + #else + .name = _("G-Replenish"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -16818,8 +17457,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Malodor"), + #else + .name = _("G-Malodor"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_POISON, @@ -16834,8 +17477,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Meltdown"), + #else + .name = _("G-Meltdown"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -16850,8 +17497,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DRUM_SOLO] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), //ANIM TODO + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Drum Solo"), + #else + .name = _("G-Drum Solo"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16867,8 +17518,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FIREBALL] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), //ANIM TODO + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Fireball"), + #else + .name = _("G-Fireball"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -16884,8 +17539,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_HYDROSNIPE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), //ANIM TODO + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Hydrosnipe"), + #else + .name = _("G-Hydrosnipe"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -16901,8 +17560,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Wind Rage"), + #else + .name = _("G-Wind Rage"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FLYING, @@ -16917,8 +17580,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Gravitas"), + #else + .name = _("G-Gravitas"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_PSYCHIC, @@ -16933,8 +17600,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Stonesurge"), + #else + .name = _("G-Stonesurge"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -16949,8 +17620,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Volcalith"), + #else + .name = _("G-Volcalith"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ROCK, @@ -16965,8 +17640,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Tartness"), + #else + .name = _("G-Tartness"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16981,8 +17660,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Sweetness"), + #else + .name = _("G-Sweetness"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16997,8 +17680,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Sandblast"), + #else + .name = _("G-Sandblast"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GROUND, @@ -17013,8 +17700,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Stun Shock"), + #else + .name = _("G-Stun Shock"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ELECTRIC, @@ -17029,8 +17720,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Centiferno"), + #else + .name = _("G-Centiferno"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -17045,8 +17740,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Smite"), + #else + .name = _("G-Smite"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FAIRY, @@ -17062,8 +17761,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Snooze"), + #else + .name = _("G-Snooze"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DARK, @@ -17078,8 +17781,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Finale"), + #else + .name = _("G-Finale"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FAIRY, @@ -17094,8 +17801,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Steelsurge"), + #else + .name = _("G-Steelsurge"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -17110,8 +17821,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Depletion"), + #else + .name = _("G-Depletion"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DRAGON, @@ -17126,8 +17841,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max One Blow"), + #else + .name = _("G-One Blow"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DARK, @@ -17142,8 +17861,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RAPID_FLOW] = { - .name = _("Dummy"), - .description = COMPOUND_STRING("Dummy description."), //ANIM TODO + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = _("G-Max Rapid Flow"), + #else + .name = _("G-Rapid Flow"), + #endif + .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, diff --git a/src/pokemon.c b/src/pokemon.c index cbb4ddffd432..7ed447ad7b03 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6429,5 +6429,6 @@ u16 GetSpeciesPreEvolution(u16 species) const u8 *GetBattleMoveName(u16 moveId) { // TODO: Check for MOVE_NAME_LENGTH here. + // TODO: Check for if (IsZMove(moveId)) and return .zMoveName. return gBattleMoves[moveId].name; } From 85a80986b1167bbdc10d16dd6d4dca8f2ac63fe8 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 10 Jan 2024 23:18:44 -0300 Subject: [PATCH 03/30] Updated GetBattleMoveName to handle Z-Move Names Misc: -Removed pointless TODO about MOVE_NAME_LENGTH. -The compiler doesn't allow to have a move name with a value higher than MOVE_NAME_LENGTH, therefore it's pointless to worry about it. --- src/pokemon.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index 7ed447ad7b03..1cb8deaa2ebe 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6428,7 +6428,8 @@ u16 GetSpeciesPreEvolution(u16 species) const u8 *GetBattleMoveName(u16 moveId) { - // TODO: Check for MOVE_NAME_LENGTH here. - // TODO: Check for if (IsZMove(moveId)) and return .zMoveName. + if (IsZMove(moveId)) + return gBattleMoves[moveId].zMoveName; + return gBattleMoves[moveId].name; } From 623f02fdb53adcf60cb631f92f02fbba65140a06 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 10 Jan 2024 23:45:18 -0300 Subject: [PATCH 04/30] Fixed a couple of expanded move names --- src/data/battle_moves.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index e80e20d1fa2b..df35c8306fab 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -17298,7 +17298,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Volt Crash") + .name = _("G-Max Volt Crash"), #else .name = _("G-Volt Crash"), #endif @@ -17338,7 +17338,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Chi Strike") + .name = _("G-Max Chi Strike"), #else .name = _("G-Chi Strike"), #endif From e94fc5eb3a3f9145bf646f647ffce93cb1555d7e Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 14 Jan 2024 06:36:55 -0300 Subject: [PATCH 05/30] Removed zMoveName variable of struct BattleMove and extended the name variable's size --- include/pokemon.h | 3 +- src/data/battle_moves.h | 105 ++++++++++++++-------------------------- src/pokemon.c | 3 -- 3 files changed, 36 insertions(+), 75 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index b25276f8bea6..cc1875bc4c19 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -443,8 +443,7 @@ struct SpeciesInfo /*0x8C*/ struct BattleMove { - u8 name[MOVE_NAME_LENGTH + 1]; - u8 zMoveName[Z_MOVE_NAME_LENGTH + 1]; + u8 name[Z_MOVE_NAME_LENGTH + 1]; const u8 *description; u16 effect; u8 power; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index df35c8306fab..a8edb983522e 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -16304,8 +16304,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = // Z-Moves [MOVE_BREAKNECK_BLITZ] = { - .name = _("-"), - .zMoveName = _("Breakneck Blitz"), + .name = _("Breakneck Blitz"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16319,8 +16318,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ALL_OUT_PUMMELING] = { - .name = _("-"), - .zMoveName = _("All Out Pummeling"), + .name = _("All Out Pummeling"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16334,8 +16332,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUPERSONIC_SKYSTRIKE] = { - .name = _("-"), - .zMoveName = _("Supersonic Skystrike"), + .name = _("Supersonic Skystrike"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16349,8 +16346,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ACID_DOWNPOUR] = { - .name = _("-"), - .zMoveName = _("Acid Downpour"), + .name = _("Acid Downpour"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16364,8 +16360,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TECTONIC_RAGE] = { - .name = _("-"), - .zMoveName = _("Tectonic Rage"), + .name = _("Tectonic Rage"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16380,8 +16375,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CONTINENTAL_CRUSH] = { - .name = _("-"), - .zMoveName = _("Continental Crush"), + .name = _("Continental Crush"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16395,8 +16389,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SAVAGE_SPIN_OUT] = { - .name = _("-"), - .zMoveName = _("Savage Spin Out"), + .name = _("Savage Spin Out"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16410,8 +16403,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_NEVER_ENDING_NIGHTMARE] = { - .name = _("-"), - .zMoveName = _("Never Ending Nightmare"), + .name = _("Never Ending Nightmare"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16425,8 +16417,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CORKSCREW_CRASH] = { - .name = _("-"), - .zMoveName = _("Corkscrew Crash"), + .name = _("Corkscrew Crash"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16440,8 +16431,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_INFERNO_OVERDRIVE] = { - .name = _("-"), - .zMoveName = _("Inferno Overdrive"), + .name = _("Inferno Overdrive"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16455,8 +16445,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_HYDRO_VORTEX] = { - .name = _("-"), - .zMoveName = _("Hydro Vortex"), + .name = _("Hydro Vortex"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16470,8 +16459,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLOOM_DOOM] = { - .name = _("-"), - .zMoveName = _("Bloom Doom"), + .name = _("Bloom Doom"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16485,8 +16473,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GIGAVOLT_HAVOC] = { - .name = _("-"), - .zMoveName = _("Gigavolt Havoc"), + .name = _("Gigavolt Havoc"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16500,8 +16487,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SHATTERED_PSYCHE] = { - .name = _("-"), - .zMoveName = _("Shattered Psyche"), + .name = _("Shattered Psyche"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16515,8 +16501,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUBZERO_SLAMMER] = { - .name = _("-"), - .zMoveName = _("Subzero Slammer"), + .name = _("Subzero Slammer"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16530,8 +16515,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_DEVASTATING_DRAKE] = { - .name = _("-"), - .zMoveName = _("Devastating Drake"), + .name = _("Devastating Drake"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16545,8 +16529,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLACK_HOLE_ECLIPSE] = { - .name = _("-"), - .zMoveName = _("Black Hole Eclipse"), + .name = _("Black Hole Eclipse"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16560,8 +16543,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TWINKLE_TACKLE] = { - .name = _("-"), - .zMoveName = _("Twinkle Tackle"), + .name = _("Twinkle Tackle"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16575,8 +16557,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CATASTROPIKA] = { - .name = _("-"), - .zMoveName = _("Catastropika"), + .name = _("Catastropika"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 210, @@ -16590,8 +16571,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_10000000_VOLT_THUNDERBOLT] = { - .name = _("-"), - .zMoveName = _("10000000 Volt Thunderbolt"), + .name = _("10000000 Volt Thunderbolt"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, @@ -16606,8 +16586,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_STOKED_SPARKSURFER] = { - .name = _("-"), - .zMoveName = _("Stoked Sparksurfer"), + .name = _("Stoked Sparksurfer"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE_HIT, .power = 175, @@ -16621,8 +16600,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_EXTREME_EVOBOOST] = { - .name = _("-"), - .zMoveName = _("Extreme Evoboost"), + .name = _("Extreme Evoboost"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, @@ -16636,8 +16614,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_PULVERIZING_PANCAKE] = { - .name = _("-"), - .zMoveName = _("Pulverizing Pancake"), + .name = _("Pulverizing Pancake"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 210, @@ -16651,8 +16628,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GENESIS_SUPERNOVA] = { - .name = _("-"), - .zMoveName = _("Genesis Supernova"), + .name = _("Genesis Supernova"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, @@ -16667,8 +16643,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SINISTER_ARROW_RAID] = { - .name = _("-"), - .zMoveName = _("Sinister Arrow Raid"), + .name = _("Sinister Arrow Raid"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, @@ -16682,8 +16657,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MALICIOUS_MOONSAULT] = { - .name = _("-"), - .zMoveName = _("Malicious Moonsault"), + .name = _("Malicious Moonsault"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, @@ -16697,8 +16671,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_OCEANIC_OPERETTA] = { - .name = _("-"), - .zMoveName = _("Oceaning Operetta"), + .name = _("Oceaning Operetta"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, @@ -16712,8 +16685,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SPLINTERED_STORMSHARDS] = { - .name = _("-"), - .zMoveName = _("Splintered Stormshards"), + .name = _("Splintered Stormshards"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, @@ -16728,8 +16700,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LETS_SNUGGLE_FOREVER] = { - .name = _("-"), - .zMoveName = _("Let's Snuggle Forever"), + .name = _("Let's Snuggle Forever"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 190, @@ -16743,8 +16714,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CLANGOROUS_SOULBLAZE] = { - .name = _("-"), - .zMoveName = _("Clangorous Soulblaze"), + .name = _("Clangorous Soulblaze"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ALL_STATS_UP_HIT, .power = 185, @@ -16760,8 +16730,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GUARDIAN_OF_ALOLA] = { - .name = _("-"), - .zMoveName = _("Guardian Of Alola"), + .name = _("Guardian Of Alola"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, @@ -16775,8 +16744,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SEARING_SUNRAZE_SMASH] = { - .name = _("-"), - .zMoveName = _("Searing Sunraze Smash"), + .name = _("Searing Sunraze Smash"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16790,8 +16758,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { - .name = _("-"), - .zMoveName = _("Menacing Moonraze Maelstrom"), + .name = _("Menacing Moonraze Maelstrom"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16805,8 +16772,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { - .name = _("-"), - .zMoveName = _("Light That Burns The Sky"), + .name = _("Light That Burns The Sky"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16820,8 +16786,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { - .name = _("-"), - .zMoveName = _("Soul Stealing 7 Star Strike"), + .name = _("Soul Stealing 7 Star Strike"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, diff --git a/src/pokemon.c b/src/pokemon.c index 1cb8deaa2ebe..df462a470d07 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6428,8 +6428,5 @@ u16 GetSpeciesPreEvolution(u16 species) const u8 *GetBattleMoveName(u16 moveId) { - if (IsZMove(moveId)) - return gBattleMoves[moveId].zMoveName; - return gBattleMoves[moveId].name; } From b59afe0dff442263e8b39f7ac16ac512a731e89a Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 14 Jan 2024 21:39:20 -0300 Subject: [PATCH 06/30] Ditched no longer used MOVE_NAME_LENGTH constant --- include/battle_message.h | 2 +- include/constants/global.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/battle_message.h b/include/battle_message.h index 338712606a90..8d56ffa22000 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -4,7 +4,7 @@ // This buffer can hold many different things. Some of the things it can hold // that have explicit sizes are listed below to ensure it can contain them. #define TEXT_BUFF_ARRAY_COUNT max(16, \ - max(MOVE_NAME_LENGTH + 2, /* +2 to hold the "!" and EOS. */ \ + max(Z_MOVE_NAME_LENGTH + 2, /* +2 to hold the "!" and EOS. */ \ max(POKEMON_NAME_LENGTH + 1, \ ABILITY_NAME_LENGTH + 1))) diff --git a/include/constants/global.h b/include/constants/global.h index d408d48e0bc3..c71a9b32cb53 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -106,12 +106,7 @@ #define PLAYER_NAME_LENGTH 7 #define MAIL_WORDS_COUNT 9 #define EASY_CHAT_BATTLE_WORDS_COUNT 6 -#if B_EXPANDED_MOVE_NAMES == TRUE -#define MOVE_NAME_LENGTH 16 -#else -#define MOVE_NAME_LENGTH 12 -#endif -#define Z_MOVE_NAME_LENGTH 27 +#define Z_MOVE_NAME_LENGTH 27 // Supersedes MOVE_NAME_LENGTH #define NUM_QUESTIONNAIRE_WORDS 4 #define QUIZ_QUESTION_LEN 9 #define WONDER_CARD_TEXT_LENGTH 40 From eb8a74ca5fae8421c78d79de08086ce7c9a080ff Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 15 Jan 2024 05:13:13 -0300 Subject: [PATCH 07/30] Corrected the names of the max moves I should have done this after updating the size of the name variable of the struct BattleMove, but I didn't think about it at all until Cancer Fairy indirectly gave me the idea. --- src/data/battle_moves.h | 312 +++++++--------------------------------- 1 file changed, 52 insertions(+), 260 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 25d6f7636eee..56e149a4e889 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -16251,11 +16251,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Guard"), - #else - .name = _("M-Guard"), - #endif + .name = _("Max Guard"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -16270,11 +16266,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Flare"), - #else - .name = _("M-Flare"), - #endif + .name = _("Max Flare"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16289,11 +16281,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Flutterby"), - #else - .name = _("M-Flutterby"), - #endif + .name = _("Max Flutterby"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16308,11 +16296,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Lightning"), - #else - .name = _("M-Lightning"), - #endif + .name = _("Max Lightning"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16327,11 +16311,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Strike"), - #else - .name = _("M-Strike"), - #endif + .name = _("Max Strike"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16346,11 +16326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Knuckle"), - #else - .name = _("M-Knuckle"), - #endif + .name = _("Max Knuckle"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16365,11 +16341,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Phantasm"), - #else - .name = _("M-Phantasm"), - #endif + .name = _("Max Phantasm"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16384,11 +16356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Hailstorm"), - #else - .name = _("M-Hailstorm"), - #endif + .name = _("Max Hailstorm"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16403,11 +16371,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Ooze"), - #else - .name = _("M-Ooze"), - #endif + .name = _("Max Ooze"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16422,11 +16386,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Geyser"), - #else - .name = _("M-Geyser"), - #endif + .name = _("Max Geyser"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16441,11 +16401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Airstream"), - #else - .name = _("M-Airstream"), - #endif + .name = _("Max Airstream"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16460,11 +16416,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Starfall"), - #else - .name = _("M-Starfall"), - #endif + .name = _("Max Starfall"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16479,11 +16431,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Wyrmwind"), - #else - .name = _("M-Wyrmwind"), - #endif + .name = _("Max Wyrmwind"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16498,11 +16446,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Mindstorm"), - #else - .name = _("M-Mindstorm"), - #endif + .name = _("Max Mindstorm"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16517,11 +16461,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Rockfall"), - #else - .name = _("M-Rockfall"), - #endif + .name = _("Max Rockfall"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16536,11 +16476,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Quake"), - #else - .name = _("M-Quake"), - #endif + .name = _("Max Quake"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16556,11 +16492,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Darkness"), - #else - .name = _("M-Darkness"), - #endif + .name = _("Max Darkness"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16575,11 +16507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Overgrowth"), - #else - .name = _("M-Overgrowth"), - #endif + .name = _("Max Overgrowth"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16594,11 +16522,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Max Steelspike"), - #else - .name = _("M-Steelspike"), - #endif + .name = _("Max Steelspike"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16613,11 +16537,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VINE_LASH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Vine Lash"), - #else - .name = _("G-Vine Lash"), - #endif + .name = _("G-Max Vine Lash"), .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16632,11 +16552,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Wildfire"), - #else - .name = _("G-Wildfire"), - #endif + .name = _("G-Max Wildfire"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16651,11 +16567,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CANNONADE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Canonade"), - #else - .name = _("G-Canonade"), - #endif + .name = _("G-Max Canonade"), .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16670,11 +16582,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Befuddle"), - #else - .name = _("G-Befuddle"), - #endif + .name = _("G-Max Befuddle"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16689,11 +16597,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Volt Crash"), - #else - .name = _("G-Volt Crash"), - #endif + .name = _("G-Max Volt Crash"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16708,11 +16612,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Gold Rush"), - #else - .name = _("G-Gold Rush"), - #endif + .name = _("G-Max Gold Rush"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16727,11 +16627,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Chi Strike"), - #else - .name = _("G-Chi Strike"), - #endif + .name = _("G-Max Chi Strike"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16746,11 +16642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Terror"), - #else - .name = _("G-Terror"), - #endif + .name = _("G-Max Terror"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16765,11 +16657,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Foam Burst"), - #else - .name = _("G-Foam Burst"), - #endif + .name = _("G-Max Foam Burst"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16784,11 +16672,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Resonance"), - #else - .name = _("G-Resonance"), - #endif + .name = _("G-Max Resonance"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16803,11 +16687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Cuddle"), - #else - .name = _("G-Cuddle"), - #endif + .name = _("G-Max Cuddle"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16822,11 +16702,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Replenish"), - #else - .name = _("G-Replenish"), - #endif + .name = _("G-Max Replenish"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16841,11 +16717,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Malodor"), - #else - .name = _("G-Malodor"), - #endif + .name = _("G-Max Malodor"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16860,11 +16732,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Meltdown"), - #else - .name = _("G-Meltdown"), - #endif + .name = _("G-Max Meltdown"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16879,11 +16747,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DRUM_SOLO] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Drum Solo"), - #else - .name = _("G-Drum Solo"), - #endif + .name = _("G-Max Drum Solo"), .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16899,11 +16763,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FIREBALL] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Fireball"), - #else - .name = _("G-Fireball"), - #endif + .name = _("G-Max Fireball"), .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16919,11 +16779,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_HYDROSNIPE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Hydrosnipe"), - #else - .name = _("G-Hydrosnipe"), - #endif + .name = _("G-Max Hydrosnipe"), .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16939,11 +16795,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Wind Rage"), - #else - .name = _("G-Wind Rage"), - #endif + .name = _("G-Max Wind Rage"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16958,11 +16810,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Gravitas"), - #else - .name = _("G-Gravitas"), - #endif + .name = _("G-Max Gravitas"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16977,11 +16825,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Stonesurge"), - #else - .name = _("G-Stonesurge"), - #endif + .name = _("G-Max Stonesurge"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16996,11 +16840,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Volcalith"), - #else - .name = _("G-Volcalith"), - #endif + .name = _("G-Max Volcalith"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17015,11 +16855,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Tartness"), - #else - .name = _("G-Tartness"), - #endif + .name = _("G-Max Tartness"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17034,11 +16870,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Sweetness"), - #else - .name = _("G-Sweetness"), - #endif + .name = _("G-Max Sweetness"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17053,11 +16885,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Sandblast"), - #else - .name = _("G-Sandblast"), - #endif + .name = _("G-Max Sandblast"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17072,11 +16900,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Stun Shock"), - #else - .name = _("G-Stun Shock"), - #endif + .name = _("G-Max Stun Shock"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17091,11 +16915,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Centiferno"), - #else - .name = _("G-Centiferno"), - #endif + .name = _("G-Max Centiferno"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17110,11 +16930,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Smite"), - #else - .name = _("G-Smite"), - #endif + .name = _("G-Max Smite"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17130,11 +16946,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Snooze"), - #else - .name = _("G-Snooze"), - #endif + .name = _("G-Max Snooze"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17149,11 +16961,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Finale"), - #else - .name = _("G-Finale"), - #endif + .name = _("G-Max Finale"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17168,11 +16976,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Steelsurge"), - #else - .name = _("G-Steelsurge"), - #endif + .name = _("G-Max Steelsurge"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17187,11 +16991,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Depletion"), - #else - .name = _("G-Depletion"), - #endif + .name = _("G-Max Depletion"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17206,11 +17006,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max One Blow"), - #else - .name = _("G-One Blow"), - #endif + .name = _("G-Max One Blow"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17225,11 +17021,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RAPID_FLOW] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("G-Max Rapid Flow"), - #else - .name = _("G-Rapid Flow"), - #endif + .name = _("G-Max Rapid Flow"), .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, From 4beb9b0f96d3491fd83d1a2bc44ecd91de24958b Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 15 Jan 2024 05:49:59 -0300 Subject: [PATCH 08/30] Fixed U-turn's name --- src/data/battle_moves.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 56e149a4e889..07f12714223d 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -6675,7 +6675,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_U_TURN] = { - .name = _("U-Turn"), + .name = _("U-turn"), .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ESCAPE, .power = 70, From 9bba425a7de73f73f9413a1ebb63a5880f2ed411 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 15 Jan 2024 05:52:57 -0300 Subject: [PATCH 09/30] Brought back MOVE_NAME_LENGTH I think it doesn't make sense to have a Z_MOVE_NAME_LENGTH because the length in question is used for all battle moves, not just the Z-Moves. --- include/battle_message.h | 2 +- include/constants/global.h | 2 +- include/pokemon.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/battle_message.h b/include/battle_message.h index 8d56ffa22000..338712606a90 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -4,7 +4,7 @@ // This buffer can hold many different things. Some of the things it can hold // that have explicit sizes are listed below to ensure it can contain them. #define TEXT_BUFF_ARRAY_COUNT max(16, \ - max(Z_MOVE_NAME_LENGTH + 2, /* +2 to hold the "!" and EOS. */ \ + max(MOVE_NAME_LENGTH + 2, /* +2 to hold the "!" and EOS. */ \ max(POKEMON_NAME_LENGTH + 1, \ ABILITY_NAME_LENGTH + 1))) diff --git a/include/constants/global.h b/include/constants/global.h index c71a9b32cb53..22fe17e3c9c0 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -106,7 +106,7 @@ #define PLAYER_NAME_LENGTH 7 #define MAIL_WORDS_COUNT 9 #define EASY_CHAT_BATTLE_WORDS_COUNT 6 -#define Z_MOVE_NAME_LENGTH 27 // Supersedes MOVE_NAME_LENGTH +#define MOVE_NAME_LENGTH 27 // Updated to hold the longest Z-Move name. #define NUM_QUESTIONNAIRE_WORDS 4 #define QUIZ_QUESTION_LEN 9 #define WONDER_CARD_TEXT_LENGTH 40 diff --git a/include/pokemon.h b/include/pokemon.h index e455d4f0d351..fee284949a73 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -444,7 +444,7 @@ struct SpeciesInfo /*0x8C*/ struct BattleMove { - u8 name[Z_MOVE_NAME_LENGTH + 1]; + u8 name[MOVE_NAME_LENGTH + 1]; const u8 *description; u16 effect; u8 power; From bffc963a863fff96cb9740d3d6520dd984ab8d45 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 24 Jan 2024 07:05:18 -0300 Subject: [PATCH 10/30] Introduced a union for Move/Z-Move names in the struct BattleMove --- include/constants/global.h | 7 +- include/pokemon.h | 5 +- src/data/battle_moves.h | 2110 ++++++++++++++++++------------------ src/data/party_menu.h | 28 +- src/pokemon.c | 5 +- 5 files changed, 1083 insertions(+), 1072 deletions(-) diff --git a/include/constants/global.h b/include/constants/global.h index 22fe17e3c9c0..d408d48e0bc3 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -106,7 +106,12 @@ #define PLAYER_NAME_LENGTH 7 #define MAIL_WORDS_COUNT 9 #define EASY_CHAT_BATTLE_WORDS_COUNT 6 -#define MOVE_NAME_LENGTH 27 // Updated to hold the longest Z-Move name. +#if B_EXPANDED_MOVE_NAMES == TRUE +#define MOVE_NAME_LENGTH 16 +#else +#define MOVE_NAME_LENGTH 12 +#endif +#define Z_MOVE_NAME_LENGTH 27 #define NUM_QUESTIONNAIRE_WORDS 4 #define QUIZ_QUESTION_LEN 9 #define WONDER_CARD_TEXT_LENGTH 40 diff --git a/include/pokemon.h b/include/pokemon.h index fee284949a73..3b1d3db96ee4 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -444,7 +444,10 @@ struct SpeciesInfo /*0x8C*/ struct BattleMove { - u8 name[MOVE_NAME_LENGTH + 1]; + union { + u8 moveName[MOVE_NAME_LENGTH + 1]; + u8 zMoveName[Z_MOVE_NAME_LENGTH + 1]; + } name; const u8 *description; u16 effect; u8 power; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 07f12714223d..7e6e8362b6b1 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -14,7 +14,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { - .name = _("-"), + .name = { .moveName = _("-") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 0, @@ -31,7 +31,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUND] = { - .name = _("Pound"), + .name = { .moveName = _("Pound") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -47,7 +47,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KARATE_CHOP] = { - .name = _("Karate Chop"), + .name = { .moveName = _("Karate Chop") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -63,7 +63,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SLAP] = { - .name = _("Double Slap"), + .name = { .moveName = _("Double Slap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 15, @@ -78,7 +78,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMET_PUNCH] = { - .name = _("Comet Punch"), + .name = { .moveName = _("Comet Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 18, @@ -94,7 +94,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_PUNCH] = { - .name = _("Mega Punch"), + .name = { .moveName = _("Mega Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -110,7 +110,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAY_DAY] = { - .name = _("Pay Day"), + .name = { .moveName = _("Pay Day") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -127,7 +127,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PUNCH] = { - .name = _("Fire Punch"), + .name = { .moveName = _("Fire Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -148,7 +148,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_PUNCH] = { - .name = _("Ice Punch"), + .name = { .moveName = _("Ice Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -169,7 +169,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_PUNCH] = { - .name = _("ThunderPunch"), + .name = { .moveName = _("ThunderPunch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -190,7 +190,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCRATCH] = { - .name = _("Scratch"), + .name = { .moveName = _("Scratch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -205,7 +205,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VISE_GRIP] = { - .name = _("Vise Grip"), + .name = { .moveName = _("Vise Grip") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 55, @@ -220,7 +220,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUILLOTINE] = { - .name = _("Guillotine"), + .name = { .moveName = _("Guillotine") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OHKO, .power = 1, @@ -235,7 +235,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_WIND] = { - .name = _("Razor Wind"), + .name = { .moveName = _("Razor Wind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 80, @@ -254,7 +254,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWORDS_DANCE] = { - .name = _("Swords Dance"), + .name = { .moveName = _("Swords Dance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_UP_2, .power = 0, @@ -271,7 +271,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CUT] = { - .name = _("Cut"), + .name = { .moveName = _("Cut") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -287,7 +287,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUST] = { - .name = _("Gust"), + .name = { .moveName = _("Gust") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GUST, .power = 40, @@ -304,7 +304,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WING_ATTACK] = { - .name = _("Wing Attack"), + .name = { .moveName = _("Wing Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -319,7 +319,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLWIND] = { - .name = _("Whirlwind"), + .name = { .moveName = _("Whirlwind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROAR, .power = 0, @@ -340,7 +340,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLY] = { - .name = _("Fly"), + .name = { .moveName = _("Fly") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 90 : 70, @@ -360,7 +360,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIND] = { - .name = _("Bind"), + .name = { .moveName = _("Bind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 15, @@ -379,7 +379,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLAM] = { - .name = _("Slam"), + .name = { .moveName = _("Slam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -395,7 +395,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VINE_WHIP] = { - .name = _("Vine Whip"), + .name = { .moveName = _("Vine Whip") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 25, @@ -416,7 +416,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMP] = { - .name = _("Stomp"), + .name = { .moveName = _("Stomp") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -438,7 +438,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_KICK] = { - .name = _("Double Kick"), + .name = { .moveName = _("Double Kick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 30, @@ -454,7 +454,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_KICK] = { - .name = _("Mega Kick"), + .name = { .moveName = _("Mega Kick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -469,7 +469,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUMP_KICK] = { - .name = _("Jump Kick"), + .name = { .moveName = _("Jump Kick") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 100, @@ -491,7 +491,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLING_KICK] = { - .name = _("Rolling Kick"), + .name = { .moveName = _("Rolling Kick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -512,7 +512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_ATTACK] = { - .name = _("Sand Attack"), + .name = { .moveName = _("Sand Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, @@ -528,7 +528,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADBUTT] = { - .name = _("Headbutt"), + .name = { .moveName = _("Headbutt") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -548,7 +548,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_ATTACK] = { - .name = _("Horn Attack"), + .name = { .moveName = _("Horn Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -563,7 +563,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_ATTACK] = { - .name = _("Fury Attack"), + .name = { .moveName = _("Fury Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 15, @@ -578,7 +578,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_DRILL] = { - .name = _("Horn Drill"), + .name = { .moveName = _("Horn Drill") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OHKO, .power = 1, @@ -593,7 +593,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACKLE] = { - .name = _("Tackle"), + .name = { .moveName = _("Tackle") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 40, @@ -614,7 +614,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_SLAM] = { - .name = _("Body Slam"), + .name = { .moveName = _("Body Slam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 85, @@ -636,7 +636,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRAP] = { - .name = _("Wrap"), + .name = { .moveName = _("Wrap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 15, @@ -654,7 +654,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_DOWN] = { - .name = _("Take Down"), + .name = { .moveName = _("Take Down") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -670,7 +670,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THRASH] = { - .name = _("Thrash"), + .name = { .moveName = _("Thrash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 120 : 90, @@ -690,7 +690,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_EDGE] = { - .name = _("Double-Edge"), + .name = { .moveName = _("Double-Edge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -706,7 +706,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_WHIP] = { - .name = _("Tail Whip"), + .name = { .moveName = _("Tail Whip") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, @@ -722,7 +722,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_STING] = { - .name = _("Poison Sting"), + .name = { .moveName = _("Poison Sting") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 15, @@ -741,7 +741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWINEEDLE] = { - .name = _("Twineedle"), + .name = { .moveName = _("Twineedle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 25, @@ -762,7 +762,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIN_MISSILE] = { - .name = _("Pin Missile"), + .name = { .moveName = _("Pin Missile") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 25 : 14, @@ -776,7 +776,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEER] = { - .name = _("Leer"), + .name = { .moveName = _("Leer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, @@ -792,7 +792,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITE] = { - .name = _("Bite"), + .name = { .moveName = _("Bite") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -813,7 +813,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWL] = { - .name = _("Growl"), + .name = { .moveName = _("Growl") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN, .power = 0, @@ -831,7 +831,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR] = { - .name = _("Roar"), + .name = { .moveName = _("Roar") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROAR, .power = 0, @@ -852,7 +852,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SING] = { - .name = _("Sing"), + .name = { .moveName = _("Sing") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, @@ -870,7 +870,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERSONIC] = { - .name = _("Supersonic"), + .name = { .moveName = _("Supersonic") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE, .power = 0, @@ -888,7 +888,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SONIC_BOOM] = { - .name = _("Sonic Boom"), + .name = { .moveName = _("Sonic Boom") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FIXED_DAMAGE_ARG, .power = 1, @@ -903,7 +903,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISABLE] = { - .name = _("Disable"), + .name = { .moveName = _("Disable") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 100, @@ -926,7 +926,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID] = { - .name = _("Acid"), + .name = { .moveName = _("Acid") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -945,7 +945,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBER] = { - .name = _("Ember"), + .name = { .moveName = _("Ember") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -964,7 +964,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAMETHROWER] = { - .name = _("Flamethrower"), + .name = { .moveName = _("Flamethrower") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, @@ -983,7 +983,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST] = { - .name = _("Mist"), + .name = { .moveName = _("Mist") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIST, .power = 0, @@ -1001,7 +1001,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_GUN] = { - .name = _("Water Gun"), + .name = { .moveName = _("Water Gun") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -1015,7 +1015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_PUMP] = { - .name = _("Hydro Pump"), + .name = { .moveName = _("Hydro Pump") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, @@ -1029,7 +1029,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURF] = { - .name = _("Surf"), + .name = { .moveName = _("Surf") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, @@ -1045,7 +1045,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BEAM] = { - .name = _("Ice Beam"), + .name = { .moveName = _("Ice Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, @@ -1066,7 +1066,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLIZZARD] = { - .name = _("Blizzard"), + .name = { .moveName = _("Blizzard") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = B_BLIZZARD_HAIL >= GEN_4 ? EFFECT_BLIZZARD : EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, @@ -1086,7 +1086,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBEAM] = { - .name = _("Psybeam"), + .name = { .moveName = _("Psybeam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -1105,7 +1105,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE_BEAM] = { - .name = _("Bubble Beam"), + .name = { .moveName = _("Bubble Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -1124,7 +1124,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_BEAM] = { - .name = _("Aurora Beam"), + .name = { .moveName = _("Aurora Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -1143,7 +1143,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_BEAM] = { - .name = _("Hyper Beam"), + .name = { .moveName = _("Hyper Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 150, @@ -1162,7 +1162,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PECK] = { - .name = _("Peck"), + .name = { .moveName = _("Peck") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 35, @@ -1177,7 +1177,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_PECK] = { - .name = _("Drill Peck"), + .name = { .moveName = _("Drill Peck") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -1192,7 +1192,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBMISSION] = { - .name = _("Submission"), + .name = { .moveName = _("Submission") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -1208,7 +1208,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_KICK] = { - .name = _("Low Kick"), + .name = { .moveName = _("Low Kick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LOW_KICK, .power = 1, @@ -1223,7 +1223,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COUNTER] = { - .name = _("Counter"), + .name = { .moveName = _("Counter") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COUNTER, .power = 1, @@ -1243,7 +1243,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEISMIC_TOSS] = { - .name = _("Seismic Toss"), + .name = { .moveName = _("Seismic Toss") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, @@ -1259,7 +1259,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH] = { - .name = _("Strength"), + .name = { .moveName = _("Strength") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -1274,7 +1274,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ABSORB] = { - .name = _("Absorb"), + .name = { .moveName = _("Absorb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = 20, @@ -1290,7 +1290,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_DRAIN] = { - .name = _("Mega Drain"), + .name = { .moveName = _("Mega Drain") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = 40, @@ -1306,7 +1306,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_SEED] = { - .name = _("Leech Seed"), + .name = { .moveName = _("Leech Seed") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LEECH_SEED, .power = 0, @@ -1322,7 +1322,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWTH] = { - .name = _("Growth"), + .name = { .moveName = _("Growth") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = B_GROWTH_STAT_RAISE >= GEN_5 ? EFFECT_GROWTH : EFFECT_SPECIAL_ATTACK_UP, .power = 0, @@ -1340,7 +1340,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_LEAF] = { - .name = _("Razor Leaf"), + .name = { .moveName = _("Razor Leaf") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 55, @@ -1356,7 +1356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BEAM] = { - .name = _("Solar Beam"), + .name = { .moveName = _("Solar Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOLAR_BEAM, .power = 120, @@ -1373,7 +1373,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_POWDER] = { - .name = _("PoisonPowder"), + .name = { .moveName = _("PoisonPowder") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POISON, .power = 0, @@ -1390,7 +1390,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUN_SPORE] = { - .name = _("Stun Spore"), + .name = { .moveName = _("Stun Spore") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE, .power = 0, @@ -1407,7 +1407,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_POWDER] = { - .name = _("Sleep Powder"), + .name = { .moveName = _("Sleep Powder") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, @@ -1424,7 +1424,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_DANCE] = { - .name = _("Petal Dance"), + .name = { .moveName = _("Petal Dance") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, @@ -1451,7 +1451,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRING_SHOT] = { - .name = _("String Shot"), + .name = { .moveName = _("String Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_SPEED_DOWN_2 : EFFECT_SPEED_DOWN, .power = 0, @@ -1467,7 +1467,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RAGE] = { - .name = _("Dragon Rage"), + .name = { .moveName = _("Dragon Rage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FIXED_DAMAGE_ARG, .power = 1, @@ -1483,7 +1483,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_SPIN] = { - .name = _("Fire Spin"), + .name = { .moveName = _("Fire Spin") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, @@ -1501,7 +1501,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_SHOCK] = { - .name = _("ThunderShock"), + .name = { .moveName = _("ThunderShock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -1520,7 +1520,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERBOLT] = { - .name = _("Thunderbolt"), + .name = { .moveName = _("Thunderbolt") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, @@ -1539,7 +1539,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_WAVE] = { - .name = _("Thunder Wave"), + .name = { .moveName = _("Thunder Wave") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARALYZE, .power = 0, @@ -1555,7 +1555,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER] = { - .name = _("Thunder"), + .name = { .moveName = _("Thunder") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_THUNDER, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, @@ -1575,7 +1575,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_THROW] = { - .name = _("Rock Throw"), + .name = { .moveName = _("Rock Throw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -1589,7 +1589,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTHQUAKE] = { - .name = _("Earthquake"), + .name = { .moveName = _("Earthquake") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EARTHQUAKE, .power = 100, @@ -1606,7 +1606,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISSURE] = { - .name = _("Fissure"), + .name = { .moveName = _("Fissure") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OHKO, .power = 1, @@ -1622,7 +1622,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIG] = { - .name = _("Dig"), + .name = { .moveName = _("Dig") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 80 : 60, @@ -1642,7 +1642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC] = { - .name = _("Toxic"), + .name = { .moveName = _("Toxic") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TOXIC, .power = 0, @@ -1658,7 +1658,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSION] = { - .name = _("Confusion"), + .name = { .moveName = _("Confusion") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -1677,7 +1677,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC] = { - .name = _("Psychic"), + .name = { .moveName = _("Psychic") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -1696,7 +1696,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPNOSIS] = { - .name = _("Hypnosis"), + .name = { .moveName = _("Hypnosis") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, @@ -1712,7 +1712,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEDITATE] = { - .name = _("Meditate"), + .name = { .moveName = _("Meditate") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_UP, .power = 0, @@ -1730,7 +1730,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AGILITY] = { - .name = _("Agility"), + .name = { .moveName = _("Agility") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_UP_2, .power = 0, @@ -1748,7 +1748,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_ATTACK] = { - .name = _("Quick Attack"), + .name = { .moveName = _("Quick Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -1763,7 +1763,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE] = { - .name = _("Rage"), + .name = { .moveName = _("Rage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAGE, .power = 20, @@ -1778,7 +1778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEPORT] = { - .name = _("Teleport"), + .name = { .moveName = _("Teleport") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TELEPORT, .power = 0, @@ -1795,7 +1795,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SHADE] = { - .name = _("Night Shade"), + .name = { .moveName = _("Night Shade") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, @@ -1809,7 +1809,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIMIC] = { - .name = _("Mimic"), + .name = { .moveName = _("Mimic") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIMIC, .power = 0, @@ -1832,7 +1832,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCREECH] = { - .name = _("Screech"), + .name = { .moveName = _("Screech") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_DOWN_2, .power = 0, @@ -1850,7 +1850,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_TEAM] = { - .name = _("Double Team"), + .name = { .moveName = _("Double Team") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EVASION_UP, .power = 0, @@ -1868,7 +1868,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECOVER] = { - .name = _("Recover"), + .name = { .moveName = _("Recover") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, @@ -1893,7 +1893,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARDEN] = { - .name = _("Harden"), + .name = { .moveName = _("Harden") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP, .power = 0, @@ -1911,7 +1911,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MINIMIZE] = { - .name = _("Minimize"), + .name = { .moveName = _("Minimize") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MINIMIZE, .power = 0, @@ -1929,7 +1929,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOKESCREEN] = { - .name = _("Smokescreen"), + .name = { .moveName = _("Smokescreen") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, @@ -1945,7 +1945,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSE_RAY] = { - .name = _("Confuse Ray"), + .name = { .moveName = _("Confuse Ray") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE, .power = 0, @@ -1961,7 +1961,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WITHDRAW] = { - .name = _("Withdraw"), + .name = { .moveName = _("Withdraw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP, .power = 0, @@ -1979,7 +1979,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFENSE_CURL] = { - .name = _("Defense Curl"), + .name = { .moveName = _("Defense Curl") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_CURL, .power = 0, @@ -1997,7 +1997,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRIER] = { - .name = _("Barrier"), + .name = { .moveName = _("Barrier") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, @@ -2015,7 +2015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_SCREEN] = { - .name = _("Light Screen"), + .name = { .moveName = _("Light Screen") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LIGHT_SCREEN, .power = 0, @@ -2033,7 +2033,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAZE] = { - .name = _("Haze"), + .name = { .moveName = _("Haze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HAZE, .power = 0, @@ -2051,7 +2051,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT] = { - .name = _("Reflect"), + .name = { .moveName = _("Reflect") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REFLECT, .power = 0, @@ -2069,7 +2069,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_ENERGY] = { - .name = _("Focus Energy"), + .name = { .moveName = _("Focus Energy") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOCUS_ENERGY, .power = 0, @@ -2087,7 +2087,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIDE] = { - .name = _("Bide"), + .name = { .moveName = _("Bide") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BIDE, .power = 1, @@ -2105,7 +2105,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METRONOME] = { - .name = _("Metronome"), + .name = { .moveName = _("Metronome") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METRONOME, .power = 0, @@ -2128,7 +2128,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_MOVE] = { - .name = _("Mirror Move"), + .name = { .moveName = _("Mirror Move") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIRROR_MOVE, .power = 0, @@ -2150,7 +2150,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SELF_DESTRUCT] = { - .name = _("SelfDestruct"), + .name = { .moveName = _("SelfDestruct") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXPLOSION, .power = 200, @@ -2165,7 +2165,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EGG_BOMB] = { - .name = _("Egg Bomb"), + .name = { .moveName = _("Egg Bomb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -2180,7 +2180,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LICK] = { - .name = _("Lick"), + .name = { .moveName = _("Lick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 30 : 20, @@ -2200,7 +2200,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOG] = { - .name = _("Smog"), + .name = { .moveName = _("Smog") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 30 : 20, @@ -2219,7 +2219,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE] = { - .name = _("Sludge"), + .name = { .moveName = _("Sludge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -2238,7 +2238,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_CLUB] = { - .name = _("Bone Club"), + .name = { .moveName = _("Bone Club") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -2257,7 +2257,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_BLAST] = { - .name = _("Fire Blast"), + .name = { .moveName = _("Fire Blast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, @@ -2276,7 +2276,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATERFALL] = { - .name = _("Waterfall"), + .name = { .moveName = _("Waterfall") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -2298,7 +2298,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLAMP] = { - .name = _("Clamp"), + .name = { .moveName = _("Clamp") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 35, @@ -2317,7 +2317,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWIFT] = { - .name = _("Swift"), + .name = { .moveName = _("Swift") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -2331,7 +2331,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKULL_BASH] = { - .name = _("Skull Bash"), + .name = { .moveName = _("Skull Bash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKULL_BASH, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 100, @@ -2349,7 +2349,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKE_CANNON] = { - .name = _("Spike Cannon"), + .name = { .moveName = _("Spike Cannon") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 20, @@ -2363,7 +2363,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONSTRICT] = { - .name = _("Constrict"), + .name = { .moveName = _("Constrict") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 10, @@ -2383,7 +2383,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AMNESIA] = { - .name = _("Amnesia"), + .name = { .moveName = _("Amnesia") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_UP_2, .power = 0, @@ -2401,7 +2401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINESIS] = { - .name = _("Kinesis"), + .name = { .moveName = _("Kinesis") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, @@ -2417,7 +2417,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOFT_BOILED] = { - .name = _("Soft-Boiled"), + .name = { .moveName = _("Soft-Boiled") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOFTBOILED, .power = 0, @@ -2436,7 +2436,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_JUMP_KICK] = { - .name = _("HighJumpKick"), + .name = { .moveName = _("HighJumpKick") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 130, @@ -2458,7 +2458,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLARE] = { - .name = _("Glare"), + .name = { .moveName = _("Glare") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, @@ -2480,7 +2480,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DREAM_EATER] = { - .name = _("Dream Eater"), + .name = { .moveName = _("Dream Eater") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DREAM_EATER, .power = 100, @@ -2495,7 +2495,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_GAS] = { - .name = _("Poison Gas"), + .name = { .moveName = _("Poison Gas") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 90, @@ -2517,7 +2517,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRAGE] = { - .name = _("Barrage"), + .name = { .moveName = _("Barrage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 15, @@ -2532,7 +2532,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_LIFE] = { - .name = _("Leech Life"), + .name = { .moveName = _("Leech Life") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 80 : 20, @@ -2549,7 +2549,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOVELY_KISS] = { - .name = _("Lovely Kiss"), + .name = { .moveName = _("Lovely Kiss") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, @@ -2565,7 +2565,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_ATTACK] = { - .name = _("Sky Attack"), + .name = { .moveName = _("Sky Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, @@ -2590,7 +2590,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRANSFORM] = { - .name = _("Transform"), + .name = { .moveName = _("Transform") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRANSFORM, .power = 0, @@ -2613,7 +2613,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE] = { - .name = _("Bubble"), + .name = { .moveName = _("Bubble") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 40 : 20, @@ -2632,7 +2632,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIZZY_PUNCH] = { - .name = _("Dizzy Punch"), + .name = { .moveName = _("Dizzy Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -2653,7 +2653,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPORE] = { - .name = _("Spore"), + .name = { .moveName = _("Spore") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, @@ -2670,7 +2670,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH] = { - .name = _("Flash"), + .name = { .moveName = _("Flash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, @@ -2686,7 +2686,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYWAVE] = { - .name = _("Psywave"), + .name = { .moveName = _("Psywave") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYWAVE, .power = 1, @@ -2700,7 +2700,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLASH] = { - .name = _("Splash"), + .name = { .moveName = _("Splash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DO_NOTHING, .power = 0, @@ -2718,7 +2718,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_ARMOR] = { - .name = _("Acid Armor"), + .name = { .moveName = _("Acid Armor") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, @@ -2736,7 +2736,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRABHAMMER] = { - .name = _("Crabhammer"), + .name = { .moveName = _("Crabhammer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 90, @@ -2752,7 +2752,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPLOSION] = { - .name = _("Explosion"), + .name = { .moveName = _("Explosion") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXPLOSION, .power = 250, @@ -2767,7 +2767,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_SWIPES] = { - .name = _("Fury Swipes"), + .name = { .moveName = _("Fury Swipes") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 18, @@ -2782,7 +2782,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONEMERANG] = { - .name = _("Bonemerang"), + .name = { .moveName = _("Bonemerang") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -2797,7 +2797,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REST] = { - .name = _("Rest"), + .name = { .moveName = _("Rest") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REST, .power = 0, @@ -2816,7 +2816,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SLIDE] = { - .name = _("Rock Slide"), + .name = { .moveName = _("Rock Slide") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -2835,7 +2835,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_FANG] = { - .name = _("Hyper Fang"), + .name = { .moveName = _("Hyper Fang") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -2856,7 +2856,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHARPEN] = { - .name = _("Sharpen"), + .name = { .moveName = _("Sharpen") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_UP, .power = 0, @@ -2874,7 +2874,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION] = { - .name = _("Conversin"), + .name = { .moveName = _("Conversin") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONVERSION, .power = 0, @@ -2892,7 +2892,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRI_ATTACK] = { - .name = _("Tri Attack"), + .name = { .moveName = _("Tri Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -2911,7 +2911,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPER_FANG] = { - .name = _("Super Fang"), + .name = { .moveName = _("Super Fang") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, @@ -2927,7 +2927,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLASH] = { - .name = _("Slash"), + .name = { .moveName = _("Slash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -2944,7 +2944,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBSTITUTE] = { - .name = _("Substitute"), + .name = { .moveName = _("Substitute") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUBSTITUTE, .power = 0, @@ -2963,7 +2963,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE] = { - .name = _("Struggle"), + .name = { .moveName = _("Struggle") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_RECOIL_HP_25, @@ -2998,7 +2998,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKETCH] = { - .name = _("Sketch"), + .name = { .moveName = _("Sketch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKETCH, .power = 0, @@ -3024,7 +3024,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_KICK] = { - .name = _("Triple Kick"), + .name = { .moveName = _("Triple Kick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRIPLE_KICK, .power = 10, @@ -3040,7 +3040,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THIEF] = { - .name = _("Thief"), + .name = { .moveName = _("Thief") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, @@ -3063,7 +3063,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIDER_WEB] = { - .name = _("Spider Web"), + .name = { .moveName = _("Spider Web") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MEAN_LOOK, .power = 0, @@ -3080,7 +3080,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_READER] = { - .name = _("Mind Reader"), + .name = { .moveName = _("Mind Reader") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LOCK_ON, .power = 0, @@ -3095,7 +3095,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHTMARE] = { - .name = _("Nightmare"), + .name = { .moveName = _("Nightmare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NIGHTMARE, .power = 0, @@ -3111,7 +3111,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_WHEEL] = { - .name = _("Flame Wheel"), + .name = { .moveName = _("Flame Wheel") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -3132,7 +3132,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNORE] = { - .name = _("Snore"), + .name = { .moveName = _("Snore") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SNORE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 40, @@ -3154,7 +3154,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CURSE] = { - .name = _("Curse"), + .name = { .moveName = _("Curse") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CURSE, .power = 0, @@ -3172,7 +3172,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAIL] = { - .name = _("Flail"), + .name = { .moveName = _("Flail") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLAIL, .power = 1, @@ -3187,7 +3187,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION_2] = { - .name = _("Conversion 2"), + .name = { .moveName = _("Conversion 2") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONVERSION_2, .power = 0, @@ -3205,7 +3205,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AEROBLAST] = { - .name = _("Aeroblast"), + .name = { .moveName = _("Aeroblast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -3221,7 +3221,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_SPORE] = { - .name = _("Cotton Spore"), + .name = { .moveName = _("Cotton Spore") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_2, .power = 0, @@ -3238,7 +3238,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVERSAL] = { - .name = _("Reversal"), + .name = { .moveName = _("Reversal") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLAIL, .power = 1, @@ -3253,7 +3253,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPITE] = { - .name = _("Spite"), + .name = { .moveName = _("Spite") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPITE, .power = 0, @@ -3270,7 +3270,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER_SNOW] = { - .name = _("Powder Snow"), + .name = { .moveName = _("Powder Snow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -3289,7 +3289,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PROTECT] = { - .name = _("Protect"), + .name = { .moveName = _("Protect") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -3308,7 +3308,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MACH_PUNCH] = { - .name = _("Mach Punch"), + .name = { .moveName = _("Mach Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -3324,7 +3324,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCARY_FACE] = { - .name = _("Scary Face"), + .name = { .moveName = _("Scary Face") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_DOWN_2, .power = 0, @@ -3340,7 +3340,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT_ATTACK] = { - .name = _("Feint Attack"), + .name = { .moveName = _("Feint Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -3355,7 +3355,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_KISS] = { - .name = _("Sweet Kiss"), + .name = { .moveName = _("Sweet Kiss") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CONFUSE, .power = 0, @@ -3371,7 +3371,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELLY_DRUM] = { - .name = _("Belly Drum"), + .name = { .moveName = _("Belly Drum") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BELLY_DRUM, .power = 0, @@ -3389,7 +3389,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_BOMB] = { - .name = _("Sludge Bomb"), + .name = { .moveName = _("Sludge Bomb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -3409,7 +3409,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SLAP] = { - .name = _("Mud-Slap"), + .name = { .moveName = _("Mud-Slap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 20, @@ -3428,7 +3428,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTAZOOKA] = { - .name = _("Octazooka"), + .name = { .moveName = _("Octazooka") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -3448,7 +3448,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKES] = { - .name = _("Spikes"), + .name = { .moveName = _("Spikes") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPIKES, .power = 0, @@ -3468,7 +3468,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZAP_CANNON] = { - .name = _("Zap Cannon"), + .name = { .moveName = _("Zap Cannon") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 120 : 100, @@ -3488,7 +3488,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESIGHT] = { - .name = _("Foresight"), + .name = { .moveName = _("Foresight") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FORESIGHT, .power = 0, @@ -3505,7 +3505,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DESTINY_BOND] = { - .name = _("Destiny Bond"), + .name = { .moveName = _("Destiny Bond") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DESTINY_BOND, .power = 0, @@ -3526,7 +3526,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PERISH_SONG] = { - .name = _("Perish Song"), + .name = { .moveName = _("Perish Song") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PERISH_SONG, .power = 0, @@ -3545,7 +3545,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICY_WIND] = { - .name = _("Icy Wind"), + .name = { .moveName = _("Icy Wind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 55, @@ -3565,7 +3565,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DETECT] = { - .name = _("Detect"), + .name = { .moveName = _("Detect") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -3586,7 +3586,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_RUSH] = { - .name = _("Bone Rush"), + .name = { .moveName = _("Bone Rush") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 25, @@ -3600,7 +3600,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOCK_ON] = { - .name = _("Lock-On"), + .name = { .moveName = _("Lock-On") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LOCK_ON, .power = 0, @@ -3615,7 +3615,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OUTRAGE] = { - .name = _("Outrage"), + .name = { .moveName = _("Outrage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 120 : 90, @@ -3635,7 +3635,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSTORM] = { - .name = _("Sandstorm"), + .name = { .moveName = _("Sandstorm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SANDSTORM, .power = 0, @@ -3653,7 +3653,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_DRAIN] = { - .name = _("Giga Drain"), + .name = { .moveName = _("Giga Drain") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, @@ -3669,7 +3669,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDURE] = { - .name = _("Endure"), + .name = { .moveName = _("Endure") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ENDURE, .power = 0, @@ -3690,7 +3690,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARM] = { - .name = _("Charm"), + .name = { .moveName = _("Charm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_2, .power = 0, @@ -3706,7 +3706,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLOUT] = { - .name = _("Rollout"), + .name = { .moveName = _("Rollout") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROLLOUT, .power = 30, @@ -3723,7 +3723,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SWIPE] = { - .name = _("False Swipe"), + .name = { .moveName = _("False Swipe") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FALSE_SWIPE, .power = 40, @@ -3738,7 +3738,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWAGGER] = { - .name = _("Swagger"), + .name = { .moveName = _("Swagger") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SWAGGER, .power = 0, @@ -3754,7 +3754,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MILK_DRINK] = { - .name = _("Milk Drink"), + .name = { .moveName = _("Milk Drink") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOFTBOILED, .power = 0, @@ -3773,7 +3773,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARK] = { - .name = _("Spark"), + .name = { .moveName = _("Spark") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -3793,7 +3793,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_CUTTER] = { - .name = _("Fury Cutter"), + .name = { .moveName = _("Fury Cutter") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 40, @@ -3815,7 +3815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_WING] = { - .name = _("Steel Wing"), + .name = { .moveName = _("Steel Wing") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -3836,7 +3836,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEAN_LOOK] = { - .name = _("Mean Look"), + .name = { .moveName = _("Mean Look") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MEAN_LOOK, .power = 0, @@ -3853,7 +3853,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTRACT] = { - .name = _("Attract"), + .name = { .moveName = _("Attract") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTRACT, .power = 0, @@ -3870,7 +3870,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_TALK] = { - .name = _("Sleep Talk"), + .name = { .moveName = _("Sleep Talk") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP_TALK, .power = 0, @@ -3894,7 +3894,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BELL] = { - .name = _("Heal Bell"), + .name = { .moveName = _("Heal Bell") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_BELL, .power = 0, @@ -3914,7 +3914,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETURN] = { - .name = _("Return"), + .name = { .moveName = _("Return") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RETURN, .power = 1, @@ -3929,7 +3929,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRESENT] = { - .name = _("Present"), + .name = { .moveName = _("Present") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PRESENT, .power = 1, @@ -3944,7 +3944,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRUSTRATION] = { - .name = _("Frustration"), + .name = { .moveName = _("Frustration") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FRUSTRATION, .power = 1, @@ -3959,7 +3959,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAFEGUARD] = { - .name = _("Safeguard"), + .name = { .moveName = _("Safeguard") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SAFEGUARD, .power = 0, @@ -3977,7 +3977,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAIN_SPLIT] = { - .name = _("Pain Split"), + .name = { .moveName = _("Pain Split") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PAIN_SPLIT, .power = 0, @@ -3992,7 +3992,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_FIRE] = { - .name = _("Sacred Fire"), + .name = { .moveName = _("Sacred Fire") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -4012,7 +4012,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNITUDE] = { - .name = _("Magnitude"), + .name = { .moveName = _("Magnitude") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGNITUDE, .power = 1, @@ -4028,7 +4028,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMIC_PUNCH] = { - .name = _("DynamicPunch"), + .name = { .moveName = _("DynamicPunch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -4049,7 +4049,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGAHORN] = { - .name = _("Megahorn"), + .name = { .moveName = _("Megahorn") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -4064,7 +4064,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_BREATH] = { - .name = _("DragonBreath"), + .name = { .moveName = _("DragonBreath") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -4084,7 +4084,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BATON_PASS] = { - .name = _("Baton Pass"), + .name = { .moveName = _("Baton Pass") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BATON_PASS, .power = 0, @@ -4101,7 +4101,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENCORE] = { - .name = _("Encore"), + .name = { .moveName = _("Encore") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ENCORE, .power = 0, @@ -4119,7 +4119,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURSUIT] = { - .name = _("Pursuit"), + .name = { .moveName = _("Pursuit") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PURSUIT, .power = 40, @@ -4135,7 +4135,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAPID_SPIN] = { - .name = _("Rapid Spin"), + .name = { .moveName = _("Rapid Spin") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 50 : 20, @@ -4162,7 +4162,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_SCENT] = { - .name = _("Sweet Scent"), + .name = { .moveName = _("Sweet Scent") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_EVASION_DOWN_2 : EFFECT_EVASION_DOWN, .power = 0, @@ -4178,7 +4178,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_TAIL] = { - .name = _("Iron Tail"), + .name = { .moveName = _("Iron Tail") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -4198,7 +4198,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_CLAW] = { - .name = _("Metal Claw"), + .name = { .moveName = _("Metal Claw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -4219,7 +4219,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VITAL_THROW] = { - .name = _("Vital Throw"), + .name = { .moveName = _("Vital Throw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -4234,7 +4234,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORNING_SUN] = { - .name = _("Morning Sun"), + .name = { .moveName = _("Morning Sun") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MORNING_SUN, .power = 0, @@ -4253,7 +4253,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNTHESIS] = { - .name = _("Synthesis"), + .name = { .moveName = _("Synthesis") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SYNTHESIS, .power = 0, @@ -4272,7 +4272,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONLIGHT] = { - .name = _("Moonlight"), + .name = { .moveName = _("Moonlight") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MOONLIGHT, .power = 0, @@ -4291,7 +4291,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIDDEN_POWER] = { - .name = _("Hidden Power"), + .name = { .moveName = _("Hidden Power") }, .description = COMPOUND_STRING("Dummy2 description."), .power = B_HIDDEN_POWER_DMG >= GEN_6 ? 60 : 1, .effect = EFFECT_HIDDEN_POWER, @@ -4305,7 +4305,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_CHOP] = { - .name = _("Cross Chop"), + .name = { .moveName = _("Cross Chop") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -4321,7 +4321,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWISTER] = { - .name = _("Twister"), + .name = { .moveName = _("Twister") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -4342,7 +4342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAIN_DANCE] = { - .name = _("Rain Dance"), + .name = { .moveName = _("Rain Dance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAIN_DANCE, .power = 0, @@ -4359,7 +4359,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNNY_DAY] = { - .name = _("Sunny Day"), + .name = { .moveName = _("Sunny Day") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUNNY_DAY, .power = 0, @@ -4376,7 +4376,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUNCH] = { - .name = _("Crunch"), + .name = { .moveName = _("Crunch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -4401,7 +4401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_COAT] = { - .name = _("Mirror Coat"), + .name = { .moveName = _("Mirror Coat") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIRROR_COAT, .power = 1, @@ -4419,7 +4419,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCH_UP] = { - .name = _("Psych Up"), + .name = { .moveName = _("Psych Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYCH_UP, .power = 0, @@ -4438,7 +4438,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_SPEED] = { - .name = _("ExtremeSpeed"), + .name = { .moveName = _("ExtremeSpeed") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -4453,7 +4453,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCIENT_POWER] = { - .name = _("AncientPower"), + .name = { .moveName = _("AncientPower") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -4474,7 +4474,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BALL] = { - .name = _("Shadow Ball"), + .name = { .moveName = _("Shadow Ball") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -4494,7 +4494,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUTURE_SIGHT] = { - .name = _("Future Sight"), + .name = { .moveName = _("Future Sight") }, .description = COMPOUND_STRING("Dummy2 description."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, @@ -4516,7 +4516,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SMASH] = { - .name = _("Rock Smash"), + .name = { .moveName = _("Rock Smash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 40 : 20, @@ -4536,7 +4536,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLPOOL] = { - .name = _("Whirlpool"), + .name = { .moveName = _("Whirlpool") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, @@ -4554,7 +4554,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAT_UP] = { - .name = _("Beat Up"), + .name = { .moveName = _("Beat Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BEAT_UP, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 1 : 10, @@ -4568,7 +4568,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_OUT] = { - .name = _("Fake Out"), + .name = { .moveName = _("Fake Out") }, .description = COMPOUND_STRING("Dummy2 description."), .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 3 : 1, .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, @@ -4588,7 +4588,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPROAR] = { - .name = _("Uproar"), + .name = { .moveName = _("Uproar") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_UPROAR, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 90 : 50, @@ -4610,7 +4610,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOCKPILE] = { - .name = _("Stockpile"), + .name = { .moveName = _("Stockpile") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STOCKPILE, .power = 0, @@ -4628,7 +4628,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIT_UP] = { - .name = _("Spit Up"), + .name = { .moveName = _("Spit Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPIT_UP, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 1 : 100, @@ -4643,7 +4643,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWALLOW] = { - .name = _("Swallow"), + .name = { .moveName = _("Swallow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SWALLOW, .power = 0, @@ -4662,7 +4662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_WAVE] = { - .name = _("Heat Wave"), + .name = { .moveName = _("Heat Wave") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 95 : 100, @@ -4682,7 +4682,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAIL] = { - .name = _("Hail"), + .name = { .moveName = _("Hail") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HAIL, .power = 0, @@ -4699,7 +4699,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORMENT] = { - .name = _("Torment"), + .name = { .moveName = _("Torment") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TORMENT, .power = 0, @@ -4715,7 +4715,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLATTER] = { - .name = _("Flatter"), + .name = { .moveName = _("Flatter") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLATTER, .power = 0, @@ -4731,7 +4731,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILL_O_WISP] = { - .name = _("Will-o-Wisp"), + .name = { .moveName = _("Will-o-Wisp") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WILL_O_WISP, .power = 0, @@ -4747,7 +4747,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEMENTO] = { - .name = _("Memento"), + .name = { .moveName = _("Memento") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MEMENTO, .power = 0, @@ -4762,7 +4762,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FACADE] = { - .name = _("Facade"), + .name = { .moveName = _("Facade") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FACADE, .power = 70, @@ -4777,7 +4777,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_PUNCH] = { - .name = _("Focus Punch"), + .name = { .moveName = _("Focus Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOCUS_PUNCH, .power = 150, @@ -4800,7 +4800,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMELLING_SALTS] = { - .name = _("SmellngSalts"), + .name = { .moveName = _("SmellngSalts") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 70 : 60, @@ -4819,7 +4819,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOLLOW_ME] = { - .name = _("Follow Me"), + .name = { .moveName = _("Follow Me") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOLLOW_ME, .power = 0, @@ -4839,7 +4839,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURE_POWER] = { - .name = _("Nature Power"), + .name = { .moveName = _("Nature Power") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NATURE_POWER, .power = 1, @@ -4860,7 +4860,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE] = { - .name = _("Charge"), + .name = { .moveName = _("Charge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CHARGE, .power = 0, @@ -4878,7 +4878,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAUNT] = { - .name = _("Taunt"), + .name = { .moveName = _("Taunt") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TAUNT, .power = 0, @@ -4895,7 +4895,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HELPING_HAND] = { - .name = _("Helping Hand"), + .name = { .moveName = _("Helping Hand") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HELPING_HAND, .power = 0, @@ -4916,7 +4916,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK] = { - .name = _("Trick"), + .name = { .moveName = _("Trick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRICK, .power = 0, @@ -4934,7 +4934,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLE_PLAY] = { - .name = _("Role Play"), + .name = { .moveName = _("Role Play") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROLE_PLAY, .power = 0, @@ -4952,7 +4952,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WISH] = { - .name = _("Wish"), + .name = { .moveName = _("Wish") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WISH, .power = 0, @@ -4971,7 +4971,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSIST] = { - .name = _("Assist"), + .name = { .moveName = _("Assist") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ASSIST, .power = 0, @@ -4994,7 +4994,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INGRAIN] = { - .name = _("Ingrain"), + .name = { .moveName = _("Ingrain") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_INGRAIN, .power = 0, @@ -5013,7 +5013,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERPOWER] = { - .name = _("Superpower"), + .name = { .moveName = _("Superpower") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -5032,7 +5032,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_COAT] = { - .name = _("Magic Coat"), + .name = { .moveName = _("Magic Coat") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGIC_COAT, .power = 0, @@ -5049,7 +5049,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECYCLE] = { - .name = _("Recycle"), + .name = { .moveName = _("Recycle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECYCLE, .power = 0, @@ -5067,7 +5067,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVENGE] = { - .name = _("Revenge"), + .name = { .moveName = _("Revenge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REVENGE, .power = 60, @@ -5082,7 +5082,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRICK_BREAK] = { - .name = _("Brick Break"), + .name = { .moveName = _("Brick Break") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BRICK_BREAK, .power = 75, @@ -5097,7 +5097,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_YAWN] = { - .name = _("Yawn"), + .name = { .moveName = _("Yawn") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_YAWN, .power = 0, @@ -5113,7 +5113,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KNOCK_OFF] = { - .name = _("Knock Off"), + .name = { .moveName = _("Knock Off") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_KNOCK_OFF, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 20, @@ -5131,7 +5131,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDEAVOR] = { - .name = _("Endeavor"), + .name = { .moveName = _("Endeavor") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ENDEAVOR, .power = 1, @@ -5147,7 +5147,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ERUPTION] = { - .name = _("Eruption"), + .name = { .moveName = _("Eruption") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ERUPTION, .power = 150, @@ -5161,7 +5161,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKILL_SWAP] = { - .name = _("Skill Swap"), + .name = { .moveName = _("Skill Swap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKILL_SWAP, .power = 0, @@ -5177,7 +5177,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IMPRISON] = { - .name = _("Imprison"), + .name = { .moveName = _("Imprison") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_IMPRISON, .power = 0, @@ -5197,7 +5197,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFRESH] = { - .name = _("Refresh"), + .name = { .moveName = _("Refresh") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REFRESH, .power = 0, @@ -5215,7 +5215,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRUDGE] = { - .name = _("Grudge"), + .name = { .moveName = _("Grudge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRUDGE, .power = 0, @@ -5233,7 +5233,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNATCH] = { - .name = _("Snatch"), + .name = { .moveName = _("Snatch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SNATCH, .power = 0, @@ -5253,7 +5253,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_POWER] = { - .name = _("Secret Power"), + .name = { .moveName = _("Secret Power") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -5272,7 +5272,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIVE] = { - .name = _("Dive"), + .name = { .moveName = _("Dive") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 80 : 60, @@ -5292,7 +5292,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARM_THRUST] = { - .name = _("Arm Thrust"), + .name = { .moveName = _("Arm Thrust") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 15, @@ -5307,7 +5307,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAMOUFLAGE] = { - .name = _("Camouflage"), + .name = { .moveName = _("Camouflage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CAMOUFLAGE, .power = 0, @@ -5325,7 +5325,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_GLOW] = { - .name = _("Tail Glow"), + .name = { .moveName = _("Tail Glow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = B_UPDATED_MOVE_DATA >= GEN_5 ? EFFECT_SPECIAL_ATTACK_UP_3 : EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, @@ -5343,7 +5343,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUSTER_PURGE] = { - .name = _("Luster Purge"), + .name = { .moveName = _("Luster Purge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, @@ -5362,7 +5362,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST_BALL] = { - .name = _("Mist Ball"), + .name = { .moveName = _("Mist Ball") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, @@ -5382,7 +5382,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEATHER_DANCE] = { - .name = _("FeatherDance"), + .name = { .moveName = _("FeatherDance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN_2, .power = 0, @@ -5399,7 +5399,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEETER_DANCE] = { - .name = _("Teeter Dance"), + .name = { .moveName = _("Teeter Dance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TEETER_DANCE, .power = 0, @@ -5416,7 +5416,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZE_KICK] = { - .name = _("Blaze Kick"), + .name = { .moveName = _("Blaze Kick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 85, @@ -5437,7 +5437,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SPORT] = { - .name = _("Mud Sport"), + .name = { .moveName = _("Mud Sport") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MUD_SPORT, .power = 0, @@ -5455,7 +5455,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BALL] = { - .name = _("Ice Ball"), + .name = { .moveName = _("Ice Ball") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROLLOUT, .power = 30, @@ -5473,7 +5473,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NEEDLE_ARM] = { - .name = _("Needle Arm"), + .name = { .moveName = _("Needle Arm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -5494,7 +5494,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLACK_OFF] = { - .name = _("Slack Off"), + .name = { .moveName = _("Slack Off") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RESTORE_HP, .power = 0, @@ -5513,7 +5513,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_VOICE] = { - .name = _("Hyper Voice"), + .name = { .moveName = _("Hyper Voice") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -5529,7 +5529,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_FANG] = { - .name = _("Poison Fang"), + .name = { .moveName = _("Poison Fang") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -5550,7 +5550,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_CLAW] = { - .name = _("Crush Claw"), + .name = { .moveName = _("Crush Claw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -5570,7 +5570,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAST_BURN] = { - .name = _("Blast Burn"), + .name = { .moveName = _("Blast Burn") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 150, @@ -5588,7 +5588,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_CANNON] = { - .name = _("Hydro Cannon"), + .name = { .moveName = _("Hydro Cannon") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 150, @@ -5606,7 +5606,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_MASH] = { - .name = _("Meteor Mash"), + .name = { .moveName = _("Meteor Mash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 100, @@ -5628,7 +5628,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTONISH] = { - .name = _("Astonish"), + .name = { .moveName = _("Astonish") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 30, @@ -5649,7 +5649,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WEATHER_BALL] = { - .name = _("Weather Ball"), + .name = { .moveName = _("Weather Ball") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WEATHER_BALL, .power = 50, @@ -5664,7 +5664,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATHERAPY] = { - .name = _("Aromatherapy"), + .name = { .moveName = _("Aromatherapy") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_BELL, .power = 0, @@ -5682,7 +5682,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_TEARS] = { - .name = _("Fake Tears"), + .name = { .moveName = _("Fake Tears") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, @@ -5698,7 +5698,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_CUTTER] = { - .name = _("Air Cutter"), + .name = { .moveName = _("Air Cutter") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 55, @@ -5715,7 +5715,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERHEAT] = { - .name = _("Overheat"), + .name = { .moveName = _("Overheat") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, @@ -5734,7 +5734,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ODOR_SLEUTH] = { - .name = _("Odor Sleuth"), + .name = { .moveName = _("Odor Sleuth") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FORESIGHT, .power = 0, @@ -5751,7 +5751,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_TOMB] = { - .name = _("Rock Tomb"), + .name = { .moveName = _("Rock Tomb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 50, @@ -5770,7 +5770,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILVER_WIND] = { - .name = _("Silver Wind"), + .name = { .moveName = _("Silver Wind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -5791,7 +5791,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_SOUND] = { - .name = _("Metal Sound"), + .name = { .moveName = _("Metal Sound") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, @@ -5809,7 +5809,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_WHISTLE] = { - .name = _("GrassWhistle"), + .name = { .moveName = _("GrassWhistle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SLEEP, .power = 0, @@ -5827,7 +5827,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TICKLE] = { - .name = _("Tickle"), + .name = { .moveName = _("Tickle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TICKLE, .power = 0, @@ -5843,7 +5843,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COSMIC_POWER] = { - .name = _("Cosmic Power"), + .name = { .moveName = _("Cosmic Power") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COSMIC_POWER, .power = 0, @@ -5861,7 +5861,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPOUT] = { - .name = _("Water Spout"), + .name = { .moveName = _("Water Spout") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ERUPTION, .power = 150, @@ -5875,7 +5875,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIGNAL_BEAM] = { - .name = _("Signal Beam"), + .name = { .moveName = _("Signal Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -5894,7 +5894,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_PUNCH] = { - .name = _("hadow Punch"), + .name = { .moveName = _("hadow Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -5910,7 +5910,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTRASENSORY] = { - .name = _("Extrasensory"), + .name = { .moveName = _("Extrasensory") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -5930,7 +5930,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_UPPERCUT] = { - .name = _("Sky Uppercut"), + .name = { .moveName = _("Sky Uppercut") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKY_UPPERCUT, .power = 85, @@ -5947,7 +5947,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_TOMB] = { - .name = _("Sand Tomb"), + .name = { .moveName = _("Sand Tomb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, @@ -5964,7 +5964,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHEER_COLD] = { - .name = _("Sheer Cold"), + .name = { .moveName = _("Sheer Cold") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OHKO, .power = 1, @@ -5978,7 +5978,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUDDY_WATER] = { - .name = _("Muddy Water"), + .name = { .moveName = _("Muddy Water") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, @@ -5998,7 +5998,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_SEED] = { - .name = _("Bullet Seed"), + .name = { .moveName = _("Bullet Seed") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 25 : 10, @@ -6013,7 +6013,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AERIAL_ACE] = { - .name = _("Aerial Ace"), + .name = { .moveName = _("Aerial Ace") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -6029,7 +6029,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_SPEAR] = { - .name = _("Icicle Spear"), + .name = { .moveName = _("Icicle Spear") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 25 : 10, @@ -6043,7 +6043,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_DEFENSE] = { - .name = _("Iron Defense"), + .name = { .moveName = _("Iron Defense") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, @@ -6061,7 +6061,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOCK] = { - .name = _("Block"), + .name = { .moveName = _("Block") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MEAN_LOOK, .power = 0, @@ -6078,7 +6078,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOWL] = { - .name = _("Howl"), + .name = { .moveName = _("Howl") }, .description = COMPOUND_STRING("Dummy2 description."), .power = 0, .effect = B_UPDATED_MOVE_DATA >= GEN_8 ? EFFECT_ATTACK_UP_USER_ALLY : EFFECT_ATTACK_UP, @@ -6097,7 +6097,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CLAW] = { - .name = _("Dragon Claw"), + .name = { .moveName = _("Dragon Claw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -6112,7 +6112,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRENZY_PLANT] = { - .name = _("Frenzy Plant"), + .name = { .moveName = _("Frenzy Plant") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 150, @@ -6131,7 +6131,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULK_UP] = { - .name = _("Bulk Up"), + .name = { .moveName = _("Bulk Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BULK_UP, .power = 0, @@ -6149,7 +6149,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCE] = { - .name = _("Bounce"), + .name = { .moveName = _("Bounce") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 85, @@ -6174,7 +6174,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SHOT] = { - .name = _("Mud Shot"), + .name = { .moveName = _("Mud Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 55, @@ -6193,7 +6193,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_TAIL] = { - .name = _("Poison Tail"), + .name = { .moveName = _("Poison Tail") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -6214,7 +6214,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COVET] = { - .name = _("Covet"), + .name = { .moveName = _("Covet") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 60 : 40, @@ -6236,7 +6236,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_TACKLE] = { - .name = _("Volt Tackle"), + .name = { .moveName = _("Volt Tackle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -6259,7 +6259,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_LEAF] = { - .name = _("Magical Leaf"), + .name = { .moveName = _("Magical Leaf") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -6273,7 +6273,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPORT] = { - .name = _("Water Sport"), + .name = { .moveName = _("Water Sport") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WATER_SPORT, .power = 0, @@ -6291,7 +6291,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CALM_MIND] = { - .name = _("Calm Mind"), + .name = { .moveName = _("Calm Mind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CALM_MIND, .power = 0, @@ -6309,7 +6309,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_BLADE] = { - .name = _("Leaf Blade"), + .name = { .moveName = _("Leaf Blade") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 90 : 70, @@ -6326,7 +6326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DANCE] = { - .name = _("Dragon Dance"), + .name = { .moveName = _("Dragon Dance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DRAGON_DANCE, .power = 0, @@ -6345,7 +6345,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_BLAST] = { - .name = _("Rock Blast"), + .name = { .moveName = _("Rock Blast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 25, @@ -6360,7 +6360,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHOCK_WAVE] = { - .name = _("Shock Wave"), + .name = { .moveName = _("Shock Wave") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -6374,7 +6374,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PULSE] = { - .name = _("Water Pulse"), + .name = { .moveName = _("Water Pulse") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -6394,7 +6394,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOOM_DESIRE] = { - .name = _("Doom Desire"), + .name = { .moveName = _("Doom Desire") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FUTURE_SIGHT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 120, @@ -6410,7 +6410,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_BOOST] = { - .name = _("Psycho Boost"), + .name = { .moveName = _("Psycho Boost") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 140, @@ -6428,7 +6428,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROOST] = { - .name = _("Roost"), + .name = { .moveName = _("Roost") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROOST, .power = 0, @@ -6447,7 +6447,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAVITY] = { - .name = _("Gravity"), + .name = { .moveName = _("Gravity") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRAVITY, .power = 0, @@ -6465,7 +6465,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRACLE_EYE] = { - .name = _("Miracle Eye"), + .name = { .moveName = _("Miracle Eye") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIRACLE_EYE, .power = 0, @@ -6482,7 +6482,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAKE_UP_SLAP] = { - .name = _("Wake-Up Slap"), + .name = { .moveName = _("Wake-Up Slap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 70 : 60, @@ -6501,7 +6501,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAMMER_ARM] = { - .name = _("Hammer Arm"), + .name = { .moveName = _("Hammer Arm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -6521,7 +6521,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GYRO_BALL] = { - .name = _("Gyro Ball"), + .name = { .moveName = _("Gyro Ball") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GYRO_BALL, .power = 1, @@ -6537,7 +6537,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEALING_WISH] = { - .name = _("Healing Wish"), + .name = { .moveName = _("Healing Wish") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEALING_WISH, .power = 0, @@ -6555,7 +6555,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRINE] = { - .name = _("Brine"), + .name = { .moveName = _("Brine") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BRINE, .power = 65, @@ -6569,7 +6569,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURAL_GIFT] = { - .name = _("Natural Gift"), + .name = { .moveName = _("Natural Gift") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NATURAL_GIFT, .power = 1, @@ -6583,7 +6583,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT] = { - .name = _("Feint"), + .name = { .moveName = _("Feint") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 30 : 50, @@ -6605,7 +6605,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLUCK] = { - .name = _("Pluck"), + .name = { .moveName = _("Pluck") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -6623,7 +6623,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAILWIND] = { - .name = _("Tailwind"), + .name = { .moveName = _("Tailwind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TAILWIND, .power = 0, @@ -6642,7 +6642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACUPRESSURE] = { - .name = _("Acupressure"), + .name = { .moveName = _("Acupressure") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACUPRESSURE, .power = 0, @@ -6660,7 +6660,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_BURST] = { - .name = _("Metal Burst"), + .name = { .moveName = _("Metal Burst") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METAL_BURST, .power = 1, @@ -6675,7 +6675,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_U_TURN] = { - .name = _("U-turn"), + .name = { .moveName = _("U-turn") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ESCAPE, .power = 70, @@ -6690,7 +6690,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLOSE_COMBAT] = { - .name = _("Close Combat"), + .name = { .moveName = _("Close Combat") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -6709,7 +6709,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAYBACK] = { - .name = _("Payback"), + .name = { .moveName = _("Payback") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PAYBACK, .power = 50, @@ -6724,7 +6724,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSURANCE] = { - .name = _("Asurance"), + .name = { .moveName = _("Asurance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ASSURANCE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 50, @@ -6739,7 +6739,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBARGO] = { - .name = _("Embargo"), + .name = { .moveName = _("Embargo") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EMBARGO, .power = 0, @@ -6755,7 +6755,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLING] = { - .name = _("Fling"), + .name = { .moveName = _("Fling") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLING, .power = 1, @@ -6770,7 +6770,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_SHIFT] = { - .name = _("Psycho Shift"), + .name = { .moveName = _("Psycho Shift") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYCHO_SHIFT, .power = 0, @@ -6785,7 +6785,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRUMP_CARD] = { - .name = _("Trump Card"), + .name = { .moveName = _("Trump Card") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRUMP_CARD, .power = 1, @@ -6800,7 +6800,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BLOCK] = { - .name = _("Heal Block"), + .name = { .moveName = _("Heal Block") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_BLOCK, .power = 0, @@ -6816,7 +6816,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRING_OUT] = { - .name = _("Wring Out"), + .name = { .moveName = _("Wring Out") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WRING_OUT, .power = 1, @@ -6831,7 +6831,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRICK] = { - .name = _("Power Trick"), + .name = { .moveName = _("Power Trick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWER_TRICK, .power = 0, @@ -6849,7 +6849,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GASTRO_ACID] = { - .name = _("Gastro Acid"), + .name = { .moveName = _("Gastro Acid") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GASTRO_ACID, .power = 0, @@ -6865,7 +6865,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUCKY_CHANT] = { - .name = _("Lucky Chant"), + .name = { .moveName = _("Lucky Chant") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LUCKY_CHANT, .power = 0, @@ -6883,7 +6883,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ME_FIRST] = { - .name = _("Me First"), + .name = { .moveName = _("Me First") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ME_FIRST, .power = 0, @@ -6908,7 +6908,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COPYCAT] = { - .name = _("Copycat"), + .name = { .moveName = _("Copycat") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COPYCAT, .power = 0, @@ -6932,7 +6932,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SWAP] = { - .name = _("Power Swap"), + .name = { .moveName = _("Power Swap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWER_SWAP, .power = 0, @@ -6948,7 +6948,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SWAP] = { - .name = _("Guard Swap"), + .name = { .moveName = _("Guard Swap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GUARD_SWAP, .power = 0, @@ -6964,7 +6964,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PUNISHMENT] = { - .name = _("Punishment"), + .name = { .moveName = _("Punishment") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PUNISHMENT, .power = 60, @@ -6979,7 +6979,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESORT] = { - .name = _("Last Resort"), + .name = { .moveName = _("Last Resort") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LAST_RESORT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 130, @@ -6994,7 +6994,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORRY_SEED] = { - .name = _("Worry Seed"), + .name = { .moveName = _("Worry Seed") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WORRY_SEED, .power = 0, @@ -7010,7 +7010,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUCKER_PUNCH] = { - .name = _("Sucker Punch"), + .name = { .moveName = _("Sucker Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUCKER_PUNCH, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 70 : 80, @@ -7025,7 +7025,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_SPIKES] = { - .name = _("Toxic Spikes"), + .name = { .moveName = _("Toxic Spikes") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TOXIC_SPIKES, .power = 0, @@ -7045,7 +7045,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_SWAP] = { - .name = _("Heart Swap"), + .name = { .moveName = _("Heart Swap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEART_SWAP, .power = 0, @@ -7061,7 +7061,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_RING] = { - .name = _("Aqua Ring"), + .name = { .moveName = _("Aqua Ring") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AQUA_RING, .power = 0, @@ -7079,7 +7079,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_RISE] = { - .name = _("Magnet Rise"), + .name = { .moveName = _("Magnet Rise") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGNET_RISE, .power = 0, @@ -7098,7 +7098,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLARE_BLITZ] = { - .name = _("Flare Blitz"), + .name = { .moveName = _("Flare Blitz") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -7121,7 +7121,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORCE_PALM] = { - .name = _("Force Palm"), + .name = { .moveName = _("Force Palm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -7141,7 +7141,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_SPHERE] = { - .name = _("Aura Sphere"), + .name = { .moveName = _("Aura Sphere") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 90, @@ -7157,7 +7157,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_POLISH] = { - .name = _("Rock Polish"), + .name = { .moveName = _("Rock Polish") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_UP_2, .power = 0, @@ -7175,7 +7175,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_JAB] = { - .name = _("Poison Jab"), + .name = { .moveName = _("Poison Jab") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -7195,7 +7195,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_PULSE] = { - .name = _("Dark Pulse"), + .name = { .moveName = _("Dark Pulse") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -7215,7 +7215,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SLASH] = { - .name = _("Night Slash"), + .name = { .moveName = _("Night Slash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -7232,7 +7232,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_TAIL] = { - .name = _("Aqua Tail"), + .name = { .moveName = _("Aqua Tail") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -7247,7 +7247,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_BOMB] = { - .name = _("Seed Bomb"), + .name = { .moveName = _("Seed Bomb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -7262,7 +7262,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_SLASH] = { - .name = _("Air Slash"), + .name = { .moveName = _("Air Slash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -7282,7 +7282,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_X_SCISSOR] = { - .name = _("X-Scissor"), + .name = { .moveName = _("X-Scissor") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -7298,7 +7298,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BUZZ] = { - .name = _("Bug Buzz"), + .name = { .moveName = _("Bug Buzz") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -7319,7 +7319,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_PULSE] = { - .name = _("Dragon Pulse"), + .name = { .moveName = _("Dragon Pulse") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 85 : 90, @@ -7334,7 +7334,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RUSH] = { - .name = _("Dragon Rush"), + .name = { .moveName = _("Dragon Rush") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -7355,7 +7355,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_GEM] = { - .name = _("Power Gem"), + .name = { .moveName = _("Power Gem") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 70, @@ -7369,7 +7369,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAIN_PUNCH] = { - .name = _("Drain Punch"), + .name = { .moveName = _("Drain Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, @@ -7386,7 +7386,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VACUUM_WAVE] = { - .name = _("Vacuum Wave"), + .name = { .moveName = _("Vacuum Wave") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -7400,7 +7400,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_BLAST] = { - .name = _("Focus Blast"), + .name = { .moveName = _("Focus Blast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -7420,7 +7420,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENERGY_BALL] = { - .name = _("Energy Ball"), + .name = { .moveName = _("Energy Ball") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 80, @@ -7440,7 +7440,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRAVE_BIRD] = { - .name = _("Brave Bird"), + .name = { .moveName = _("Brave Bird") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -7456,7 +7456,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTH_POWER] = { - .name = _("Earth Power"), + .name = { .moveName = _("Earth Power") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -7476,7 +7476,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWITCHEROO] = { - .name = _("Switcheroo"), + .name = { .moveName = _("Switcheroo") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRICK, .power = 0, @@ -7494,7 +7494,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_IMPACT] = { - .name = _("Giga Impact"), + .name = { .moveName = _("Giga Impact") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 150, @@ -7513,7 +7513,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NASTY_PLOT] = { - .name = _("Nasty Plot"), + .name = { .moveName = _("Nasty Plot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, @@ -7531,7 +7531,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_PUNCH] = { - .name = _("Bullet Punch"), + .name = { .moveName = _("Bullet Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -7547,7 +7547,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AVALANCHE] = { - .name = _("Avalanche"), + .name = { .moveName = _("Avalanche") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REVENGE, .power = 60, @@ -7562,7 +7562,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SHARD] = { - .name = _("Ice Shard"), + .name = { .moveName = _("Ice Shard") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -7576,7 +7576,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_CLAW] = { - .name = _("Shadow Claw"), + .name = { .moveName = _("Shadow Claw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -7592,7 +7592,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_FANG] = { - .name = _("Thunder Fang"), + .name = { .moveName = _("Thunder Fang") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -7618,7 +7618,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_FANG] = { - .name = _("Ice Fang"), + .name = { .moveName = _("Ice Fang") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -7643,7 +7643,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_FANG] = { - .name = _("Fire Fang"), + .name = { .moveName = _("Fire Fang") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -7669,7 +7669,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_SNEAK] = { - .name = _("Shadow Sneak"), + .name = { .moveName = _("Shadow Sneak") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -7684,7 +7684,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_BOMB] = { - .name = _("Mud Bomb"), + .name = { .moveName = _("Mud Bomb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -7704,7 +7704,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_CUT] = { - .name = _("Psycho Cut"), + .name = { .moveName = _("Psycho Cut") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -7720,7 +7720,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZEN_HEADBUTT] = { - .name = _("Zen Headbutt"), + .name = { .moveName = _("Zen Headbutt") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -7740,7 +7740,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_SHOT] = { - .name = _("Mirro Shot"), + .name = { .moveName = _("Mirro Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -7759,7 +7759,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH_CANNON] = { - .name = _("Flash Cannon"), + .name = { .moveName = _("Flash Cannon") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -7778,7 +7778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_CLIMB] = { - .name = _("Rock Climb"), + .name = { .moveName = _("Rock Climb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -7798,7 +7798,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFOG] = { - .name = _("Defog"), + .name = { .moveName = _("Defog") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFOG, .power = 0, @@ -7815,7 +7815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_ROOM] = { - .name = _("Trick Room"), + .name = { .moveName = _("Trick Room") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRICK_ROOM, .power = 0, @@ -7831,7 +7831,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRACO_METEOR] = { - .name = _("Draco Meteor"), + .name = { .moveName = _("Draco Meteor") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, @@ -7849,7 +7849,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISCHARGE] = { - .name = _("Discharge"), + .name = { .moveName = _("Discharge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -7868,7 +7868,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAVA_PLUME] = { - .name = _("Lava Plume"), + .name = { .moveName = _("Lava Plume") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -7887,7 +7887,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_STORM] = { - .name = _("Leaf Storm"), + .name = { .moveName = _("Leaf Storm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, @@ -7905,7 +7905,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_WHIP] = { - .name = _("Power Whip"), + .name = { .moveName = _("Power Whip") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -7920,7 +7920,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_WRECKER] = { - .name = _("Rock Wrecker"), + .name = { .moveName = _("Rock Wrecker") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 150, @@ -7939,7 +7939,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_POISON] = { - .name = _("Cross Poison"), + .name = { .moveName = _("Cross Poison") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -7961,7 +7961,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUNK_SHOT] = { - .name = _("Gunk Shot"), + .name = { .moveName = _("Gunk Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -7980,7 +7980,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_HEAD] = { - .name = _("Iron Head"), + .name = { .moveName = _("Iron Head") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -8000,7 +8000,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_BOMB] = { - .name = _("Magnet Bomb"), + .name = { .moveName = _("Magnet Bomb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -8015,7 +8015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_EDGE] = { - .name = _("Stone Edge"), + .name = { .moveName = _("Stone Edge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -8030,7 +8030,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAPTIVATE] = { - .name = _("Captivate"), + .name = { .moveName = _("Captivate") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CAPTIVATE, .power = 0, @@ -8046,7 +8046,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEALTH_ROCK] = { - .name = _("Stealth Rock"), + .name = { .moveName = _("Stealth Rock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STEALTH_ROCK, .power = 0, @@ -8065,7 +8065,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_KNOT] = { - .name = _("Grass Knot"), + .name = { .moveName = _("Grass Knot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LOW_KICK, .power = 1, @@ -8081,7 +8081,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHATTER] = { - .name = _("Chatter"), + .name = { .moveName = _("Chatter") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 60, @@ -8115,7 +8115,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUDGMENT] = { - .name = _("Judgment"), + .name = { .moveName = _("Judgment") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = 100, @@ -8130,7 +8130,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BITE] = { - .name = _("Bug Bite"), + .name = { .moveName = _("Bug Bite") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -8148,7 +8148,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE_BEAM] = { - .name = _("Charge Beam"), + .name = { .moveName = _("Charge Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -8168,7 +8168,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WOOD_HAMMER] = { - .name = _("Wood Hammer"), + .name = { .moveName = _("Wood Hammer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -8184,7 +8184,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_JET] = { - .name = _("Aqua Jet"), + .name = { .moveName = _("Aqua Jet") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -8199,7 +8199,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTACK_ORDER] = { - .name = _("Attack Order"), + .name = { .moveName = _("Attack Order") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -8214,7 +8214,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFEND_ORDER] = { - .name = _("Defend Order"), + .name = { .moveName = _("Defend Order") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COSMIC_POWER, .power = 0, @@ -8232,7 +8232,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_ORDER] = { - .name = _("Heal Order"), + .name = { .moveName = _("Heal Order") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RESTORE_HP, .power = 0, @@ -8251,7 +8251,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_SMASH] = { - .name = _("Head Smash"), + .name = { .moveName = _("Head Smash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 150, @@ -8267,7 +8267,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_HIT] = { - .name = _("Double Hit"), + .name = { .moveName = _("Double Hit") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 35, @@ -8283,7 +8283,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR_OF_TIME] = { - .name = _("Roar of Time"), + .name = { .moveName = _("Roar of Time") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 150, @@ -8301,7 +8301,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPACIAL_REND] = { - .name = _("Spacial Rend"), + .name = { .moveName = _("Spacial Rend") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -8316,7 +8316,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_DANCE] = { - .name = _("Lunar Dance"), + .name = { .moveName = _("Lunar Dance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEALING_WISH, .power = 0, @@ -8335,7 +8335,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_GRIP] = { - .name = _("Crush Grip"), + .name = { .moveName = _("Crush Grip") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WRING_OUT, .power = 1, @@ -8350,7 +8350,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGMA_STORM] = { - .name = _("Magma Storm"), + .name = { .moveName = _("Magma Storm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 120, @@ -8367,7 +8367,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_VOID] = { - .name = _("Dark Void"), + .name = { .moveName = _("Dark Void") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DARK_VOID, .power = 0, @@ -8384,7 +8384,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_FLARE] = { - .name = _("Seed Flare"), + .name = { .moveName = _("Seed Flare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -8403,7 +8403,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OMINOUS_WIND] = { - .name = _("Ominous Wind"), + .name = { .moveName = _("Ominous Wind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -8424,7 +8424,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_FORCE] = { - .name = _("Shadow Force"), + .name = { .moveName = _("Shadow Force") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 120, @@ -8448,7 +8448,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HONE_CLAWS] = { - .name = _("Hone Claws"), + .name = { .moveName = _("Hone Claws") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_ACCURACY_UP, .power = 0, @@ -8466,7 +8466,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WIDE_GUARD] = { - .name = _("Wide Guard"), + .name = { .moveName = _("Wide Guard") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -8487,7 +8487,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SPLIT] = { - .name = _("Guard Split"), + .name = { .moveName = _("Guard Split") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GUARD_SPLIT, .power = 0, @@ -8503,7 +8503,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SPLIT] = { - .name = _("Power Split"), + .name = { .moveName = _("Power Split") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWER_SPLIT, .power = 0, @@ -8519,7 +8519,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WONDER_ROOM] = { - .name = _("Wonder Room"), + .name = { .moveName = _("Wonder Room") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WONDER_ROOM, .power = 0, @@ -8535,7 +8535,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHOCK] = { - .name = _("Psyshock"), + .name = { .moveName = _("Psyshock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYSHOCK, .power = 80, @@ -8549,7 +8549,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOSHOCK] = { - .name = _("Venoshock"), + .name = { .moveName = _("Venoshock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = 65, @@ -8564,7 +8564,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AUTOTOMIZE] = { - .name = _("Autotomize"), + .name = { .moveName = _("Autotomize") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AUTOTOMIZE, .power = 0, @@ -8582,7 +8582,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_POWDER] = { - .name = _("Rage Powder"), + .name = { .moveName = _("Rage Powder") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOLLOW_ME, .power = 0, @@ -8603,7 +8603,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEKINESIS] = { - .name = _("Telekinesis"), + .name = { .moveName = _("Telekinesis") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TELEKINESIS, .power = 0, @@ -8620,7 +8620,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_ROOM] = { - .name = _("Magic Room"), + .name = { .moveName = _("Magic Room") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGIC_ROOM, .power = 0, @@ -8636,7 +8636,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMACK_DOWN] = { - .name = _("Smack Down"), + .name = { .moveName = _("Smack Down") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -8655,7 +8655,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORM_THROW] = { - .name = _("Storm Throw"), + .name = { .moveName = _("Storm Throw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, @@ -8671,7 +8671,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_BURST] = { - .name = _("Flame Burst"), + .name = { .moveName = _("Flame Burst") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -8689,7 +8689,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_WAVE] = { - .name = _("Sludge Wave"), + .name = { .moveName = _("Sludge Wave") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 95, @@ -8708,7 +8708,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUIVER_DANCE] = { - .name = _("Quiver Dance"), + .name = { .moveName = _("Quiver Dance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_QUIVER_DANCE, .power = 0, @@ -8727,7 +8727,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAVY_SLAM] = { - .name = _("Heavy Slam"), + .name = { .moveName = _("Heavy Slam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAT_CRASH, .power = 1, @@ -8744,7 +8744,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNCHRONOISE] = { - .name = _("Synchronoise"), + .name = { .moveName = _("Synchronoise") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SYNCHRONOISE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 70, @@ -8758,7 +8758,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_BALL] = { - .name = _("Electro Ball"), + .name = { .moveName = _("Electro Ball") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ELECTRO_BALL, .power = 1, @@ -8773,7 +8773,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOAK] = { - .name = _("Soak"), + .name = { .moveName = _("Soak") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOAK, .power = 0, @@ -8789,7 +8789,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_CHARGE] = { - .name = _("Flame Charge"), + .name = { .moveName = _("Flame Charge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -8810,7 +8810,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COIL] = { - .name = _("Coil"), + .name = { .moveName = _("Coil") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COIL, .power = 0, @@ -8828,7 +8828,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_SWEEP] = { - .name = _("Low Sweep"), + .name = { .moveName = _("Low Sweep") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 60, @@ -8848,7 +8848,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_SPRAY] = { - .name = _("Acid Spray"), + .name = { .moveName = _("Acid Spray") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -8868,7 +8868,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOUL_PLAY] = { - .name = _("Foul Play"), + .name = { .moveName = _("Foul Play") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOUL_PLAY, .power = 95, @@ -8883,7 +8883,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIMPLE_BEAM] = { - .name = _("Simple Beam"), + .name = { .moveName = _("Simple Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SIMPLE_BEAM, .power = 0, @@ -8899,7 +8899,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENTRAINMENT] = { - .name = _("Entrainment"), + .name = { .moveName = _("Entrainment") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ENTRAINMENT, .power = 0, @@ -8915,7 +8915,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AFTER_YOU] = { - .name = _("After You"), + .name = { .moveName = _("After You") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AFTER_YOU, .power = 0, @@ -8934,7 +8934,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROUND] = { - .name = _("Round"), + .name = { .moveName = _("Round") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROUND, .power = 60, @@ -8953,7 +8953,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ECHOED_VOICE] = { - .name = _("Echoed Voice"), + .name = { .moveName = _("Echoed Voice") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ECHOED_VOICE, .power = 40, @@ -8969,7 +8969,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHIP_AWAY] = { - .name = _("Chip Away"), + .name = { .moveName = _("Chip Away") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -8985,7 +8985,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLEAR_SMOG] = { - .name = _("Clear Smog"), + .name = { .moveName = _("Clear Smog") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -9002,7 +9002,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORED_POWER] = { - .name = _("Stored Power"), + .name = { .moveName = _("Stored Power") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STORED_POWER, .power = 20, @@ -9016,7 +9016,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_GUARD] = { - .name = _("Quick Guard"), + .name = { .moveName = _("Quick Guard") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -9037,7 +9037,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLY_SWITCH] = { - .name = _("Ally Switch"), + .name = { .moveName = _("Ally Switch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ALLY_SWITCH, .power = 0, @@ -9054,7 +9054,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALD] = { - .name = _("Scald"), + .name = { .moveName = _("Scald") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -9074,7 +9074,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SMASH] = { - .name = _("Shell Smash"), + .name = { .moveName = _("Shell Smash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHELL_SMASH, .power = 0, @@ -9092,7 +9092,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_PULSE] = { - .name = _("Heal Pulse"), + .name = { .moveName = _("Heal Pulse") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_PULSE, .power = 0, @@ -9111,7 +9111,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEX] = { - .name = _("Hex"), + .name = { .moveName = _("Hex") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 50, @@ -9126,7 +9126,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_DROP] = { - .name = _("Sky Drop"), + .name = { .moveName = _("Sky Drop") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SKY_DROP, .power = 60, @@ -9146,7 +9146,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHIFT_GEAR] = { - .name = _("Shift Gear"), + .name = { .moveName = _("Shift Gear") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHIFT_GEAR, .power = 0, @@ -9164,7 +9164,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CIRCLE_THROW] = { - .name = _("Circle Throw"), + .name = { .moveName = _("Circle Throw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, @@ -9181,7 +9181,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INCINERATE] = { - .name = _("Incinerate"), + .name = { .moveName = _("Incinerate") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 30, @@ -9198,7 +9198,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUASH] = { - .name = _("Quash"), + .name = { .moveName = _("Quash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_QUASH, .power = 0, @@ -9214,7 +9214,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACROBATICS] = { - .name = _("Acrobatics"), + .name = { .moveName = _("Acrobatics") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ACROBATICS, .power = 55, @@ -9229,7 +9229,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT_TYPE] = { - .name = _("Reflect Type"), + .name = { .moveName = _("Reflect Type") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REFLECT_TYPE, .power = 0, @@ -9246,7 +9246,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETALIATE] = { - .name = _("Retaliate"), + .name = { .moveName = _("Retaliate") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RETALIATE, .power = 70, @@ -9261,7 +9261,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FINAL_GAMBIT] = { - .name = _("Final Gambit"), + .name = { .moveName = _("Final Gambit") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FINAL_GAMBIT, .power = 1, @@ -9277,7 +9277,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BESTOW] = { - .name = _("Bestow"), + .name = { .moveName = _("Bestow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BESTOW, .power = 0, @@ -9297,7 +9297,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNO] = { - .name = _("Inferno"), + .name = { .moveName = _("Inferno") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -9316,7 +9316,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PLEDGE] = { - .name = _("Water Pledge"), + .name = { .moveName = _("Water Pledge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, @@ -9331,7 +9331,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PLEDGE] = { - .name = _("Fire Pledge"), + .name = { .moveName = _("Fire Pledge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, @@ -9346,7 +9346,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_PLEDGE] = { - .name = _("Grass Pledge"), + .name = { .moveName = _("Grass Pledge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, @@ -9361,7 +9361,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_SWITCH] = { - .name = _("Volt Switch"), + .name = { .moveName = _("Volt Switch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ESCAPE, .power = 70, @@ -9375,7 +9375,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE_BUG] = { - .name = _("Strugle Bug"), + .name = { .moveName = _("Strugle Bug") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 30, @@ -9394,7 +9394,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLDOZE] = { - .name = _("Bulldoze"), + .name = { .moveName = _("Bulldoze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BULLDOZE, .power = 60, @@ -9414,7 +9414,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FROST_BREATH] = { - .name = _("Frost Breath"), + .name = { .moveName = _("Frost Breath") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, @@ -9429,7 +9429,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_TAIL] = { - .name = _("Dragon Tail"), + .name = { .moveName = _("Dragon Tail") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, @@ -9446,7 +9446,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORK_UP] = { - .name = _("Work Up"), + .name = { .moveName = _("Work Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_SPATK_UP, .power = 0, @@ -9464,7 +9464,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTROWEB] = { - .name = _("Electroweb"), + .name = { .moveName = _("Electroweb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 55, @@ -9483,7 +9483,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILD_CHARGE] = { - .name = _("Wild Chagre"), + .name = { .moveName = _("Wild Chagre") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -9499,7 +9499,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_RUN] = { - .name = _("Drill Run"), + .name = { .moveName = _("Drill Run") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -9515,7 +9515,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_CHOP] = { - .name = _("Dual Chop"), + .name = { .moveName = _("Dual Chop") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -9531,7 +9531,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_STAMP] = { - .name = _("Heart Stamp"), + .name = { .moveName = _("Heart Stamp") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -9551,7 +9551,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_LEECH] = { - .name = _("Horn Leech"), + .name = { .moveName = _("Horn Leech") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = 75, @@ -9567,7 +9567,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_SWORD] = { - .name = _("Sacred Sword"), + .name = { .moveName = _("Sacred Sword") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -9584,7 +9584,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_SHELL] = { - .name = _("Razor Shell"), + .name = { .moveName = _("Razor Shell") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -9605,7 +9605,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_CRASH] = { - .name = _("Heat Crash"), + .name = { .moveName = _("Heat Crash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAT_CRASH, .power = 1, @@ -9621,7 +9621,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_TORNADO] = { - .name = _("Leaf Tornado"), + .name = { .moveName = _("Leaf Tornado") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -9641,7 +9641,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAMROLLER] = { - .name = _("Steamroller"), + .name = { .moveName = _("Steamroller") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -9662,7 +9662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_GUARD] = { - .name = _("Cotton Guard"), + .name = { .moveName = _("Cotton Guard") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_3, .power = 0, @@ -9680,7 +9680,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_DAZE] = { - .name = _("Night Daze"), + .name = { .moveName = _("Night Daze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 85, @@ -9699,7 +9699,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSTRIKE] = { - .name = _("Psystrike"), + .name = { .moveName = _("Psystrike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYSHOCK, .power = 100, @@ -9713,7 +9713,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_SLAP] = { - .name = _("Tail Slap"), + .name = { .moveName = _("Tail Slap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 25, @@ -9728,7 +9728,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HURRICANE] = { - .name = _("Hurricane"), + .name = { .moveName = _("Hurricane") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_THUNDER, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, @@ -9749,7 +9749,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_CHARGE] = { - .name = _("Head Charge"), + .name = { .moveName = _("Head Charge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -9765,7 +9765,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_GRIND] = { - .name = _("Gear Grind"), + .name = { .moveName = _("Gear Grind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -9781,7 +9781,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEARING_SHOT] = { - .name = _("Searing Shot"), + .name = { .moveName = _("Searing Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -9801,7 +9801,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TECHNO_BLAST] = { - .name = _("Techno Blast"), + .name = { .moveName = _("Techno Blast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 85, @@ -9817,7 +9817,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RELIC_SONG] = { - .name = _("Relic Song"), + .name = { .moveName = _("Relic Song") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RELIC_SONG, .power = 75, @@ -9840,7 +9840,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_SWORD] = { - .name = _("Secret Sword"), + .name = { .moveName = _("Secret Sword") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYSHOCK, .power = 85, @@ -9856,7 +9856,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIATE] = { - .name = _("Glaciate"), + .name = { .moveName = _("Glaciate") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -9875,7 +9875,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_STRIKE] = { - .name = _("Bolt Strike"), + .name = { .moveName = _("Bolt Strike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 130, @@ -9895,7 +9895,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLUE_FLARE] = { - .name = _("Blue Flare"), + .name = { .moveName = _("Blue Flare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 130, @@ -9914,7 +9914,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_DANCE] = { - .name = _("Fiery Dance"), + .name = { .moveName = _("Fiery Dance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -9935,7 +9935,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_SHOCK] = { - .name = _("Freeze Shock"), + .name = { .moveName = _("Freeze Shock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, @@ -9958,7 +9958,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BURN] = { - .name = _("Ice Burn"), + .name = { .moveName = _("Ice Burn") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, @@ -9981,7 +9981,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNARL] = { - .name = _("Snarl"), + .name = { .moveName = _("Snarl") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 55, @@ -10003,7 +10003,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_CRASH] = { - .name = _("Icicle Crash"), + .name = { .moveName = _("Icicle Crash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 85, @@ -10022,7 +10022,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_V_CREATE] = { - .name = _("V-create"), + .name = { .moveName = _("V-create") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, @@ -10042,7 +10042,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_FLARE] = { - .name = _("Fusion Flare"), + .name = { .moveName = _("Fusion Flare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FUSION_COMBO, .power = 100, @@ -10057,7 +10057,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_BOLT] = { - .name = _("Fusion Bolt"), + .name = { .moveName = _("Fusion Bolt") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FUSION_COMBO, .power = 100, @@ -10071,7 +10071,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLYING_PRESS] = { - .name = _("Flying Press"), + .name = { .moveName = _("Flying Press") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TWO_TYPED_MOVE, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 100 : 80, @@ -10090,7 +10090,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAT_BLOCK] = { - .name = _("Mat Block"), + .name = { .moveName = _("Mat Block") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAT_BLOCK, .power = 0, @@ -10113,7 +10113,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELCH] = { - .name = _("Belch"), + .name = { .moveName = _("Belch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BELCH, .power = 120, @@ -10135,7 +10135,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROTOTILLER] = { - .name = _("Rototiller"), + .name = { .moveName = _("Rototiller") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ROTOTILLER, .power = 0, @@ -10153,7 +10153,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STICKY_WEB] = { - .name = _("Sticky Web"), + .name = { .moveName = _("Sticky Web") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STICKY_WEB, .power = 0, @@ -10172,7 +10172,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FELL_STINGER] = { - .name = _("Fell Stinger"), + .name = { .moveName = _("Fell Stinger") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FELL_STINGER, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 50 : 30, @@ -10188,9 +10188,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PHANTOM_FORCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Phantom Force"), + .name = { .moveName = _("Phantom Force") }, #else - .name = _("PhantomForce"), + .name = { .moveName = _("PhantomForce") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SEMI_INVULNERABLE, @@ -10216,9 +10216,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_OR_TREAT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Trick-or-Treat"), + .name = { .moveName = _("Trick-or-Treat") }, #else - .name = _("TrickOrTreat"), + .name = { .moveName = _("TrickOrTreat") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_THIRD_TYPE, @@ -10236,7 +10236,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOBLE_ROAR] = { - .name = _("Noble Roar"), + .name = { .moveName = _("Noble Roar") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NOBLE_ROAR, .power = 0, @@ -10254,7 +10254,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ION_DELUGE] = { - .name = _("Ion Deluge"), + .name = { .moveName = _("Ion Deluge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ION_DELUGE, .power = 0, @@ -10272,9 +10272,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARABOLIC_CHARGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Parabolic Charge"), + .name = { .moveName = _("Parabolic Charge") }, #else - .name = _("ParaboldChrg"), + .name = { .moveName = _("ParaboldChrg") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, @@ -10291,9 +10291,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESTS_CURSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Forest's Curse"), + .name = { .moveName = _("Forest's Curse") }, #else - .name = _("Forest'sCurs"), + .name = { .moveName = _("Forest'sCurs") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_THIRD_TYPE, @@ -10312,9 +10312,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_BLIZZARD] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Petal Blizzard"), + .name = { .moveName = _("Petal Blizzard") }, #else - .name = _("PetalBlizzrd"), + .name = { .moveName = _("PetalBlizzrd") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -10330,7 +10330,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_DRY] = { - .name = _("Freeze-Dry"), + .name = { .moveName = _("Freeze-Dry") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FREEZE_DRY, .power = 70, @@ -10350,9 +10350,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISARMING_VOICE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Disarming Voice"), + .name = { .moveName = _("Disarming Voice") }, #else - .name = _("DisrmngVoice"), + .name = { .moveName = _("DisrmngVoice") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -10369,7 +10369,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARTING_SHOT] = { - .name = _("Parting Shot"), + .name = { .moveName = _("Parting Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PARTING_SHOT, .power = 0, @@ -10387,7 +10387,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOPSY_TURVY] = { - .name = _("Topsy-Turvy"), + .name = { .moveName = _("Topsy-Turvy") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TOPSY_TURVY, .power = 0, @@ -10404,9 +10404,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAINING_KISS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Draining Kiss"), + .name = { .moveName = _("Draining Kiss") }, #else - .name = _("DrainingKiss"), + .name = { .moveName = _("DrainingKiss") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, @@ -10425,9 +10425,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRAFTY_SHIELD] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Crafty Shield"), + .name = { .moveName = _("Crafty Shield") }, #else - .name = _("CraftyShield"), + .name = { .moveName = _("CraftyShield") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, @@ -10448,9 +10448,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_SHIELD] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Flower Shield"), + .name = { .moveName = _("Flower Shield") }, #else - .name = _("FlowerShield"), + .name = { .moveName = _("FlowerShield") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FLOWER_SHIELD, @@ -10469,9 +10469,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_TERRAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Grassy Terrain"), + .name = { .moveName = _("Grassy Terrain") }, #else - .name = _("GrssyTerrain"), + .name = { .moveName = _("GrssyTerrain") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRASSY_TERRAIN, @@ -10491,9 +10491,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_TERRAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Misty Terrain"), + .name = { .moveName = _("Misty Terrain") }, #else - .name = _("MistyTerrain"), + .name = { .moveName = _("MistyTerrain") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MISTY_TERRAIN, @@ -10512,7 +10512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIFY] = { - .name = _("Electrify"), + .name = { .moveName = _("Electrify") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ELECTRIFY, .power = 0, @@ -10527,7 +10527,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_ROUGH] = { - .name = _("Play Rough"), + .name = { .moveName = _("Play Rough") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -10547,7 +10547,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_WIND] = { - .name = _("Fairy Wind"), + .name = { .moveName = _("Fairy Wind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -10562,7 +10562,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONBLAST] = { - .name = _("Moonblast"), + .name = { .moveName = _("Moonblast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 95, @@ -10581,7 +10581,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOOMBURST] = { - .name = _("Boomburst"), + .name = { .moveName = _("Boomburst") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 140, @@ -10597,7 +10597,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_LOCK] = { - .name = _("Fairy Lock"), + .name = { .moveName = _("Fairy Lock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FAIRY_LOCK, .power = 0, @@ -10615,9 +10615,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINGS_SHIELD] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("King's Shield"), + .name = { .moveName = _("King's Shield") }, #else - .name = _("King'sShield"), + .name = { .moveName = _("King'sShield") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, @@ -10640,7 +10640,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_NICE] = { - .name = _("Play Nice"), + .name = { .moveName = _("Play Nice") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN, .power = 0, @@ -10658,7 +10658,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFIDE] = { - .name = _("Confide"), + .name = { .moveName = _("Confide") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN, .power = 0, @@ -10678,9 +10678,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIAMOND_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Diamond Storm"), + .name = { .moveName = _("Diamond Storm") }, #else - .name = _("DiamondStorm"), + .name = { .moveName = _("DiamondStorm") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .power = 100, @@ -10701,9 +10701,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAM_ERUPTION] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Steam Eruption"), + .name = { .moveName = _("Steam Eruption") }, #else - .name = _("SteamErption"), + .name = { .moveName = _("SteamErption") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -10726,9 +10726,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_HOLE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Hyperspace Hole"), + .name = { .moveName = _("Hyperspace Hole") }, #else - .name = _("HyprspceHole"), + .name = { .moveName = _("HyprspceHole") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -10750,9 +10750,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SHURIKEN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Water Shuriken"), + .name = { .moveName = _("Water Shuriken") }, #else - .name = _("WatrShuriken"), + .name = { .moveName = _("WatrShuriken") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, @@ -10768,9 +10768,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_FIRE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Mystical Fire"), + .name = { .moveName = _("Mystical Fire") }, #else - .name = _("MysticalFire"), + .name = { .moveName = _("MysticalFire") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -10790,7 +10790,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKY_SHIELD] = { - .name = _("Spiky Shield"), + .name = { .moveName = _("Spiky Shield") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -10812,9 +10812,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATIC_MIST] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Aromatic Mist"), + .name = { .moveName = _("Aromatic Mist") }, #else - .name = _("AromaticMist"), + .name = { .moveName = _("AromaticMist") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AROMATIC_MIST, @@ -10834,9 +10834,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_IMPULSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Eerie Impulse"), + .name = { .moveName = _("Eerie Impulse") }, #else - .name = _("EerieImpulse"), + .name = { .moveName = _("EerieImpulse") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_2, @@ -10853,7 +10853,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOM_DRENCH] = { - .name = _("Venom Drench"), + .name = { .moveName = _("Venom Drench") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_VENOM_DRENCH, .power = 0, @@ -10869,7 +10869,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER] = { - .name = _("Powder"), + .name = { .moveName = _("Powder") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWDER, .power = 0, @@ -10886,7 +10886,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEOMANCY] = { - .name = _("Geomancy"), + .name = { .moveName = _("Geomancy") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GEOMANCY, .power = 0, @@ -10906,9 +10906,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNETIC_FLUX] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Magnetic Flux"), + .name = { .moveName = _("Magnetic Flux") }, #else - .name = _("MagneticFlux"), + .name = { .moveName = _("MagneticFlux") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAGNETIC_FLUX, @@ -10928,7 +10928,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAPPY_HOUR] = { - .name = _("Happy Hour"), + .name = { .moveName = _("Happy Hour") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DO_NOTHING, .power = 0, @@ -10946,9 +10946,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIC_TERRAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Electric Terrain"), + .name = { .moveName = _("Electric Terrain") }, #else - .name = _("ElctrcTrrain"), + .name = { .moveName = _("ElctrcTrrain") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ELECTRIC_TERRAIN, @@ -10968,9 +10968,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DAZZLING_GLEAM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Dazzling Gleam"), + .name = { .moveName = _("Dazzling Gleam") }, #else - .name = _("DazzlngGleam"), + .name = { .moveName = _("DazzlngGleam") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -10985,7 +10985,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CELEBRATE] = { - .name = _("Celebrate"), + .name = { .moveName = _("Celebrate") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DO_NOTHING, .power = 0, @@ -11008,7 +11008,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_HANDS] = { - .name = _("Hold Hands"), + .name = { .moveName = _("Hold Hands") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DO_NOTHING, .power = 0, @@ -11032,9 +11032,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BABY_DOLL_EYES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Baby-Doll Eyes"), + .name = { .moveName = _("Baby-Doll Eyes") }, #else - .name = _("BabyDollEyes"), + .name = { .moveName = _("BabyDollEyes") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ATTACK_DOWN, @@ -11051,7 +11051,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NUZZLE] = { - .name = _("Nuzzle"), + .name = { .moveName = _("Nuzzle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 20, @@ -11071,7 +11071,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_BACK] = { - .name = _("Hold Back"), + .name = { .moveName = _("Hold Back") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FALSE_SWIPE, .power = 40, @@ -11086,7 +11086,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFESTATION] = { - .name = _("Infestation"), + .name = { .moveName = _("Infestation") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 20, @@ -11105,9 +11105,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_UP_PUNCH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Power-Up Punch"), + .name = { .moveName = _("Power-Up Punch") }, #else - .name = _("PowerUpPunch"), + .name = { .moveName = _("PowerUpPunch") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11131,9 +11131,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBLIVION_WING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Oblivion Wing"), + .name = { .moveName = _("Oblivion Wing") }, #else - .name = _("OblivionWing"), + .name = { .moveName = _("OblivionWing") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, @@ -11151,9 +11151,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_ARROWS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Thousand Arrows"), + .name = { .moveName = _("Thousand Arrows") }, #else - .name = _("ThousndArrws"), + .name = { .moveName = _("ThousndArrws") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11176,9 +11176,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_WAVES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Thousand Waves"), + .name = { .moveName = _("Thousand Waves") }, #else - .name = _("ThousndWaves"), + .name = { .moveName = _("ThousndWaves") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11198,7 +11198,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LANDS_WRATH] = { - .name = _("Land's Wrath"), + .name = { .moveName = _("Land's Wrath") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -11214,9 +11214,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_OF_RUIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Light of Ruin"), + .name = { .moveName = _("Light of Ruin") }, #else - .name = _("LightOfRuin"), + .name = { .moveName = _("LightOfRuin") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11233,7 +11233,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORIGIN_PULSE] = { - .name = _("Origin Pulse"), + .name = { .moveName = _("Origin Pulse") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 110, @@ -11250,9 +11250,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRECIPICE_BLADES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Precipice Blades"), + .name = { .moveName = _("Precipice Blades") }, #else - .name = _("PrcipceBldes"), + .name = { .moveName = _("PrcipceBldes") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11269,9 +11269,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ASCENT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Dragon Ascent"), + .name = { .moveName = _("Dragon Ascent") }, #else - .name = _("DragonAscent"), + .name = { .moveName = _("DragonAscent") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11293,9 +11293,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_FURY] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Hyperspace Fury"), + .name = { .moveName = _("Hyperspace Fury") }, #else - .name = _("HyprspceFury"), + .name = { .moveName = _("HyprspceFury") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HYPERSPACE_FURY, @@ -11320,7 +11320,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHORE_UP] = { - .name = _("Shore Up"), + .name = { .moveName = _("Shore Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHORE_UP, .power = 0, @@ -11340,9 +11340,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRST_IMPRESSION] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("First Impression"), + .name = { .moveName = _("First Impression") }, #else - .name = _("FrstImpressn"), + .name = { .moveName = _("FrstImpressn") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FAKE_OUT, @@ -11359,9 +11359,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BANEFUL_BUNKER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Baneful Bunker"), + .name = { .moveName = _("Baneful Bunker") }, #else - .name = _("BanefulBunkr"), + .name = { .moveName = _("BanefulBunkr") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, @@ -11384,9 +11384,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_SHACKLE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Spirit Shackle"), + .name = { .moveName = _("Spirit Shackle") }, #else - .name = _("SpiritShackl"), + .name = { .moveName = _("SpiritShackl") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11407,9 +11407,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARKEST_LARIAT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Darkest Lariat"), + .name = { .moveName = _("Darkest Lariat") }, #else - .name = _("DarkstLariat"), + .name = { .moveName = _("DarkstLariat") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11427,9 +11427,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLING_ARIA] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Sparkling Aria"), + .name = { .moveName = _("Sparkling Aria") }, #else - .name = _("SparklngAria"), + .name = { .moveName = _("SparklngAria") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11452,7 +11452,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_HAMMER] = { - .name = _("Ice Hammer"), + .name = { .moveName = _("Ice Hammer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -11473,9 +11473,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLORAL_HEALING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Floral Healing"), + .name = { .moveName = _("Floral Healing") }, #else - .name = _("FloralHealng"), + .name = { .moveName = _("FloralHealng") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HEAL_PULSE, @@ -11496,9 +11496,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_HORSEPOWER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("High Horsepower"), + .name = { .moveName = _("High Horsepower") }, #else - .name = _("HighHorseprw"), + .name = { .moveName = _("HighHorseprw") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11514,7 +11514,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH_SAP] = { - .name = _("Strength Sap"), + .name = { .moveName = _("Strength Sap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STRENGTH_SAP, .power = 0, @@ -11531,7 +11531,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BLADE] = { - .name = _("Solar Blade"), + .name = { .moveName = _("Solar Blade") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOLAR_BEAM, .power = 125, @@ -11550,7 +11550,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAFAGE] = { - .name = _("Leafage"), + .name = { .moveName = _("Leafage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -11564,7 +11564,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPOTLIGHT] = { - .name = _("Spotlight"), + .name = { .moveName = _("Spotlight") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FOLLOW_ME, .power = 0, @@ -11584,7 +11584,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_THREAD] = { - .name = _("Toxic Thread"), + .name = { .moveName = _("Toxic Thread") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TOXIC_THREAD, .power = 0, @@ -11600,7 +11600,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASER_FOCUS] = { - .name = _("Laser Focus"), + .name = { .moveName = _("Laser Focus") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LASER_FOCUS, .power = 0, @@ -11618,7 +11618,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_UP] = { - .name = _("Gear Up"), + .name = { .moveName = _("Gear Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GEAR_UP, .power = 0, @@ -11637,7 +11637,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THROAT_CHOP] = { - .name = _("Throat Chop"), + .name = { .moveName = _("Throat Chop") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -11657,7 +11657,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLLEN_PUFF] = { - .name = _("Pollen Puff"), + .name = { .moveName = _("Pollen Puff") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ENEMY_HEAL_ALLY, .power = 90, @@ -11672,7 +11672,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCHOR_SHOT] = { - .name = _("Anchor Shot"), + .name = { .moveName = _("Anchor Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -11693,9 +11693,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_TERRAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Psychic Terrain"), + .name = { .moveName = _("Psychic Terrain") }, #else - .name = _("PsychcTrrain"), + .name = { .moveName = _("PsychcTrrain") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYCHIC_TERRAIN, @@ -11713,7 +11713,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNGE] = { - .name = _("Lunge"), + .name = { .moveName = _("Lunge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -11733,7 +11733,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_LASH] = { - .name = _("Fire Lash"), + .name = { .moveName = _("Fire Lash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -11753,7 +11753,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRIP] = { - .name = _("Power Trip"), + .name = { .moveName = _("Power Trip") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STORED_POWER, .power = 20, @@ -11768,7 +11768,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURN_UP] = { - .name = _("Burn Up"), + .name = { .moveName = _("Burn Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FAIL_IF_NOT_ARG_TYPE, .power = 130, @@ -11788,7 +11788,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPEED_SWAP] = { - .name = _("Speed Swap"), + .name = { .moveName = _("Speed Swap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPEED_SWAP, .power = 0, @@ -11804,7 +11804,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMART_STRIKE] = { - .name = _("Smart Strike"), + .name = { .moveName = _("Smart Strike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -11819,7 +11819,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURIFY] = { - .name = _("Purify"), + .name = { .moveName = _("Purify") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PURIFY, .power = 0, @@ -11838,9 +11838,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVELATION_DANCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Revelation Dance"), + .name = { .moveName = _("Revelation Dance") }, #else - .name = _("RvlationDnce"), + .name = { .moveName = _("RvlationDnce") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REVELATION_DANCE, @@ -11857,9 +11857,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORE_ENFORCER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Core Enforcer"), + .name = { .moveName = _("Core Enforcer") }, #else - .name = _("CoreEnforcer"), + .name = { .moveName = _("CoreEnforcer") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11878,7 +11878,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TROP_KICK] = { - .name = _("Trop kick"), + .name = { .moveName = _("Trop kick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -11898,7 +11898,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INSTRUCT] = { - .name = _("Instruct"), + .name = { .moveName = _("Instruct") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_INSTRUCT, .power = 0, @@ -11917,7 +11917,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAK_BLAST] = { - .name = _("Beak Blast"), + .name = { .moveName = _("Beak Blast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BEAK_BLAST, .power = 100, @@ -11940,9 +11940,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGING_SCALES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Clanging Scales"), + .name = { .moveName = _("Clanging Scales") }, #else - .name = _("ClngngScales"), + .name = { .moveName = _("ClngngScales") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11964,9 +11964,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_HAMMER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Dragon Hammer"), + .name = { .moveName = _("Dragon Hammer") }, #else - .name = _("DragonHammer"), + .name = { .moveName = _("DragonHammer") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -11982,7 +11982,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRUTAL_SWING] = { - .name = _("Brutal Swing"), + .name = { .moveName = _("Brutal Swing") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -11997,7 +11997,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_VEIL] = { - .name = _("Aurora Veil"), + .name = { .moveName = _("Aurora Veil") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AURORA_VEIL, .power = 0, @@ -12015,7 +12015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_TRAP] = { - .name = _("Shell Trap"), + .name = { .moveName = _("Shell Trap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHELL_TRAP, .power = 150, @@ -12036,7 +12036,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLEUR_CANNON] = { - .name = _("Fleur Cannon"), + .name = { .moveName = _("Fleur Cannon") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 130, @@ -12056,9 +12056,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_FANGS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Psychic Fangs"), + .name = { .moveName = _("Psychic Fangs") }, #else - .name = _("PsychicFangs"), + .name = { .moveName = _("PsychicFangs") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BRICK_BREAK, @@ -12076,9 +12076,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMPING_TANTRUM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Stomping Tantrum"), + .name = { .moveName = _("Stomping Tantrum") }, #else - .name = _("StmpngTantrm"), + .name = { .moveName = _("StmpngTantrm") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STOMPING_TANTRUM, @@ -12095,7 +12095,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BONE] = { - .name = _("Shadow Bone"), + .name = { .moveName = _("Shadow Bone") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 85, @@ -12114,7 +12114,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACCELEROCK] = { - .name = _("Accelerock"), + .name = { .moveName = _("Accelerock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -12129,7 +12129,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIQUIDATION] = { - .name = _("Liquidation"), + .name = { .moveName = _("Liquidation") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 85, @@ -12150,9 +12150,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRISMATIC_LASER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Prismatic Laser"), + .name = { .moveName = _("Prismatic Laser") }, #else - .name = _("PrsmaticLasr"), + .name = { .moveName = _("PrsmaticLasr") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -12172,9 +12172,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPECTRAL_THIEF] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Spectral Thief"), + .name = { .moveName = _("Spectral Thief") }, #else - .name = _("SpectrlThief"), + .name = { .moveName = _("SpectrlThief") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -12196,9 +12196,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNSTEEL_STRIKE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Sunsteel Strike"), + .name = { .moveName = _("Sunsteel Strike") }, #else - .name = _("SnsteelStrke"), + .name = { .moveName = _("SnsteelStrke") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -12217,9 +12217,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONGEIST_BEAM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Moongeist Beam"), + .name = { .moveName = _("Moongeist Beam") }, #else - .name = _("MoongestBeam"), + .name = { .moveName = _("MoongestBeam") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -12236,7 +12236,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEARFUL_LOOK] = { - .name = _("Tearful Look"), + .name = { .moveName = _("Tearful Look") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NOBLE_ROAR, .power = 0, @@ -12253,7 +12253,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZING_ZAP] = { - .name = _("Zing Zap"), + .name = { .moveName = _("Zing Zap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -12273,9 +12273,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURES_MADNESS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Nature's Madness"), + .name = { .moveName = _("Nature's Madness") }, #else - .name = _("Natur'sMadns"), + .name = { .moveName = _("Natur'sMadns") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, @@ -12291,7 +12291,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MULTI_ATTACK] = { - .name = _("Multi-Attack"), + .name = { .moveName = _("Multi-Attack") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 120 : 90, @@ -12307,7 +12307,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_BLOWN] = { - .name = _("Mind Blown"), + .name = { .moveName = _("Mind Blown") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MIND_BLOWN, .power = 150, @@ -12322,7 +12322,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLASMA_FISTS] = { - .name = _("Plasma Fists"), + .name = { .moveName = _("Plasma Fists") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLASMA_FISTS, .power = 100, @@ -12340,9 +12340,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PHOTON_GEYSER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Photon Geyser"), + .name = { .moveName = _("Photon Geyser") }, #else - .name = _("PhotonGeyser"), + .name = { .moveName = _("PhotonGeyser") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PHOTON_GEYSER, @@ -12359,7 +12359,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZIPPY_ZAP] = { - .name = _("Zippy Zap"), + .name = { .moveName = _("Zippy Zap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 50, @@ -12385,9 +12385,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLISHY_SPLASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Splishy Splash"), + .name = { .moveName = _("Splishy Splash") }, #else - .name = _("SplishySplsh"), + .name = { .moveName = _("SplishySplsh") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -12409,7 +12409,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOATY_FALL] = { - .name = _("Floaty Fall"), + .name = { .moveName = _("Floaty Fall") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -12432,7 +12432,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIKA_PAPOW] = { - .name = _("Pika Papow"), + .name = { .moveName = _("Pika Papow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RETURN, .power = 1, @@ -12449,9 +12449,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCY_BUBBLE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Bouncy Bubble"), + .name = { .moveName = _("Bouncy Bubble") }, #else - .name = _("BouncyBubble"), + .name = { .moveName = _("BouncyBubble") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, @@ -12470,7 +12470,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUZZY_BUZZ] = { - .name = _("Buzzy Buzz"), + .name = { .moveName = _("Buzzy Buzz") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, @@ -12490,7 +12490,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIZZLY_SLIDE] = { - .name = _("Sizzly Slide"), + .name = { .moveName = _("Sizzly Slide") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, @@ -12512,7 +12512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLITZY_GLOW] = { - .name = _("Glitzy Glow"), + .name = { .moveName = _("Glitzy Glow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GLITZY_GLOW, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 90, @@ -12528,7 +12528,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BADDY_BAD] = { - .name = _("Baddy Bad"), + .name = { .moveName = _("Baddy Bad") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BADDY_BAD, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 90, @@ -12544,7 +12544,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAPPY_SEED] = { - .name = _("Sappy Seed"), + .name = { .moveName = _("Sappy Seed") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SAPPY_SEED, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 90, @@ -12561,7 +12561,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZY_FROST] = { - .name = _("Freezy Frost"), + .name = { .moveName = _("Freezy Frost") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FREEZY_FROST, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 90, @@ -12578,9 +12578,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLY_SWIRL] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Sparkly Swirl"), + .name = { .moveName = _("Sparkly Swirl") }, #else - .name = _("SparklySwirl"), + .name = { .moveName = _("SparklySwirl") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SPARKLY_SWIRL, @@ -12598,9 +12598,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VEEVEE_VOLLEY] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Veevee Volley"), + .name = { .moveName = _("Veevee Volley") }, #else - .name = _("VeeveeVolley"), + .name = { .moveName = _("VeeveeVolley") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RETURN, @@ -12619,9 +12619,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_IRON_BASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Double Iron Bash"), + .name = { .moveName = _("Double Iron Bash") }, #else - .name = _("DublIronBash"), + .name = { .moveName = _("DublIronBash") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -12647,9 +12647,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMAX_CANNON] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Dynamax Cannon"), + .name = { .moveName = _("Dynamax Cannon") }, #else - .name = _("DynamxCannon"), + .name = { .moveName = _("DynamxCannon") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, @@ -12673,7 +12673,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNIPE_SHOT] = { - .name = _("Snipe Shot"), + .name = { .moveName = _("Snipe Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SNIPE_SHOT, .power = 80, @@ -12688,7 +12688,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JAW_LOCK] = { - .name = _("Jaw Lock"), + .name = { .moveName = _("Jaw Lock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -12707,7 +12707,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUFF_CHEEKS] = { - .name = _("Stuff Cheeks"), + .name = { .moveName = _("Stuff Cheeks") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STUFF_CHEEKS, .power = 0, @@ -12724,7 +12724,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NO_RETREAT] = { - .name = _("No Retreat"), + .name = { .moveName = _("No Retreat") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_NO_RETREAT, .power = 0, @@ -12741,7 +12741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAR_SHOT] = { - .name = _("Tar Shot"), + .name = { .moveName = _("Tar Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TAR_SHOT, .power = 0, @@ -12756,7 +12756,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_POWDER] = { - .name = _("Magic Powder"), + .name = { .moveName = _("Magic Powder") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SOAK, .power = 0, @@ -12773,7 +12773,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DARTS] = { - .name = _("Dragon Darts"), + .name = { .moveName = _("Dragon Darts") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, //TODO .power = 50, @@ -12789,7 +12789,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEATIME] = { - .name = _("Teatime"), + .name = { .moveName = _("Teatime") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TEATIME, .power = 0, @@ -12806,7 +12806,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTOLOCK] = { - .name = _("Octolock"), + .name = { .moveName = _("Octolock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_OCTOLOCK, .power = 0, @@ -12820,7 +12820,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_BEAK] = { - .name = _("Bolt Beak"), + .name = { .moveName = _("Bolt Beak") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BOLT_BEAK, .power = 85, @@ -12836,9 +12836,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISHIOUS_REND] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Fishious Rend"), + .name = { .moveName = _("Fishious Rend") }, #else - .name = _("FishiousRend"), + .name = { .moveName = _("FishiousRend") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BOLT_BEAK, @@ -12855,7 +12855,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COURT_CHANGE] = { - .name = _("Court Change"), + .name = { .moveName = _("Court Change") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COURT_CHANGE, .power = 0, @@ -12871,9 +12871,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGOROUS_SOUL] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Clangorous Soul"), + .name = { .moveName = _("Clangorous Soul") }, #else - .name = _("ClngrousSoul"), + .name = { .moveName = _("ClngrousSoul") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CLANGOROUS_SOUL, @@ -12894,7 +12894,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_PRESS] = { - .name = _("Body Press"), + .name = { .moveName = _("Body Press") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_BODY_PRESS, .power = 80, @@ -12911,7 +12911,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DECORATE] = { - .name = _("Decorate"), + .name = { .moveName = _("Decorate") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DECORATE, .power = 0, @@ -12928,7 +12928,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRUM_BEATING] = { - .name = _("Drum Beating"), + .name = { .moveName = _("Drum Beating") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -12948,7 +12948,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNAP_TRAP] = { - .name = _("Snap Trap"), + .name = { .moveName = _("Snap Trap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 35, @@ -12968,7 +12968,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PYRO_BALL] = { - .name = _("Pyro Ball"), + .name = { .moveName = _("Pyro Ball") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -12991,9 +12991,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BLADE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Behemoth Blade"), + .name = { .moveName = _("Behemoth Blade") }, #else - .name = _("BehemthBlade"), + .name = { .moveName = _("BehemthBlade") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, @@ -13015,9 +13015,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Behemoth Bash"), + .name = { .moveName = _("Behemoth Bash") }, #else - .name = _("BehemothBash"), + .name = { .moveName = _("BehemothBash") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, @@ -13037,7 +13037,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_WHEEL] = { - .name = _("Aura Wheel"), + .name = { .moveName = _("Aura Wheel") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_AURA_WHEEL, .power = 110, @@ -13059,9 +13059,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BREAKING_SWIPE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Breaking Swipe"), + .name = { .moveName = _("Breaking Swipe") }, #else - .name = _("BreakngSwipe"), + .name = { .moveName = _("BreakngSwipe") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13083,7 +13083,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRANCH_POKE] = { - .name = _("Branch Poke"), + .name = { .moveName = _("Branch Poke") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -13099,7 +13099,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERDRIVE] = { - .name = _("Overdrive"), + .name = { .moveName = _("Overdrive") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -13116,7 +13116,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_APPLE_ACID] = { - .name = _("Apple Acid"), + .name = { .moveName = _("Apple Acid") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -13136,7 +13136,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAV_APPLE] = { - .name = _("Grav Apple"), + .name = { .moveName = _("Grav Apple") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRAV_APPLE, .power = 80, @@ -13156,7 +13156,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_BREAK] = { - .name = _("Spirit Break"), + .name = { .moveName = _("Spirit Break") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 75, @@ -13178,9 +13178,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRANGE_STEAM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Strange Steam"), + .name = { .moveName = _("Strange Steam") }, #else - .name = _("StrangeSteam"), + .name = { .moveName = _("StrangeSteam") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13201,7 +13201,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIFE_DEW] = { - .name = _("Life Dew"), + .name = { .moveName = _("Life Dew") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, @@ -13221,7 +13221,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBSTRUCT] = { - .name = _("Obstruct"), + .name = { .moveName = _("Obstruct") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -13241,9 +13241,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SURRENDER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("False Surrender"), + .name = { .moveName = _("False Surrender") }, #else - .name = _("FalsSurrendr"), + .name = { .moveName = _("FalsSurrendr") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13261,9 +13261,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_ASSAULT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Meteor Assault"), + .name = { .moveName = _("Meteor Assault") }, #else - .name = _("MeteorAssalt"), + .name = { .moveName = _("MeteorAssalt") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13284,7 +13284,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ETERNABEAM] = { - .name = _("Eternabeam"), + .name = { .moveName = _("Eternabeam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 160, @@ -13303,7 +13303,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_BEAM] = { - .name = _("Steel Beam"), + .name = { .moveName = _("Steel Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STEEL_BEAM, .power = 140, @@ -13319,9 +13319,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPANDING_FORCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Expanding Force"), + .name = { .moveName = _("Expanding Force") }, #else - .name = _("ExpandngForc"), + .name = { .moveName = _("ExpandngForc") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXPANDING_FORCE, @@ -13336,7 +13336,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_ROLLER] = { - .name = _("Steel Roller"), + .name = { .moveName = _("Steel Roller") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 130, @@ -13353,7 +13353,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALE_SHOT] = { - .name = _("Scale Shot"), + .name = { .moveName = _("Scale Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MULTI_HIT, .power = 25, @@ -13368,7 +13368,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_BEAM] = { - .name = _("Meteor Beam"), + .name = { .moveName = _("Meteor Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METEOR_BEAM, .power = 120, @@ -13390,9 +13390,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SIDE_ARM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Shell Side Arm"), + .name = { .moveName = _("Shell Side Arm") }, #else - .name = _("ShellSideArm"), + .name = { .moveName = _("ShellSideArm") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SHELL_SIDE_ARM, @@ -13413,9 +13413,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_EXPLOSION] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Misty Explosion"), + .name = { .moveName = _("Misty Explosion") }, #else - .name = _("MstyExplsion"), + .name = { .moveName = _("MstyExplsion") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXPLOSION, @@ -13430,7 +13430,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_GLIDE] = { - .name = _("Grassy Glide"), + .name = { .moveName = _("Grassy Glide") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GRASSY_GLIDE, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 55 : 70, @@ -13447,9 +13447,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RISING_VOLTAGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Rising Voltage"), + .name = { .moveName = _("Rising Voltage") }, #else - .name = _("RisngVoltage"), + .name = { .moveName = _("RisngVoltage") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RISING_VOLTAGE, @@ -13465,9 +13465,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERRAIN_PULSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Terrain Pulse"), + .name = { .moveName = _("Terrain Pulse") }, #else - .name = _("TerrainPulse"), + .name = { .moveName = _("TerrainPulse") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TERRAIN_PULSE, @@ -13484,9 +13484,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKITTER_SMACK] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Skitter Smack"), + .name = { .moveName = _("Skitter Smack") }, #else - .name = _("SkitterSmack"), + .name = { .moveName = _("SkitterSmack") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13508,9 +13508,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_JEALOUSY] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Burning Jealousy"), + .name = { .moveName = _("Burning Jealousy") }, #else - .name = _("BrningJelosy"), + .name = { .moveName = _("BrningJelosy") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13531,7 +13531,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASH_OUT] = { - .name = _("Lash Out"), + .name = { .moveName = _("Lash Out") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_LASH_OUT, .power = 75, @@ -13546,7 +13546,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLTERGEIST] = { - .name = _("Poltergeist"), + .name = { .moveName = _("Poltergeist") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POLTERGEIST, .power = 110, @@ -13561,9 +13561,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORROSIVE_GAS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Corrosive Gas"), + .name = { .moveName = _("Corrosive Gas") }, #else - .name = _("CorrosiveGas"), + .name = { .moveName = _("CorrosiveGas") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CORROSIVE_GAS, @@ -13579,7 +13579,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COACHING] = { - .name = _("Coaching"), + .name = { .moveName = _("Coaching") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COACHING, .power = 0, @@ -13596,7 +13596,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLIP_TURN] = { - .name = _("Flip Turn"), + .name = { .moveName = _("Flip Turn") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_ESCAPE, .power = 60, @@ -13611,7 +13611,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_AXEL] = { - .name = _("Triple Axel"), + .name = { .moveName = _("Triple Axel") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TRIPLE_KICK, .power = 20, @@ -13628,9 +13628,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_WINGBEAT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Dual Wingbeat"), + .name = { .moveName = _("Dual Wingbeat") }, #else - .name = _("DualWingbeat"), + .name = { .moveName = _("DualWingbeat") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13648,9 +13648,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCORCHING_SANDS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Scorching Sands"), + .name = { .moveName = _("Scorching Sands") }, #else - .name = _("ScorchngSnds"), + .name = { .moveName = _("ScorchngSnds") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13672,9 +13672,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUNGLE_HEALING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Jungle Healing"), + .name = { .moveName = _("Jungle Healing") }, #else - .name = _("JungleHealng"), + .name = { .moveName = _("JungleHealng") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_JUNGLE_HEALING, @@ -13694,7 +13694,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_BLOW] = { - .name = _("Wicked Blow"), + .name = { .moveName = _("Wicked Blow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 75 : 80, @@ -13713,9 +13713,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURGING_STRIKES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Surging Strikes"), + .name = { .moveName = _("Surging Strikes") }, #else - .name = _("SrgngStrkes"), + .name = { .moveName = _("SrgngStrkes") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13735,7 +13735,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_CAGE] = { - .name = _("Thunder Cage"), + .name = { .moveName = _("Thunder Cage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -13754,9 +13754,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ENERGY] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Dragon Energy"), + .name = { .moveName = _("Dragon Energy") }, #else - .name = _("DragonEnergy"), + .name = { .moveName = _("DragonEnergy") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ERUPTION, @@ -13773,9 +13773,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZING_GLARE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Freezing Glare"), + .name = { .moveName = _("Freezing Glare") }, #else - .name = _("FreezngGlare"), + .name = { .moveName = _("FreezngGlare") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .power = 90, @@ -13796,7 +13796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_WRATH] = { - .name = _("Fiery Wrath"), + .name = { .moveName = _("Fiery Wrath") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 90, @@ -13816,9 +13816,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDEROUS_KICK] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Thunderous Kick"), + .name = { .moveName = _("Thunderous Kick") }, #else - .name = _("ThnderusKick"), + .name = { .moveName = _("ThnderusKick") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13841,9 +13841,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIAL_LANCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Glacial Lance"), + .name = { .moveName = _("Glacial Lance") }, #else - .name = _("GlacialLance"), + .name = { .moveName = _("GlacialLance") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13860,9 +13860,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTRAL_BARRAGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Astral Barrage"), + .name = { .moveName = _("Astral Barrage") }, #else - .name = _("AstrlBarrage"), + .name = { .moveName = _("AstrlBarrage") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13878,7 +13878,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_SPELL] = { - .name = _("Eerie Spell"), + .name = { .moveName = _("Eerie Spell") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EERIE_SPELL, .power = 80, @@ -13895,7 +13895,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIRE_CLAW] = { - .name = _("Dire Claw"), + .name = { .moveName = _("Dire Claw") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 80 : 60, @@ -13916,9 +13916,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHIELD_BASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Psyshield Bash"), + .name = { .moveName = _("Psyshield Bash") }, #else - .name = _("PsyshieldBsh"), + .name = { .moveName = _("PsyshieldBsh") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -13940,7 +13940,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SHIFT] = { - .name = _("Power Shift"), + .name = { .moveName = _("Power Shift") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POWER_TRICK, .power = 0, @@ -13958,7 +13958,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_AXE] = { - .name = _("Stone Axe"), + .name = { .moveName = _("Stone Axe") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 65, @@ -13980,9 +13980,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPRINGTIDE_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Springtide Storm"), + .name = { .moveName = _("Springtide Storm") }, #else - .name = _("SprngtdeStrm"), + .name = { .moveName = _("SprngtdeStrm") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -14005,9 +14005,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_POWER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Mystical Power"), + .name = { .moveName = _("Mystical Power") }, #else - .name = _("MystcalPower"), + .name = { .moveName = _("MystcalPower") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -14028,7 +14028,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_FURY] = { - .name = _("Raging Fury"), + .name = { .moveName = _("Raging Fury") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 90, @@ -14047,7 +14047,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAVE_CRASH] = { - .name = _("Wave Crash"), + .name = { .moveName = _("Wave Crash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 75, @@ -14064,7 +14064,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHLOROBLAST] = { - .name = _("Chloroblast"), + .name = { .moveName = _("Chloroblast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STEEL_BEAM, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 150 : 120, @@ -14079,9 +14079,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOUNTAIN_GALE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Mountain Gale"), + .name = { .moveName = _("Mountain Gale") }, #else - .name = _("MountainGale"), + .name = { .moveName = _("MountainGale") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -14102,9 +14102,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VICTORY_DANCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Victory Dance"), + .name = { .moveName = _("Victory Dance") }, #else - .name = _("VictoryDance"), + .name = { .moveName = _("VictoryDance") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_VICTORY_DANCE, @@ -14124,9 +14124,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADLONG_RUSH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Headlong Rush"), + .name = { .moveName = _("Headlong Rush") }, #else - .name = _("HeadlongRush"), + .name = { .moveName = _("HeadlongRush") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -14147,7 +14147,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARB_BARRAGE] = { - .name = _("Barb Barrage"), + .name = { .moveName = _("Barb Barrage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = 60, @@ -14167,7 +14167,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ESPER_WING] = { - .name = _("Esper Wing"), + .name = { .moveName = _("Esper Wing") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 80 : 75, @@ -14189,9 +14189,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_MALICE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Bitter Malice"), + .name = { .moveName = _("Bitter Malice") }, #else - .name = _("BitterMalice"), + .name = { .moveName = _("BitterMalice") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -14211,7 +14211,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELTER] = { - .name = _("Shelter"), + .name = { .moveName = _("Shelter") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, @@ -14229,9 +14229,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_ARROWS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Triple Arrows"), + .name = { .moveName = _("Triple Arrows") }, #else - .name = _("TripleArrows"), + .name = { .moveName = _("TripleArrows") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -14257,9 +14257,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNAL_PARADE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Infernal Parade"), + .name = { .moveName = _("Infernal Parade") }, #else - .name = _("InfrnlParade"), + .name = { .moveName = _("InfrnlParade") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, @@ -14281,9 +14281,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CEASELESS_EDGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Ceasless Edge"), + .name = { .moveName = _("Ceasless Edge") }, #else - .name = _("CeaslessEdge"), + .name = { .moveName = _("CeaslessEdge") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -14306,9 +14306,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLEAKWIND_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Bleakwind Storm"), + .name = { .moveName = _("Bleakwind Storm") }, #else - .name = _("BlekwndStorm"), + .name = { .moveName = _("BlekwndStorm") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAIN_ALWAYS_HIT, @@ -14330,9 +14330,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILDBOLT_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Wildbolt Storm"), + .name = { .moveName = _("Wildbolt Storm") }, #else - .name = _("WildbltStorm"), + .name = { .moveName = _("WildbltStorm") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAIN_ALWAYS_HIT, @@ -14354,9 +14354,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSEAR_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Sandsear Storm"), + .name = { .moveName = _("Sandsear Storm") }, #else - .name = _("SndsearStorm"), + .name = { .moveName = _("SndsearStorm") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAIN_ALWAYS_HIT, @@ -14378,9 +14378,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_BLESSING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Lunar Blessing"), + .name = { .moveName = _("Lunar Blessing") }, #else - .name = _("LunarBlessng"), + .name = { .moveName = _("LunarBlessng") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_JUNGLE_HEALING, @@ -14399,7 +14399,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_HEART] = { - .name = _("Take Heart"), + .name = { .moveName = _("Take Heart") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_TAKE_HEART, .power = 0, @@ -14416,7 +14416,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_BLAST] = { - .name = _("Tera Blast"), + .name = { .moveName = _("Tera Blast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TERA_BLAST, .power = 80, @@ -14432,7 +14432,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILK_TRAP] = { - .name = _("Silk Trap"), + .name = { .moveName = _("Silk Trap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -14450,7 +14450,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AXE_KICK] = { - .name = _("Axe Kick"), + .name = { .moveName = _("Axe Kick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL_IF_MISS, .power = 120, @@ -14471,9 +14471,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESPECTS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Last Respects"), + .name = { .moveName = _("Last Respects") }, #else - .name = _("LastRespects"), + .name = { .moveName = _("LastRespects") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_LAST_RESPECTS @@ -14489,7 +14489,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUMINA_CRASH] = { - .name = _("Lumina Crash"), + .name = { .moveName = _("Lumina Crash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -14508,7 +14508,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORDER_UP] = { - .name = _("Order Up"), + .name = { .moveName = _("Order Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_ORDER_UP .power = 80, @@ -14525,7 +14525,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JET_PUNCH] = { - .name = _("Jet Punch"), + .name = { .moveName = _("Jet Punch") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -14544,9 +14544,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPICY_EXTRACT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Spicy Extract"), + .name = { .moveName = _("Spicy Extract") }, #else - .name = _("SpicyExtract"), + .name = { .moveName = _("SpicyExtract") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SPICY_EXTRACT @@ -14563,7 +14563,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIN_OUT] = { - .name = _("Spin Out"), + .name = { .moveName = _("Spin Out") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -14584,9 +14584,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POPULATION_BOMB] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Population Bomb"), + .name = { .moveName = _("Population Bomb") }, #else - .name = _("PoplatinBomb"), + .name = { .moveName = _("PoplatinBomb") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_POPULATION_BOMB, @@ -14605,7 +14605,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SPINNER] = { - .name = _("Ice Spinner"), + .name = { .moveName = _("Ice Spinner") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 80, @@ -14622,7 +14622,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLAIVE_RUSH] = { - .name = _("Glaive Rush"), + .name = { .moveName = _("Glaive Rush") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_GLAIVE_RUSH, .power = 120, @@ -14639,9 +14639,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVIVAL_BLESSING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Revival Blessing"), + .name = { .moveName = _("Revival Blessing") }, #else - .name = _("RevivlBlesng"), + .name = { .moveName = _("RevivlBlesng") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_REVIVAL_BLESSING, @@ -14661,7 +14661,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SALT_CURE] = { - .name = _("Salt Cure"), + .name = { .moveName = _("Salt Cure") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SALT_CURE, .power = 40, @@ -14677,7 +14677,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_DIVE] = { - .name = _("Triple Dive"), + .name = { .moveName = _("Triple Dive") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 30, @@ -14693,7 +14693,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORTAL_SPIN] = { - .name = _("Mortal Spin"), + .name = { .moveName = _("Mortal Spin") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 30, @@ -14717,7 +14717,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOODLE] = { - .name = _("Doodle"), + .name = { .moveName = _("Doodle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_DOODLE, .power = 0, @@ -14734,7 +14734,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FILLET_AWAY] = { - .name = _("Fillet Away"), + .name = { .moveName = _("Fillet Away") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FILLET_AWAY, .power = 0, @@ -14754,9 +14754,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KOWTOW_CLEAVE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Kowtow Cleave"), + .name = { .moveName = _("Kowtow Cleave") }, #else - .name = _("KowtowCleave"), + .name = { .moveName = _("KowtowCleave") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -14773,7 +14773,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_TRICK] = { - .name = _("Flower Trick"), + .name = { .moveName = _("Flower Trick") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -14788,7 +14788,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORCH_SONG] = { - .name = _("Torch Song"), + .name = { .moveName = _("Torch Song") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -14810,7 +14810,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_STEP] = { - .name = _("Aqua Step"), + .name = { .moveName = _("Aqua Step") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 80, @@ -14832,7 +14832,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_BULL] = { - .name = _("Raging Bull"), + .name = { .moveName = _("Raging Bull") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAGING_BULL, .power = 90, @@ -14848,7 +14848,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAKE_IT_RAIN] = { - .name = _("Make It Rain"), + .name = { .moveName = _("Make It Rain") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -14870,7 +14870,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RUINATION] = { - .name = _("Ruination"), + .name = { .moveName = _("Ruination") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, @@ -14886,9 +14886,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COLLISION_COURSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Colision Course"), + .name = { .moveName = _("Colision Course") }, #else - .name = _("ColisinCours"), + .name = { .moveName = _("ColisinCours") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COLLISION_COURSE, @@ -14906,9 +14906,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_DRIFT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Electro Drift"), + .name = { .moveName = _("Electro Drift") }, #else - .name = _("ElectroDrift"), + .name = { .moveName = _("ElectroDrift") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_COLLISION_COURSE, @@ -14925,7 +14925,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHED_TAIL] = { - .name = _("Shed Tail"), + .name = { .moveName = _("Shed Tail") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SHED_TAIL .power = 0, @@ -14944,9 +14944,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLY_RECEPTION] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Chilly Reception"), + .name = { .moveName = _("Chilly Reception") }, #else - .name = _("ChilReceptin"), + .name = { .moveName = _("ChilReceptin") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_CHILLY_RECEPTION, @@ -14965,7 +14965,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TIDY_UP] = { - .name = _("Tidy Up"), + .name = { .moveName = _("Tidy Up") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TIDY_UP .power = 0, @@ -14982,7 +14982,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNOWSCAPE] = { - .name = _("Snowscape"), + .name = { .moveName = _("Snowscape") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SNOWSCAPE, .power = 0, @@ -15000,7 +15000,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUNCE] = { - .name = _("Pounce"), + .name = { .moveName = _("Pounce") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -15021,7 +15021,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRAILBLAZE] = { - .name = _("Trailblaze"), + .name = { .moveName = _("Trailblaze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 50, @@ -15043,9 +15043,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLING_WATER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Chilling Water"), + .name = { .moveName = _("Chilling Water") }, #else - .name = _("ChillingWatr"), + .name = { .moveName = _("ChillingWatr") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15065,7 +15065,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_DRILL] = { - .name = _("Hyper Drill"), + .name = { .moveName = _("Hyper Drill") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 100, @@ -15082,7 +15082,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWIN_BEAM] = { - .name = _("Twin Beam"), + .name = { .moveName = _("Twin Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 40, @@ -15098,7 +15098,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_FIST] = { - .name = _("Rage Fist"), + .name = { .moveName = _("Rage Fist") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RAGE_FIST, .power = 50, @@ -15115,7 +15115,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARMOR_CANNON] = { - .name = _("Armor Cannon"), + .name = { .moveName = _("Armor Cannon") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 120, @@ -15134,7 +15134,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_BLADE] = { - .name = _("Bitter Blade"), + .name = { .moveName = _("Bitter Blade") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, .power = 90, @@ -15151,7 +15151,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SHOCK] = { - .name = _("Double Shock"), + .name = { .moveName = _("Double Shock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FAIL_IF_NOT_ARG_TYPE, .power = 120, @@ -15173,9 +15173,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGATON_HAMMER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Gigaton Hammer"), + .name = { .moveName = _("Gigaton Hammer") }, #else - .name = _("GigatonHammr"), + .name = { .moveName = _("GigatonHammr") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15191,7 +15191,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMEUPPANCE] = { - .name = _("Comeuppance"), + .name = { .moveName = _("Comeuppance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METAL_BURST, .power = 1, @@ -15208,7 +15208,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_CUTTER] = { - .name = _("Aqua Cutter"), + .name = { .moveName = _("Aqua Cutter") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 70, @@ -15225,9 +15225,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZING_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Blazing Torque"), + .name = { .moveName = _("Blazing Torque") }, #else - .name = _("BlazngTorque"), + .name = { .moveName = _("BlazngTorque") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15258,9 +15258,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Wicked Torque"), + .name = { .moveName = _("Wicked Torque") }, #else - .name = _("WickedTorque"), + .name = { .moveName = _("WickedTorque") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15291,9 +15291,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOXIOUS_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Noxius Torque"), + .name = { .moveName = _("Noxius Torque") }, #else - .name = _("NoxiusTorque"), + .name = { .moveName = _("NoxiusTorque") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15324,9 +15324,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMBAT_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Combat Torque"), + .name = { .moveName = _("Combat Torque") }, #else - .name = _("CombatTorque"), + .name = { .moveName = _("CombatTorque") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15357,9 +15357,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Magical Torque"), + .name = { .moveName = _("Magical Torque") }, #else - .name = _("MagiclTorque"), + .name = { .moveName = _("MagiclTorque") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15389,7 +15389,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBLADE] = { - .name = _("Psyblade"), + .name = { .moveName = _("Psyblade") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PSYBLADE, .power = 80, @@ -15405,7 +15405,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_STEAM] = { - .name = _("Hydro Steam"), + .name = { .moveName = _("Hydro Steam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HYDRO_STEAM, .power = 80, @@ -15420,7 +15420,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOOD_MOON] = { - .name = _("Blood Moon"), + .name = { .moveName = _("Blood Moon") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 140, @@ -15436,9 +15436,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MATCHA_GOTCHA] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Matcha Gotcha"), + .name = { .moveName = _("Matcha Gotcha") }, #else - .name = _("MatchaGotcha"), + .name = { .moveName = _("MatchaGotcha") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_ABSORB, @@ -15460,7 +15460,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYRUP_BOMB] = { - .name = _("Syrup Bomb"), + .name = { .moveName = _("Syrup Bomb") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 60, @@ -15480,7 +15480,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IVY_CUDGEL] = { - .name = _("Ivy Cudgel"), + .name = { .moveName = _("Ivy Cudgel") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_IVY_CUDGEL, .power = 100, @@ -15496,7 +15496,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_SHOT] = { - .name = _("Electro Shot"), + .name = { .moveName = _("Electro Shot") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_METEOR_BEAM, .power = 130, @@ -15517,9 +15517,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_STARSTORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Tera Starstorm"), + .name = { .moveName = _("Tera Starstorm") }, #else - .name = _("TeraStarstrm"), + .name = { .moveName = _("TeraStarstrm") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_TERA_STARSTORM @@ -15538,7 +15538,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FICKLE_BEAM] = { - .name = _("Fickle Beam"), + .name = { .moveName = _("Fickle Beam") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_FICKLE_BEAM, .power = 80, @@ -15553,9 +15553,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_BULWARK] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Burning Bulwark"), + .name = { .moveName = _("Burning Bulwark") }, #else - .name = _("BurnngBulwrk"), + .name = { .moveName = _("BurnngBulwrk") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, @@ -15577,7 +15577,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERCLAP] = { - .name = _("Thunderclap"), + .name = { .moveName = _("Thunderclap") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUCKER_PUNCH, .power = 70, @@ -15592,9 +15592,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIGHTY_CLEAVE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Mighty Cleave"), + .name = { .moveName = _("Mighty Cleave") }, #else - .name = _("MightyCleave"), + .name = { .moveName = _("MightyCleave") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15613,9 +15613,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACHYON_CUTTER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Tachyon Cutter"), + .name = { .moveName = _("Tachyon Cutter") }, #else - .name = _("TachyonCuttr"), + .name = { .moveName = _("TachyonCuttr") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15632,7 +15632,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARD_PRESS] = { - .name = _("Hard Press"), + .name = { .moveName = _("Hard Press") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_WRING_OUT, .power = 1, @@ -15647,7 +15647,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CHEER] = { - .name = _("Dragon Cheer"), + .name = { .moveName = _("Dragon Cheer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_DRAGON_CHEER .power = 0, @@ -15663,9 +15663,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLURING_VOICE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Alluring Voice"), + .name = { .moveName = _("Alluring Voice") }, #else - .name = _("AllurngVoice"), + .name = { .moveName = _("AllurngVoice") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15688,7 +15688,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEMPER_FLARE] = { - .name = _("Temper Flare"), + .name = { .moveName = _("Temper Flare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, @@ -15704,9 +15704,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERCELL_SLAM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Supercell Slam"), + .name = { .moveName = _("Supercell Slam") }, #else - .name = _("SuprcellSlam"), + .name = { .moveName = _("SuprcellSlam") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_RECOIL_IF_MISS, @@ -15723,9 +15723,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_NOISE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Psychic Noise"), + .name = { .moveName = _("Psychic Noise") }, #else - .name = _("PsychicNoise"), + .name = { .moveName = _("PsychicNoise") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_PSYCHIC_NOISE @@ -15742,7 +15742,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPPER_HAND] = { - .name = _("Upper Hand"), + .name = { .moveName = _("Upper Hand") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PLACEHOLDER, //EFFECT_UPPER_HAND .power = 65, @@ -15758,9 +15758,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MALIGNANT_CHAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = _("Malignant Chain"), + .name = { .moveName = _("Malignant Chain") }, #else - .name = _("MalignntChan"), + .name = { .moveName = _("MalignntChan") }, #endif .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, @@ -15780,7 +15780,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = // Z-Moves [MOVE_BREAKNECK_BLITZ] = { - .name = _("Breakneck Blitz"), + .name = { .zMoveName = _("Breakneck Blitz") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15793,7 +15793,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ALL_OUT_PUMMELING] = { - .name = _("All Out Pummeling"), + .name = { .zMoveName = _("All Out Pummeling") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15806,7 +15806,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUPERSONIC_SKYSTRIKE] = { - .name = _("Supersonic Skystrike"), + .name = { .zMoveName = _("Supersonic Skystrike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15819,7 +15819,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ACID_DOWNPOUR] = { - .name = _("Acid Downpour"), + .name = { .zMoveName = _("Acid Downpour") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15832,7 +15832,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TECTONIC_RAGE] = { - .name = _("Tectonic Rage"), + .name = { .zMoveName = _("Tectonic Rage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15846,7 +15846,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CONTINENTAL_CRUSH] = { - .name = _("Continental Crush"), + .name = { .zMoveName = _("Continental Crush") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15859,7 +15859,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SAVAGE_SPIN_OUT] = { - .name = _("Savage Spin Out"), + .name = { .zMoveName = _("Savage Spin Out") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15872,7 +15872,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_NEVER_ENDING_NIGHTMARE] = { - .name = _("Never Ending Nightmare"), + .name = { .zMoveName = _("Never Ending Nightmare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15885,7 +15885,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CORKSCREW_CRASH] = { - .name = _("Corkscrew Crash"), + .name = { .zMoveName = _("Corkscrew Crash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15898,7 +15898,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_INFERNO_OVERDRIVE] = { - .name = _("Inferno Overdrive"), + .name = { .zMoveName = _("Inferno Overdrive") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15911,7 +15911,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_HYDRO_VORTEX] = { - .name = _("Hydro Vortex"), + .name = { .zMoveName = _("Hydro Vortex") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15924,7 +15924,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLOOM_DOOM] = { - .name = _("Bloom Doom"), + .name = { .zMoveName = _("Bloom Doom") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15937,7 +15937,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GIGAVOLT_HAVOC] = { - .name = _("Gigavolt Havoc"), + .name = { .zMoveName = _("Gigavolt Havoc") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15950,7 +15950,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SHATTERED_PSYCHE] = { - .name = _("Shattered Psyche"), + .name = { .zMoveName = _("Shattered Psyche") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15963,7 +15963,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUBZERO_SLAMMER] = { - .name = _("Subzero Slammer"), + .name = { .zMoveName = _("Subzero Slammer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15976,7 +15976,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_DEVASTATING_DRAKE] = { - .name = _("Devastating Drake"), + .name = { .zMoveName = _("Devastating Drake") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15989,7 +15989,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLACK_HOLE_ECLIPSE] = { - .name = _("Black Hole Eclipse"), + .name = { .zMoveName = _("Black Hole Eclipse") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16002,7 +16002,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TWINKLE_TACKLE] = { - .name = _("Twinkle Tackle"), + .name = { .zMoveName = _("Twinkle Tackle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16015,7 +16015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CATASTROPIKA] = { - .name = _("Catastropika"), + .name = { .zMoveName = _("Catastropika") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 210, @@ -16028,7 +16028,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_10000000_VOLT_THUNDERBOLT] = { - .name = _("10000000 Volt Thunderbolt"), + .name = { .zMoveName = _("10000000 Volt Thunderbolt") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, @@ -16042,7 +16042,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_STOKED_SPARKSURFER] = { - .name = _("Stoked Sparksurfer"), + .name = { .zMoveName = _("Stoked Sparksurfer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 175, @@ -16059,7 +16059,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_EXTREME_EVOBOOST] = { - .name = _("Extreme Evoboost"), + .name = { .zMoveName = _("Extreme Evoboost") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, @@ -16072,7 +16072,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_PULVERIZING_PANCAKE] = { - .name = _("Pulverizing Pancake"), + .name = { .zMoveName = _("Pulverizing Pancake") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 210, @@ -16085,7 +16085,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GENESIS_SUPERNOVA] = { - .name = _("Genesis Supernova"), + .name = { .zMoveName = _("Genesis Supernova") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, @@ -16099,7 +16099,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SINISTER_ARROW_RAID] = { - .name = _("Sinister Arrow Raid"), + .name = { .zMoveName = _("Sinister Arrow Raid") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, @@ -16112,7 +16112,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MALICIOUS_MOONSAULT] = { - .name = _("Malicious Moonsault"), + .name = { .zMoveName = _("Malicious Moonsault") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, @@ -16125,7 +16125,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_OCEANIC_OPERETTA] = { - .name = _("Oceaning Operetta"), + .name = { .zMoveName = _("Oceaning Operetta") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, @@ -16138,7 +16138,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SPLINTERED_STORMSHARDS] = { - .name = _("Splintered Stormshards"), + .name = { .zMoveName = _("Splintered Stormshards") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, @@ -16152,7 +16152,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LETS_SNUGGLE_FOREVER] = { - .name = _("Let's Snuggle Forever"), + .name = { .zMoveName = _("Let's Snuggle Forever") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 190, @@ -16165,7 +16165,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CLANGOROUS_SOULBLAZE] = { - .name = _("Clangorous Soulblaze"), + .name = { .zMoveName = _("Clangorous Soulblaze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 185, @@ -16185,7 +16185,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GUARDIAN_OF_ALOLA] = { - .name = _("Guardian Of Alola"), + .name = { .zMoveName = _("Guardian Of Alola") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, @@ -16198,7 +16198,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SEARING_SUNRAZE_SMASH] = { - .name = _("Searing Sunraze Smash"), + .name = { .zMoveName = _("Searing Sunraze Smash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16211,7 +16211,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { - .name = _("Menacing Moonraze Maelstrom"), + .name = { .zMoveName = _("Menacing Moonraze Maelstrom") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16224,7 +16224,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { - .name = _("Light That Burns The Sky"), + .name = { .zMoveName = _("Light That Burns The Sky") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16237,7 +16237,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { - .name = _("Soul Stealing 7 Star Strike"), + .name = { .zMoveName = _("Soul Stealing 7 Star Strike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, @@ -16251,7 +16251,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { - .name = _("Max Guard"), + .name = { .zMoveName = _("Max Guard") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -16266,7 +16266,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { - .name = _("Max Flare"), + .name = { .zMoveName = _("Max Flare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16281,7 +16281,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { - .name = _("Max Flutterby"), + .name = { .zMoveName = _("Max Flutterby") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16296,7 +16296,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { - .name = _("Max Lightning"), + .name = { .zMoveName = _("Max Lightning") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16311,7 +16311,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { - .name = _("Max Strike"), + .name = { .zMoveName = _("Max Strike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16326,7 +16326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { - .name = _("Max Knuckle"), + .name = { .zMoveName = _("Max Knuckle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16341,7 +16341,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { - .name = _("Max Phantasm"), + .name = { .zMoveName = _("Max Phantasm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16356,7 +16356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { - .name = _("Max Hailstorm"), + .name = { .zMoveName = _("Max Hailstorm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16371,7 +16371,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { - .name = _("Max Ooze"), + .name = { .zMoveName = _("Max Ooze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16386,7 +16386,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { - .name = _("Max Geyser"), + .name = { .zMoveName = _("Max Geyser") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16401,7 +16401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { - .name = _("Max Airstream"), + .name = { .zMoveName = _("Max Airstream") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16416,7 +16416,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { - .name = _("Max Starfall"), + .name = { .zMoveName = _("Max Starfall") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16431,7 +16431,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { - .name = _("Max Wyrmwind"), + .name = { .zMoveName = _("Max Wyrmwind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16446,7 +16446,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { - .name = _("Max Mindstorm"), + .name = { .zMoveName = _("Max Mindstorm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16461,7 +16461,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { - .name = _("Max Rockfall"), + .name = { .zMoveName = _("Max Rockfall") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16476,7 +16476,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { - .name = _("Max Quake"), + .name = { .zMoveName = _("Max Quake") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16492,7 +16492,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { - .name = _("Max Darkness"), + .name = { .zMoveName = _("Max Darkness") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16507,7 +16507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { - .name = _("Max Overgrowth"), + .name = { .zMoveName = _("Max Overgrowth") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16522,7 +16522,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { - .name = _("Max Steelspike"), + .name = { .zMoveName = _("Max Steelspike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16537,7 +16537,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VINE_LASH] = { - .name = _("G-Max Vine Lash"), + .name = { .zMoveName = _("G-Max Vine Lash") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16552,7 +16552,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { - .name = _("G-Max Wildfire"), + .name = { .zMoveName = _("G-Max Wildfire") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16567,7 +16567,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CANNONADE] = { - .name = _("G-Max Canonade"), + .name = { .zMoveName = _("G-Max Canonade") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16582,7 +16582,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { - .name = _("G-Max Befuddle"), + .name = { .zMoveName = _("G-Max Befuddle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16597,7 +16597,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { - .name = _("G-Max Volt Crash"), + .name = { .zMoveName = _("G-Max Volt Crash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16612,7 +16612,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { - .name = _("G-Max Gold Rush"), + .name = { .zMoveName = _("G-Max Gold Rush") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16627,7 +16627,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { - .name = _("G-Max Chi Strike"), + .name = { .zMoveName = _("G-Max Chi Strike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16642,7 +16642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { - .name = _("G-Max Terror"), + .name = { .zMoveName = _("G-Max Terror") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16657,7 +16657,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { - .name = _("G-Max Foam Burst"), + .name = { .zMoveName = _("G-Max Foam Burst") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16672,7 +16672,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { - .name = _("G-Max Resonance"), + .name = { .zMoveName = _("G-Max Resonance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16687,7 +16687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { - .name = _("G-Max Cuddle"), + .name = { .zMoveName = _("G-Max Cuddle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16702,7 +16702,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { - .name = _("G-Max Replenish"), + .name = { .zMoveName = _("G-Max Replenish") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16717,7 +16717,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { - .name = _("G-Max Malodor"), + .name = { .zMoveName = _("G-Max Malodor") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16732,7 +16732,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { - .name = _("G-Max Meltdown"), + .name = { .zMoveName = _("G-Max Meltdown") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16747,7 +16747,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DRUM_SOLO] = { - .name = _("G-Max Drum Solo"), + .name = { .zMoveName = _("G-Max Drum Solo") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16763,7 +16763,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FIREBALL] = { - .name = _("G-Max Fireball"), + .name = { .zMoveName = _("G-Max Fireball") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16779,7 +16779,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_HYDROSNIPE] = { - .name = _("G-Max Hydrosnipe"), + .name = { .zMoveName = _("G-Max Hydrosnipe") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16795,7 +16795,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { - .name = _("G-Max Wind Rage"), + .name = { .zMoveName = _("G-Max Wind Rage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16810,7 +16810,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { - .name = _("G-Max Gravitas"), + .name = { .zMoveName = _("G-Max Gravitas") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16825,7 +16825,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { - .name = _("G-Max Stonesurge"), + .name = { .zMoveName = _("G-Max Stonesurge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16840,7 +16840,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { - .name = _("G-Max Volcalith"), + .name = { .zMoveName = _("G-Max Volcalith") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16855,7 +16855,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { - .name = _("G-Max Tartness"), + .name = { .zMoveName = _("G-Max Tartness") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16870,7 +16870,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { - .name = _("G-Max Sweetness"), + .name = { .zMoveName = _("G-Max Sweetness") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16885,7 +16885,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { - .name = _("G-Max Sandblast"), + .name = { .zMoveName = _("G-Max Sandblast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16900,7 +16900,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { - .name = _("G-Max Stun Shock"), + .name = { .zMoveName = _("G-Max Stun Shock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16915,7 +16915,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { - .name = _("G-Max Centiferno"), + .name = { .zMoveName = _("G-Max Centiferno") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16930,7 +16930,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { - .name = _("G-Max Smite"), + .name = { .zMoveName = _("G-Max Smite") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16946,7 +16946,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { - .name = _("G-Max Snooze"), + .name = { .zMoveName = _("G-Max Snooze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16961,7 +16961,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { - .name = _("G-Max Finale"), + .name = { .zMoveName = _("G-Max Finale") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16976,7 +16976,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { - .name = _("G-Max Steelsurge"), + .name = { .zMoveName = _("G-Max Steelsurge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16991,7 +16991,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { - .name = _("G-Max Depletion"), + .name = { .zMoveName = _("G-Max Depletion") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17006,7 +17006,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { - .name = _("G-Max One Blow"), + .name = { .zMoveName = _("G-Max One Blow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17021,7 +17021,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RAPID_FLOW] = { - .name = _("G-Max Rapid Flow"), + .name = { .zMoveName = _("G-Max Rapid Flow") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, diff --git a/src/data/party_menu.h b/src/data/party_menu.h index bc2a423efbb7..0072afc890d4 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -719,20 +719,20 @@ struct [MENU_CATALOG_MOWER] = {gText_LawnMower, CursorCb_CatalogMower}, [MENU_CHANGE_FORM] = {gText_ChangeForm, CursorCb_ChangeForm}, [MENU_CHANGE_ABILITY] = {gText_ChangeAbility, CursorCb_ChangeAbility}, - [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gBattleMoves[MOVE_CUT].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gBattleMoves[MOVE_FLASH].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gBattleMoves[MOVE_ROCK_SMASH].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gBattleMoves[MOVE_STRENGTH].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gBattleMoves[MOVE_SURF].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gBattleMoves[MOVE_FLY].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gBattleMoves[MOVE_DIVE].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gBattleMoves[MOVE_WATERFALL].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gBattleMoves[MOVE_TELEPORT].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gBattleMoves[MOVE_DIG].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gBattleMoves[MOVE_SECRET_POWER].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gBattleMoves[MOVE_MILK_DRINK].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gBattleMoves[MOVE_SOFT_BOILED].name, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gBattleMoves[MOVE_SWEET_SCENT].name, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gBattleMoves[MOVE_CUT].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gBattleMoves[MOVE_FLASH].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gBattleMoves[MOVE_ROCK_SMASH].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gBattleMoves[MOVE_STRENGTH].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gBattleMoves[MOVE_SURF].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gBattleMoves[MOVE_FLY].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gBattleMoves[MOVE_DIVE].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gBattleMoves[MOVE_WATERFALL].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gBattleMoves[MOVE_TELEPORT].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gBattleMoves[MOVE_DIG].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gBattleMoves[MOVE_SECRET_POWER].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gBattleMoves[MOVE_MILK_DRINK].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gBattleMoves[MOVE_SOFT_BOILED].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gBattleMoves[MOVE_SWEET_SCENT].name.moveName, CursorCb_FieldMove}, }; static const u8 sPartyMenuAction_SummarySwitchCancel[] = {MENU_SUMMARY, MENU_SWITCH, MENU_CANCEL1}; diff --git a/src/pokemon.c b/src/pokemon.c index c883dba2b792..9336ece2cb28 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6426,5 +6426,8 @@ u16 GetSpeciesPreEvolution(u16 species) const u8 *GetBattleMoveName(u16 moveId) { - return gBattleMoves[moveId].name; + if (IsZMove(moveId)) + return gBattleMoves[moveId].name.zMoveName; + + return gBattleMoves[moveId].name.moveName; } From 3e9ff66b270d048fd5ccf2ab4a18f283dfd358aa Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 24 Jan 2024 08:45:59 -0300 Subject: [PATCH 11/30] Fixed the union for gBattleMoves move names Also updated GetBattleMoveName to properly handle Max Move names. Also also renamed the "zMoveName" variable to "bigMoveName" which better reflects its purpose. Z-Move names weren't the only thing it covered, since it also handles Max Move names. --- include/pokemon.h | 2 +- src/data/battle_moves.h | 174 ++++++++++++++++++++-------------------- src/pokemon.c | 4 +- 3 files changed, 90 insertions(+), 90 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index 3b1d3db96ee4..6dc5329ce9aa 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -446,7 +446,7 @@ struct BattleMove { union { u8 moveName[MOVE_NAME_LENGTH + 1]; - u8 zMoveName[Z_MOVE_NAME_LENGTH + 1]; + const u8 *bigMoveName; } name; const u8 *description; u16 effect; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 7e6e8362b6b1..e3ddeeb1f7ff 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -15780,7 +15780,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = // Z-Moves [MOVE_BREAKNECK_BLITZ] = { - .name = { .zMoveName = _("Breakneck Blitz") }, + .name = { .bigMoveName = COMPOUND_STRING("Breakneck Blitz") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15793,7 +15793,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ALL_OUT_PUMMELING] = { - .name = { .zMoveName = _("All Out Pummeling") }, + .name = { .bigMoveName = COMPOUND_STRING("All Out Pummeling") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15806,7 +15806,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUPERSONIC_SKYSTRIKE] = { - .name = { .zMoveName = _("Supersonic Skystrike") }, + .name = { .bigMoveName = COMPOUND_STRING("Supersonic Skystrike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15819,7 +15819,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ACID_DOWNPOUR] = { - .name = { .zMoveName = _("Acid Downpour") }, + .name = { .bigMoveName = COMPOUND_STRING("Acid Downpour") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15832,7 +15832,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TECTONIC_RAGE] = { - .name = { .zMoveName = _("Tectonic Rage") }, + .name = { .bigMoveName = COMPOUND_STRING("Tectonic Rage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15846,7 +15846,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CONTINENTAL_CRUSH] = { - .name = { .zMoveName = _("Continental Crush") }, + .name = { .bigMoveName = COMPOUND_STRING("Continental Crush") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15859,7 +15859,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SAVAGE_SPIN_OUT] = { - .name = { .zMoveName = _("Savage Spin Out") }, + .name = { .bigMoveName = COMPOUND_STRING("Savage Spin Out") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15872,7 +15872,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_NEVER_ENDING_NIGHTMARE] = { - .name = { .zMoveName = _("Never Ending Nightmare") }, + .name = { .bigMoveName = COMPOUND_STRING("Never Ending Nightmare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15885,7 +15885,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CORKSCREW_CRASH] = { - .name = { .zMoveName = _("Corkscrew Crash") }, + .name = { .bigMoveName = COMPOUND_STRING("Corkscrew Crash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15898,7 +15898,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_INFERNO_OVERDRIVE] = { - .name = { .zMoveName = _("Inferno Overdrive") }, + .name = { .bigMoveName = COMPOUND_STRING("Inferno Overdrive") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15911,7 +15911,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_HYDRO_VORTEX] = { - .name = { .zMoveName = _("Hydro Vortex") }, + .name = { .bigMoveName = COMPOUND_STRING("Hydro Vortex") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15924,7 +15924,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLOOM_DOOM] = { - .name = { .zMoveName = _("Bloom Doom") }, + .name = { .bigMoveName = COMPOUND_STRING("Bloom Doom") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15937,7 +15937,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GIGAVOLT_HAVOC] = { - .name = { .zMoveName = _("Gigavolt Havoc") }, + .name = { .bigMoveName = COMPOUND_STRING("Gigavolt Havoc") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15950,7 +15950,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SHATTERED_PSYCHE] = { - .name = { .zMoveName = _("Shattered Psyche") }, + .name = { .bigMoveName = COMPOUND_STRING("Shattered Psyche") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15963,7 +15963,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUBZERO_SLAMMER] = { - .name = { .zMoveName = _("Subzero Slammer") }, + .name = { .bigMoveName = COMPOUND_STRING("Subzero Slammer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15976,7 +15976,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_DEVASTATING_DRAKE] = { - .name = { .zMoveName = _("Devastating Drake") }, + .name = { .bigMoveName = COMPOUND_STRING("Devastating Drake") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -15989,7 +15989,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLACK_HOLE_ECLIPSE] = { - .name = { .zMoveName = _("Black Hole Eclipse") }, + .name = { .bigMoveName = COMPOUND_STRING("Black Hole Eclipse") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16002,7 +16002,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TWINKLE_TACKLE] = { - .name = { .zMoveName = _("Twinkle Tackle") }, + .name = { .bigMoveName = COMPOUND_STRING("Twinkle Tackle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 1, @@ -16015,7 +16015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CATASTROPIKA] = { - .name = { .zMoveName = _("Catastropika") }, + .name = { .bigMoveName = COMPOUND_STRING("Catastropika") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 210, @@ -16028,7 +16028,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_10000000_VOLT_THUNDERBOLT] = { - .name = { .zMoveName = _("10000000 Volt Thunderbolt") }, + .name = { .bigMoveName = COMPOUND_STRING("10000000 Volt Thunderbolt") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, @@ -16042,7 +16042,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_STOKED_SPARKSURFER] = { - .name = { .zMoveName = _("Stoked Sparksurfer") }, + .name = { .bigMoveName = COMPOUND_STRING("Stoked Sparksurfer") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 175, @@ -16059,7 +16059,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_EXTREME_EVOBOOST] = { - .name = { .zMoveName = _("Extreme Evoboost") }, + .name = { .bigMoveName = COMPOUND_STRING("Extreme Evoboost") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, @@ -16072,7 +16072,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_PULVERIZING_PANCAKE] = { - .name = { .zMoveName = _("Pulverizing Pancake") }, + .name = { .bigMoveName = COMPOUND_STRING("Pulverizing Pancake") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 210, @@ -16085,7 +16085,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GENESIS_SUPERNOVA] = { - .name = { .zMoveName = _("Genesis Supernova") }, + .name = { .bigMoveName = COMPOUND_STRING("Genesis Supernova") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, @@ -16099,7 +16099,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SINISTER_ARROW_RAID] = { - .name = { .zMoveName = _("Sinister Arrow Raid") }, + .name = { .bigMoveName = COMPOUND_STRING("Sinister Arrow Raid") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, @@ -16112,7 +16112,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MALICIOUS_MOONSAULT] = { - .name = { .zMoveName = _("Malicious Moonsault") }, + .name = { .bigMoveName = COMPOUND_STRING("Malicious Moonsault") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 180, @@ -16125,7 +16125,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_OCEANIC_OPERETTA] = { - .name = { .zMoveName = _("Oceaning Operetta") }, + .name = { .bigMoveName = COMPOUND_STRING("Oceaning Operetta") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, @@ -16138,7 +16138,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SPLINTERED_STORMSHARDS] = { - .name = { .zMoveName = _("Splintered Stormshards") }, + .name = { .bigMoveName = COMPOUND_STRING("Splintered Stormshards") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, @@ -16152,7 +16152,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LETS_SNUGGLE_FOREVER] = { - .name = { .zMoveName = _("Let's Snuggle Forever") }, + .name = { .bigMoveName = COMPOUND_STRING("Let's Snuggle Forever") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 190, @@ -16165,7 +16165,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CLANGOROUS_SOULBLAZE] = { - .name = { .zMoveName = _("Clangorous Soulblaze") }, + .name = { .bigMoveName = COMPOUND_STRING("Clangorous Soulblaze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 185, @@ -16185,7 +16185,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GUARDIAN_OF_ALOLA] = { - .name = { .zMoveName = _("Guardian Of Alola") }, + .name = { .bigMoveName = COMPOUND_STRING("Guardian Of Alola") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_SUPER_FANG, .power = 1, @@ -16198,7 +16198,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SEARING_SUNRAZE_SMASH] = { - .name = { .zMoveName = _("Searing Sunraze Smash") }, + .name = { .bigMoveName = COMPOUND_STRING("Searing Sunraze Smash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16211,7 +16211,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { - .name = { .zMoveName = _("Menacing Moonraze Maelstrom") }, + .name = { .bigMoveName = COMPOUND_STRING("Menacing Moonraze Maelstrom") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16224,7 +16224,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { - .name = { .zMoveName = _("Light That Burns The Sky") }, + .name = { .bigMoveName = COMPOUND_STRING("Light That Burns The Sky") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 200, @@ -16237,7 +16237,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { - .name = { .zMoveName = _("Soul Stealing 7 Star Strike") }, + .name = { .bigMoveName = COMPOUND_STRING("Soul Stealing 7 Star Strike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_HIT, .power = 195, @@ -16251,7 +16251,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { - .name = { .zMoveName = _("Max Guard") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Guard") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_PROTECT, .power = 0, @@ -16266,7 +16266,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { - .name = { .zMoveName = _("Max Flare") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Flare") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16281,7 +16281,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { - .name = { .zMoveName = _("Max Flutterby") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Flutterby") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16296,7 +16296,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { - .name = { .zMoveName = _("Max Lightning") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Lightning") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16311,7 +16311,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { - .name = { .zMoveName = _("Max Strike") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Strike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16326,7 +16326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { - .name = { .zMoveName = _("Max Knuckle") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Knuckle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16341,7 +16341,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { - .name = { .zMoveName = _("Max Phantasm") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Phantasm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16356,7 +16356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { - .name = { .zMoveName = _("Max Hailstorm") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Hailstorm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16371,7 +16371,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { - .name = { .zMoveName = _("Max Ooze") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Ooze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16386,7 +16386,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { - .name = { .zMoveName = _("Max Geyser") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Geyser") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16401,7 +16401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { - .name = { .zMoveName = _("Max Airstream") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Airstream") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16416,7 +16416,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { - .name = { .zMoveName = _("Max Starfall") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Starfall") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16431,7 +16431,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { - .name = { .zMoveName = _("Max Wyrmwind") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Wyrmwind") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16446,7 +16446,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { - .name = { .zMoveName = _("Max Mindstorm") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Mindstorm") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16461,7 +16461,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { - .name = { .zMoveName = _("Max Rockfall") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Rockfall") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16476,7 +16476,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { - .name = { .zMoveName = _("Max Quake") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Quake") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16492,7 +16492,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { - .name = { .zMoveName = _("Max Darkness") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Darkness") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 1, @@ -16507,7 +16507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { - .name = { .zMoveName = _("Max Overgrowth") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Overgrowth") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16522,7 +16522,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { - .name = { .zMoveName = _("Max Steelspike") }, + .name = { .bigMoveName = COMPOUND_STRING("Max Steelspike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16537,7 +16537,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VINE_LASH] = { - .name = { .zMoveName = _("G-Max Vine Lash") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Vine Lash") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16552,7 +16552,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { - .name = { .zMoveName = _("G-Max Wildfire") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Wildfire") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16567,7 +16567,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CANNONADE] = { - .name = { .zMoveName = _("G-Max Canonade") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Canonade") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16582,7 +16582,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { - .name = { .zMoveName = _("G-Max Befuddle") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Befuddle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16597,7 +16597,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { - .name = { .zMoveName = _("G-Max Volt Crash") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Volt Crash") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16612,7 +16612,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { - .name = { .zMoveName = _("G-Max Gold Rush") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Gold Rush") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16627,7 +16627,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { - .name = { .zMoveName = _("G-Max Chi Strike") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Chi Strike") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16642,7 +16642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { - .name = { .zMoveName = _("G-Max Terror") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Terror") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16657,7 +16657,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { - .name = { .zMoveName = _("G-Max Foam Burst") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Foam Burst") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16672,7 +16672,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { - .name = { .zMoveName = _("G-Max Resonance") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Resonance") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16687,7 +16687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { - .name = { .zMoveName = _("G-Max Cuddle") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Cuddle") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16702,7 +16702,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { - .name = { .zMoveName = _("G-Max Replenish") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Replenish") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16717,7 +16717,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { - .name = { .zMoveName = _("G-Max Malodor") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Malodor") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16732,7 +16732,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { - .name = { .zMoveName = _("G-Max Meltdown") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Meltdown") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16747,7 +16747,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DRUM_SOLO] = { - .name = { .zMoveName = _("G-Max Drum Solo") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Drum Solo") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16763,7 +16763,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FIREBALL] = { - .name = { .zMoveName = _("G-Max Fireball") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Fireball") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16779,7 +16779,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_HYDROSNIPE] = { - .name = { .zMoveName = _("G-Max Hydrosnipe") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Hydrosnipe") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16795,7 +16795,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { - .name = { .zMoveName = _("G-Max Wind Rage") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Wind Rage") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16810,7 +16810,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { - .name = { .zMoveName = _("G-Max Gravitas") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Gravitas") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16825,7 +16825,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { - .name = { .zMoveName = _("G-Max Stonesurge") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Stonesurge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16840,7 +16840,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { - .name = { .zMoveName = _("G-Max Volcalith") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Volcalith") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16855,7 +16855,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { - .name = { .zMoveName = _("G-Max Tartness") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Tartness") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16870,7 +16870,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { - .name = { .zMoveName = _("G-Max Sweetness") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Sweetness") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16885,7 +16885,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { - .name = { .zMoveName = _("G-Max Sandblast") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Sandblast") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16900,7 +16900,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { - .name = { .zMoveName = _("G-Max Stun Shock") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Stun Shock") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16915,7 +16915,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { - .name = { .zMoveName = _("G-Max Centiferno") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Centiferno") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16930,7 +16930,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { - .name = { .zMoveName = _("G-Max Smite") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Smite") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16946,7 +16946,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { - .name = { .zMoveName = _("G-Max Snooze") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Snooze") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16961,7 +16961,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { - .name = { .zMoveName = _("G-Max Finale") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Finale") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16976,7 +16976,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { - .name = { .zMoveName = _("G-Max Steelsurge") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Steelsurge") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -16991,7 +16991,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { - .name = { .zMoveName = _("G-Max Depletion") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Depletion") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17006,7 +17006,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { - .name = { .zMoveName = _("G-Max One Blow") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max One Blow") }, .description = COMPOUND_STRING("Dummy2 description."), .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17021,7 +17021,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RAPID_FLOW] = { - .name = { .zMoveName = _("G-Max Rapid Flow") }, + .name = { .bigMoveName = COMPOUND_STRING("G-Max Rapid Flow") }, .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, diff --git a/src/pokemon.c b/src/pokemon.c index 9336ece2cb28..a52b236fb85f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6426,8 +6426,8 @@ u16 GetSpeciesPreEvolution(u16 species) const u8 *GetBattleMoveName(u16 moveId) { - if (IsZMove(moveId)) - return gBattleMoves[moveId].name.zMoveName; + if (IsZMove(moveId) || IsMaxMove(moveId)) + return gBattleMoves[moveId].name.bigMoveName; return gBattleMoves[moveId].name.moveName; } From 8fb3ea3b720cb8de82ca289a1fa93a4ea529817a Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 25 Jan 2024 08:10:53 -0300 Subject: [PATCH 12/30] Removed deprecated GetZMoveName and GetMaxMoveName --- include/battle_dynamax.h | 1 - include/battle_z_move.h | 1 - src/battle_dynamax.c | 6 ------ src/battle_message.c | 21 +++++++++------------ src/battle_z_move.c | 9 ++------- 5 files changed, 11 insertions(+), 27 deletions(-) diff --git a/include/battle_dynamax.h b/include/battle_dynamax.h index 18f0b1b3e31a..1e3f3265b741 100644 --- a/include/battle_dynamax.h +++ b/include/battle_dynamax.h @@ -71,7 +71,6 @@ bool32 ShouldUseMaxMove(u16 battlerId, u16 baseMove); u16 GetMaxMove(u16 battlerId, u16 baseMove); u8 GetMaxMovePower(u16 move); bool32 IsMaxMove(u16 move); -const u8 *GetMaxMoveName(u16 move); void ChooseDamageNonTypesString(u8 type); void BS_UpdateDynamax(void); diff --git a/include/battle_z_move.h b/include/battle_z_move.h index 3122b741b169..697bfa676ce4 100644 --- a/include/battle_z_move.h +++ b/include/battle_z_move.h @@ -22,7 +22,6 @@ void HideZMoveTriggerSprite(void); bool32 IsZMoveTriggerSpriteActive(void); void DestroyZMoveTriggerSprite(void); bool32 MoveSelectionDisplayZMove(u16 zmove, u32 battler); -const u8 *GetZMoveName(u16 move); void SetZEffect(void); bool32 IsZMoveUsable(u8 battler, u16 moveIndex); void GetUsableZMoves(u8 battler, u16 *moves); diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 0bbf2d8a6c63..d7a45424e275 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -486,12 +486,6 @@ bool32 IsMaxMove(u16 move) return move >= FIRST_MAX_MOVE && move <= LAST_MAX_MOVE; } -// Returns the full name of a Max Move for the move usage text. -const u8 *GetMaxMoveName(u16 move) -{ - return GetBattleMoveName(move); -} - // Assigns the multistring to use for the "Damage Non- Types" G-Max effect. void ChooseDamageNonTypesString(u8 type) { diff --git a/src/battle_message.c b/src/battle_message.c index 7ce78df32888..bd5af96b7cb5 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2931,15 +2931,12 @@ void BufferStringBattle(u16 stringID, u32 battler) } break; case STRINGID_USEDMOVE: // Pokémon used a move msg - if (gBattleStruct->zmove.active && gBattleStruct->zmove.activeCategory != BATTLE_CATEGORY_STATUS) - StringCopy(gBattleTextBuff3, GetZMoveName(gBattleMsgDataPtr->currentMove)); - else if (IsMaxMove(gBattleMsgDataPtr->currentMove)) - StringCopy(gBattleTextBuff3, GetMaxMoveName(gBattleMsgDataPtr->currentMove)); - else if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) + if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT + && !IsZMove(gBattleMsgDataPtr->currentMove) + && !IsMaxMove(gBattleMsgDataPtr->currentMove)) StringCopy(gBattleTextBuff3, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else StringCopy(gBattleTextBuff3, GetBattleMoveName(gBattleMsgDataPtr->currentMove)); - stringPtr = sText_AttackerUsedX; break; case STRINGID_BATTLEEND: // battle end @@ -3357,17 +3354,17 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler) break; case B_TXT_CURRENT_MOVE: // current move name - if (gBattleStruct->zmove.active) - toCpy = GetZMoveName(gBattleMsgDataPtr->currentMove); - else if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) + if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT + && !IsZMove(gBattleMsgDataPtr->currentMove) + && !IsMaxMove(gBattleMsgDataPtr->currentMove)) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else toCpy = GetBattleMoveName(gBattleMsgDataPtr->currentMove); break; case B_TXT_LAST_MOVE: // originally used move name - if (gBattleStruct->zmove.active) - toCpy = GetZMoveName(gBattleMsgDataPtr->originallyUsedMove); - else if (gBattleMsgDataPtr->originallyUsedMove >= MOVES_COUNT) + if (gBattleMsgDataPtr->originallyUsedMove >= MOVES_COUNT + && !IsZMove(gBattleMsgDataPtr->currentMove) + && !IsMaxMove(gBattleMsgDataPtr->currentMove)) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else toCpy = GetBattleMoveName(gBattleMsgDataPtr->originallyUsedMove); diff --git a/src/battle_z_move.c b/src/battle_z_move.c index ce2a029e9588..b2315b271959 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -493,12 +493,12 @@ bool32 MoveSelectionDisplayZMove(u16 zmove, u32 battler) // Damaging move -> status z move StringCopy(gDisplayedStringBattle, sText_StatsPlus2); BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3); - StringCopy(gDisplayedStringBattle, GetZMoveName(zmove)); + StringCopy(gDisplayedStringBattle, GetBattleMoveName(zmove)); } else { ZMoveSelectionDisplayPower(move, zmove); - StringCopy(gDisplayedStringBattle, GetZMoveName(zmove)); + StringCopy(gDisplayedStringBattle, GetBattleMoveName(zmove)); } BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_1); @@ -557,11 +557,6 @@ static void ZMoveSelectionDisplayMoveType(u16 zMove, u32 battler) BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_TYPE); } -const u8 *GetZMoveName(u16 move) -{ - return GetBattleMoveName(move); -} - #define Z_EFFECT_BS_LENGTH 5 // This function kinda cheats by setting a return battle script to after the setzeffect various command // and then jumping to a z effect script From a12ffd4d103d4abb615d4ba6d3ca1e70eded091b Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 25 Jan 2024 08:25:54 -0300 Subject: [PATCH 13/30] Reintroduced mention to gMoveNames in sGFRomHeader --- src/rom_header_gf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c index b620fef2993a..93939efadd3c 100644 --- a/src/rom_header_gf.c +++ b/src/rom_header_gf.c @@ -108,6 +108,7 @@ static const struct GFRomHeader sGFRomHeader = { //.monIconPaletteIds = gMonIconPaletteIndices, .monIconPalettes = gMonIconPaletteTable, //.monSpeciesNames = gSpeciesNames, // Handled in gSpeciesInfo + //.moveNames = gMoveNames, // Handled in gBattleMoves .decorations = gDecorations, .flagsOffset = offsetof(struct SaveBlock1, flags), .varsOffset = offsetof(struct SaveBlock1, vars), From cdfcbc7f744cae6e88af35fdccf2f9f1d68f59b6 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 25 Jan 2024 12:39:09 +0100 Subject: [PATCH 14/30] Fixed move names and ported move descriptions --- src/data/battle_moves.h | 2898 ++++++++++++++++++++++++++------------- 1 file changed, 1933 insertions(+), 965 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 9112f20e763a..5f3c15be7ebc 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -6,16 +6,104 @@ #include "constants/hold_effects.h" #include "constants/moves.h" +#if B_BINDING_TURNS >= GEN_5 +#define BINDING_TURNS "4 or 5" +#else +#define BINDING_TURNS "2 to 5" +#endif + const u8 gNotDoneYetDescription[] = _( "This move can't be used. Its\n" "effect is in development."); +static const u8 sNullDescription[] = _(""); + +static const u8 sMegaDrainDescription[] = _( + "An attack that absorbs\n" + "half the damage inflicted."); + +static const u8 sHyperBeamDescription[] = _( + "Powerful, but leaves the\n" + "user immobile the next turn."); + +static const u8 sRevengeDescription[] = _( + "An attack that gains power\n" + "if injured by the foe."); + +static const u8 sPluckDescription[] = _( + "Eats the foe's held Berry\n" + "gaining its effect."); + +static const u8 sHealingWishDescription[] = _( + "The user faints to heal up\n" + "the recipient."); + +static const u8 sWringOutDescription[] = _( + "The higher the foe's HP\n" + "the more damage caused."); + +static const u8 sUTurnDescription[] = _( + "Does damage then switches\n" + "out the user."); + +static const u8 sStormThrowDescription[] = _( + "This attack always results\n" + "in a critical hit."); + +static const u8 sCircleThrowDescription[] = _( + "Knocks the foe away to end\n" + "the battle."); + +static const u8 sChipAwayDescription[] = _( + "Strikes through the foe's\n" + "stat changes."); + +static const u8 sHeavySlamDescription[] = _( + "Does more damage if the\n" + "user outweighs the foe."); + +static const u8 sPsyshockDescription[] = _( + "Attacks with a psychic wave\n" + "that does physical damage."); + +static const u8 sLavaPlumeDescription[] = _( + "Scarlet flames torch\n" + "everything around the user."); + +static const u8 sShadowForceDescription[] = _( + "Vanishes on the first turn\n" + "then strikes the next turn."); + +static const u8 sFalseSwipeDescription[] = _( + "An attack that leaves the\n" + "foe with at least 1 HP."); + +static const u8 sDrainingKissDescription[] = _( + "An attack that absorbs over\n" + "half the damage inflicted."); + +static const u8 sCloseCombatDescription[] = _( + "A strong attack but lowers\n" + "the defensive stats."); + +static const u8 sHyperspaceHoleDescription[] = _( + "Uses a warp hole to attack.\n" + "Can't be evaded."); + +static const u8 sSuckerPunchDescription[] = _( + "Strikes first if the foe\n" + "is preparing an attack."); + +static const u8 sFeintDescription[] = _( + "An attack that hits foes\n" + "using moves like Protect."); + const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { .name = { .moveName = _("-") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING(""), .effect = EFFECT_HIT, .power = 0, .type = TYPE_NORMAL, @@ -32,7 +120,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUND] = { .name = { .moveName = _("Pound") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Pounds the foe with\n" + "forelegs or tail."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -48,7 +137,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KARATE_CHOP] = { .name = { .moveName = _("Karate Chop") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A chopping attack with a\n" + "high critical-hit ratio."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_FIGHTING, @@ -64,7 +154,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SLAP] = { .name = { .moveName = _("Double Slap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Repeatedly slaps the foe\n" + "2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -79,7 +170,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMET_PUNCH] = { .name = { .moveName = _("Comet Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Repeatedly punches the foe\n" + "2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -95,7 +187,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_PUNCH] = { .name = { .moveName = _("Mega Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A strong punch thrown with\n" + "incredible power."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -111,7 +204,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAY_DAY] = { .name = { .moveName = _("Pay Day") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Throws coins at the foe.\n" + "Money is recovered after."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -128,7 +222,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PUNCH] = { .name = { .moveName = _("Fire Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A fiery punch that may burn\n" + "the foe."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_FIRE, @@ -149,7 +244,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_PUNCH] = { .name = { .moveName = _("Ice Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An icy punch that may\n" + #if B_USE_FROSTBITE == TRUE + "leave the foe with frostbite."), + #else + "freeze the foe."), + #endif .effect = EFFECT_HIT, .power = 75, .type = TYPE_ICE, @@ -169,8 +269,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_PUNCH] = { - .name = { .moveName = _("ThunderPunch") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Thunder Punch") }, + #else + .name = { .moveName = _("ThunderPunch") }, + #endif + .description = COMPOUND_STRING("An electrified punch that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_ELECTRIC, @@ -191,7 +296,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCRATCH] = { .name = { .moveName = _("Scratch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Scratches the foe with\n" + "sharp claws."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -206,7 +312,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VISE_GRIP] = { .name = { .moveName = _("Vise Grip") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Grips the foe with large and\n" + "powerful pincers."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_NORMAL, @@ -221,7 +328,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUILLOTINE] = { .name = { .moveName = _("Guillotine") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A powerful pincer attack\n" + "that may cause fainting."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -236,7 +344,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_WIND] = { .name = { .moveName = _("Razor Wind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A 2-turn move that strikes\n" + "the foe on the 2nd turn."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -255,7 +364,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWORDS_DANCE] = { .name = { .moveName = _("Swords Dance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A fighting dance that\n" + "sharply raises Attack."), .effect = EFFECT_ATTACK_UP_2, .power = 0, .type = TYPE_NORMAL, @@ -272,7 +382,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CUT] = { .name = { .moveName = _("Cut") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Cuts the foe with sharp\n" + "scythes, claws, etc."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_NORMAL, @@ -288,7 +399,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUST] = { .name = { .moveName = _("Gust") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes the foe with a gust\n" + "of wind whipped up by wings."), .effect = EFFECT_GUST, .power = 40, .type = TYPE_FLYING, @@ -305,7 +417,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WING_ATTACK] = { .name = { .moveName = _("Wing Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes the foe with wings\n" + "spread wide."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -320,7 +433,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLWIND] = { .name = { .moveName = _("Whirlwind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Blows away the foe with\n" + "wind and ends the battle."), .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -341,7 +455,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLY] = { .name = { .moveName = _("Fly") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Flies up on the first turn,\n" + "then strikes the next turn."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 90 : 70, .type = TYPE_FLYING, @@ -361,7 +476,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIND] = { .name = { .moveName = _("Bind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Binds and squeezes the foe\n" + "for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = 15, .type = TYPE_NORMAL, @@ -380,7 +496,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLAM] = { .name = { .moveName = _("Slam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slams the foe with a long\n" + "tail, vine, etc."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -396,7 +513,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VINE_WHIP] = { .name = { .moveName = _("Vine Whip") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes the foe with\n" + "slender, whiplike vines."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 25, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -417,7 +535,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMP] = { .name = { .moveName = _("Stomp") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stomps the enemy with a big\n" + "foot. May cause flinching."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_NORMAL, @@ -439,7 +558,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_KICK] = { .name = { .moveName = _("Double Kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A double-kicking attack\n" + "that strikes the foe twice."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_FIGHTING, @@ -455,7 +575,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_KICK] = { .name = { .moveName = _("Mega Kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An extremely powerful kick\n" + "with intense force."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -470,7 +591,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUMP_KICK] = { .name = { .moveName = _("Jump Kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A strong jumping kick. May\n" + "miss and hurt the kicker."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 100, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -492,7 +614,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLING_KICK] = { .name = { .moveName = _("Rolling Kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A fast kick delivered from\n" + "a rapid spin."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -513,7 +636,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_ATTACK] = { .name = { .moveName = _("Sand Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Reduces the foe's accuracy\n" + "by hurling sand in its face."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_GROUND, @@ -529,7 +653,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADBUTT] = { .name = { .moveName = _("Headbutt") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A ramming attack that may\n" + "cause flinching."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -549,7 +674,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_ATTACK] = { .name = { .moveName = _("Horn Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Jabs the foe with sharp\n" + "horns."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_NORMAL, @@ -564,7 +690,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_ATTACK] = { .name = { .moveName = _("Fury Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Jabs the foe 2 to 5 times\n" + "with sharp horns, etc."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -579,7 +706,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_DRILL] = { .name = { .moveName = _("Horn Drill") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A one-hit KO attack that\n" + "uses a horn like a drill."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -594,7 +722,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACKLE] = { .name = { .moveName = _("Tackle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Charges the foe with a full-\n" + "body tackle."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 40, #elif B_UPDATED_MOVE_DATA >= GEN_5 @@ -615,7 +744,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_SLAM] = { .name = { .moveName = _("Body Slam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A full-body slam that may\n" + "cause paralysis."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_NORMAL, @@ -637,7 +767,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRAP] = { .name = { .moveName = _("Wrap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Wraps and squeezes the foe\n" + BINDING_TURNS" times with vines, etc."), .effect = EFFECT_HIT, .power = 15, .type = TYPE_NORMAL, @@ -655,7 +786,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_DOWN] = { .name = { .moveName = _("Take Down") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A reckless charge attack\n" + "that also hurts the user."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -671,7 +803,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THRASH] = { .name = { .moveName = _("Thrash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" + "that confuses the user."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 120 : 90, .type = TYPE_NORMAL, @@ -691,7 +824,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_EDGE] = { .name = { .moveName = _("Double-Edge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A life-risking tackle that\n" + "also hurts the user."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -707,7 +841,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_WHIP] = { .name = { .moveName = _("Tail Whip") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Wags the tail to lower the\n" + "foe's Defense."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -723,7 +858,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_STING] = { .name = { .moveName = _("Poison Sting") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A toxic attack with barbs,\n" + "etc., that may poison."), .effect = EFFECT_HIT, .power = 15, .type = TYPE_POISON, @@ -742,7 +878,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWINEEDLE] = { .name = { .moveName = _("Twineedle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stingers on the forelegs\n" + "jab the foe twice."), .effect = EFFECT_HIT, .power = 25, .type = TYPE_BUG, @@ -763,7 +900,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIN_MISSILE] = { .name = { .moveName = _("Pin Missile") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sharp pins are fired to\n" + "strike 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 25 : 14, .type = TYPE_BUG, @@ -777,7 +915,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEER] = { .name = { .moveName = _("Leer") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Frightens the foe with a\n" + "leer to lower Defense."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -793,7 +932,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITE] = { .name = { .moveName = _("Bite") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Bites with vicious fangs.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DARK, @@ -814,7 +954,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWL] = { .name = { .moveName = _("Growl") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Growls cutely to reduce the\n" + "foe's Attack."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -832,7 +973,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR] = { .name = { .moveName = _("Roar") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the foe flee to end\n" + "the battle."), .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -853,7 +995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SING] = { .name = { .moveName = _("Sing") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A soothing song lulls the\n" + "foe into a deep slumber."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -871,7 +1014,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERSONIC] = { .name = { .moveName = _("Supersonic") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Emits bizarre sound waves\n" + "that may confuse the foe."), .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_NORMAL, @@ -889,7 +1033,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SONIC_BOOM] = { .name = { .moveName = _("Sonic Boom") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Launches shock waves that\n" + "always inflict 20 HP damage."), .effect = EFFECT_FIXED_DAMAGE_ARG, .power = 1, .type = TYPE_NORMAL, @@ -904,7 +1049,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISABLE] = { .name = { .moveName = _("Disable") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Psychically disables one of\n" + "the foe's moves."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -927,7 +1073,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID] = { .name = { .moveName = _("Acid") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sprays a hide-melting acid.\n" + #if B_UPDATED_MOVE_DATA >= GEN_4 + "May lower Sp. Def."), + #else + "May lower Defense."), + #endif .effect = EFFECT_HIT, .power = 40, .type = TYPE_POISON, @@ -946,7 +1097,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBER] = { .name = { .moveName = _("Ember") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A weak fire attack that may\n" + "inflict a burn."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIRE, @@ -965,7 +1117,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAMETHROWER] = { .name = { .moveName = _("Flamethrower") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A powerful fire attack that\n" + "may inflict a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_FIRE, @@ -984,7 +1137,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST] = { .name = { .moveName = _("Mist") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates a mist that stops\n" + "reduction of abilities."), .effect = EFFECT_MIST, .power = 0, .type = TYPE_ICE, @@ -1002,7 +1156,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_GUN] = { .name = { .moveName = _("Water Gun") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Squirts water to attack\n" + "the foe."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -1016,7 +1171,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_PUMP] = { .name = { .moveName = _("Hydro Pump") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Blasts water at high power\n" + "to strike the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_WATER, @@ -1030,7 +1186,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURF] = { .name = { .moveName = _("Surf") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates a huge wave, then\n" + "crashes it down on the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_WATER, @@ -1046,7 +1203,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BEAM] = { .name = { .moveName = _("Ice Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Blasts the foe with an icy\n" + #if B_USE_FROSTBITE == TRUE + "beam. May cause frostbite."), + #else + "beam that may freeze it."), + #endif .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_ICE, @@ -1067,7 +1229,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLIZZARD] = { .name = { .moveName = _("Blizzard") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits the foe with an icy\n" + #if B_USE_FROSTBITE == TRUE + "storm. May cause frostbite."), + #else + "storm that may freeze it."), + #endif .effect = B_BLIZZARD_HAIL >= GEN_4 ? EFFECT_BLIZZARD : EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_ICE, @@ -1087,7 +1254,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBEAM] = { .name = { .moveName = _("Psybeam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires a peculiar ray that\n" + "may confuse the foe."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_PSYCHIC, @@ -1106,7 +1274,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE_BEAM] = { .name = { .moveName = _("Bubble Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Forcefully sprays bubbles\n" + "that may lower Speed."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_WATER, @@ -1125,7 +1294,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_BEAM] = { .name = { .moveName = _("Aurora Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires a rainbow-colored\n" + "beam that may lower Attack."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ICE, @@ -1144,7 +1314,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_BEAM] = { .name = { .moveName = _("Hyper Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, .type = TYPE_NORMAL, @@ -1163,7 +1333,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PECK] = { .name = { .moveName = _("Peck") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks the foe with a\n" + "jabbing beak, etc."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_FLYING, @@ -1178,7 +1349,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_PECK] = { .name = { .moveName = _("Drill Peck") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A corkscrewing attack with\n" + "the beak acting as a drill."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FLYING, @@ -1193,7 +1365,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBMISSION] = { .name = { .moveName = _("Submission") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A reckless body slam that\n" + "also hurts the user."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIGHTING, @@ -1209,7 +1382,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_KICK] = { .name = { .moveName = _("Low Kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A kick that inflicts more\n" + "damage on heavier foes."), .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_FIGHTING, @@ -1224,7 +1398,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COUNTER] = { .name = { .moveName = _("Counter") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Retaliates any physical hit\n" + "with double the power."), .effect = EFFECT_COUNTER, .power = 1, .type = TYPE_FIGHTING, @@ -1244,7 +1419,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEISMIC_TOSS] = { .name = { .moveName = _("Seismic Toss") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts damage identical\n" + "to the user's level."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_FIGHTING, @@ -1260,7 +1436,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH] = { .name = { .moveName = _("Strength") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Builds enormous power,\n" + "then slams the foe."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -1275,7 +1452,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ABSORB] = { .name = { .moveName = _("Absorb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that absorbs\n" + "half the damage inflicted."), .effect = EFFECT_ABSORB, .power = 20, .type = TYPE_GRASS, @@ -1291,7 +1469,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_DRAIN] = { .name = { .moveName = _("Mega Drain") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = 40, .type = TYPE_GRASS, @@ -1307,7 +1485,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_SEED] = { .name = { .moveName = _("Leech Seed") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Plants a seed on the foe to\n" + "steal HP on every turn."), .effect = EFFECT_LEECH_SEED, .power = 0, .type = TYPE_GRASS, @@ -1323,7 +1502,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWTH] = { .name = { .moveName = _("Growth") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Forces the body to grow\n" + "and heightens Sp. Atk."), .effect = B_GROWTH_STAT_RAISE >= GEN_5 ? EFFECT_GROWTH : EFFECT_SPECIAL_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -1341,7 +1521,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_LEAF] = { .name = { .moveName = _("Razor Leaf") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Cuts the enemy with leaves.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_GRASS, @@ -1357,7 +1538,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BEAM] = { .name = { .moveName = _("Solar Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Absorbs light in one turn,\n" + "then attacks next turn."), .effect = EFFECT_SOLAR_BEAM, .power = 120, .type = TYPE_GRASS, @@ -1373,8 +1555,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_POWDER] = { - .name = { .moveName = _("PoisonPowder") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Poison Powder") }, + #else + .name = { .moveName = _("PoisonPowder") }, + #endif + .description = COMPOUND_STRING("Scatters a toxic powder\n" + "that may poison the foe."), .effect = EFFECT_POISON, .power = 0, .type = TYPE_POISON, @@ -1391,7 +1578,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUN_SPORE] = { .name = { .moveName = _("Stun Spore") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Scatters a powder that may\n" + "paralyze the foe."), .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_GRASS, @@ -1408,7 +1596,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_POWDER] = { .name = { .moveName = _("Sleep Powder") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Scatters a powder that may\n" + "cause the foe to sleep."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -1425,7 +1614,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_DANCE] = { .name = { .moveName = _("Petal Dance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" + "that confuses the user."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -1452,7 +1642,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRING_SHOT] = { .name = { .moveName = _("String Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Binds the foe with string\n" + "to reduce its Speed."), .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_SPEED_DOWN_2 : EFFECT_SPEED_DOWN, .power = 0, .type = TYPE_BUG, @@ -1468,7 +1659,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RAGE] = { .name = { .moveName = _("Dragon Rage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Launches shock waves that\n" + "always inflict 40 HP damage."), .effect = EFFECT_FIXED_DAMAGE_ARG, .power = 1, .type = TYPE_DRAGON, @@ -1484,7 +1676,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_SPIN] = { .name = { .moveName = _("Fire Spin") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Traps the foe in a ring of\n" + "fire for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_FIRE, @@ -1501,8 +1694,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_SHOCK] = { - .name = { .moveName = _("ThunderShock") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Thunder Shock") }, + #else + .name = { .moveName = _("ThunderShock") }, + #endif + .description = COMPOUND_STRING("An electrical attack that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ELECTRIC, @@ -1521,7 +1719,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERBOLT] = { .name = { .moveName = _("Thunderbolt") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A strong electrical attack\n" + "that may paralyze the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_ELECTRIC, @@ -1540,7 +1739,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_WAVE] = { .name = { .moveName = _("Thunder Wave") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A weak jolt of electricity\n" + "that paralyzes the foe."), .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_ELECTRIC, @@ -1556,7 +1756,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER] = { .name = { .moveName = _("Thunder") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A lightning attack that may\n" + "cause paralysis."), .effect = EFFECT_THUNDER, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_ELECTRIC, @@ -1576,7 +1777,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_THROW] = { .name = { .moveName = _("Rock Throw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Throws small rocks to\n" + "strike the foe."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_ROCK, @@ -1590,7 +1792,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTHQUAKE] = { .name = { .moveName = _("Earthquake") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A powerful quake, but has\n" + "no effect on flying foes."), .effect = EFFECT_EARTHQUAKE, .power = 100, .type = TYPE_GROUND, @@ -1607,7 +1810,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISSURE] = { .name = { .moveName = _("Fissure") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A one-hit KO move that\n" + "drops the foe in a fissure."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_GROUND, @@ -1623,7 +1827,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIG] = { .name = { .moveName = _("Dig") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Digs underground the first\n" + "turn and strikes next turn."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 80 : 60, .type = TYPE_GROUND, @@ -1643,7 +1848,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC] = { .name = { .moveName = _("Toxic") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Poisons the foe with an\n" + "intensifying toxin."), .effect = EFFECT_TOXIC, .power = 0, .type = TYPE_POISON, @@ -1659,7 +1865,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSION] = { .name = { .moveName = _("Confusion") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A psychic attack that may\n" + "cause confusion."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_PSYCHIC, @@ -1678,7 +1885,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC] = { .name = { .moveName = _("Psychic") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A powerful psychic attack\n" + "that may lower Sp. Def."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_PSYCHIC, @@ -1697,7 +1905,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPNOSIS] = { .name = { .moveName = _("Hypnosis") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A hypnotizing move that\n" + "may induce sleep."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_PSYCHIC, @@ -1713,7 +1922,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEDITATE] = { .name = { .moveName = _("Meditate") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Meditates in a peaceful\n" + "fashion to raise Attack."), .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_PSYCHIC, @@ -1731,7 +1941,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AGILITY] = { .name = { .moveName = _("Agility") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Relaxes the body to sharply\n" + "boost Speed."), .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -1749,7 +1960,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_ATTACK] = { .name = { .moveName = _("Quick Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An extremely fast attack\n" + "that always strikes first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -1764,7 +1976,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE] = { .name = { .moveName = _("Rage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises the user's Attack\n" + "every time it is hit."), .effect = EFFECT_RAGE, .power = 20, .type = TYPE_NORMAL, @@ -1779,7 +1992,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEPORT] = { .name = { .moveName = _("Teleport") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A psychic move for fleeing\n" + "from battle instantly."), .effect = EFFECT_TELEPORT, .power = 0, .type = TYPE_PSYCHIC, @@ -1796,7 +2010,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SHADE] = { .name = { .moveName = _("Night Shade") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts damage identical\n" + "to the user's level."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_GHOST, @@ -1810,7 +2025,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIMIC] = { .name = { .moveName = _("Mimic") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Copies a move used by the\n" + "foe during one battle."), .effect = EFFECT_MIMIC, .power = 0, .type = TYPE_NORMAL, @@ -1833,7 +2049,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCREECH] = { .name = { .moveName = _("Screech") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Emits a screech to sharply\n" + "reduce the foe's Defense."), .effect = EFFECT_DEFENSE_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -1851,7 +2068,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_TEAM] = { .name = { .moveName = _("Double Team") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates illusory copies to\n" + "raise evasiveness."), .effect = EFFECT_EVASION_UP, .power = 0, .type = TYPE_NORMAL, @@ -1869,7 +2087,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECOVER] = { .name = { .moveName = _("Recover") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Recovers up to half the\n" + "user's maximum HP."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -1894,7 +2113,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARDEN] = { .name = { .moveName = _("Harden") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stiffens the body's \n" + "muscles to raise Defense."), .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_NORMAL, @@ -1912,7 +2132,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MINIMIZE] = { .name = { .moveName = _("Minimize") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Minimizes the user's size\n" + "to raise evasiveness."), .effect = EFFECT_MINIMIZE, .power = 0, .type = TYPE_NORMAL, @@ -1930,7 +2151,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOKESCREEN] = { .name = { .moveName = _("Smokescreen") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lowers the foe's accuracy\n" + "using smoke, ink, etc."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -1946,7 +2168,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSE_RAY] = { .name = { .moveName = _("Confuse Ray") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A sinister ray that\n" + "confuses the foe."), .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_GHOST, @@ -1962,7 +2185,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WITHDRAW] = { .name = { .moveName = _("Withdraw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Withdraws the body into its\n" + "hard shell to raise Defense."), .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_WATER, @@ -1980,7 +2204,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFENSE_CURL] = { .name = { .moveName = _("Defense Curl") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Curls up to conceal weak\n" + "spots and raise Defense."), .effect = EFFECT_DEFENSE_CURL, .power = 0, .type = TYPE_NORMAL, @@ -1998,7 +2223,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRIER] = { .name = { .moveName = _("Barrier") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates a barrier that\n" + "sharply raises Defense."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -2016,7 +2242,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_SCREEN] = { .name = { .moveName = _("Light Screen") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates a wall of light that\n" + "lowers Sp. Atk damage."), .effect = EFFECT_LIGHT_SCREEN, .power = 0, .type = TYPE_PSYCHIC, @@ -2034,7 +2261,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAZE] = { .name = { .moveName = _("Haze") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates a black haze that\n" + "eliminates all stat changes."), .effect = EFFECT_HAZE, .power = 0, .type = TYPE_ICE, @@ -2052,7 +2280,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT] = { .name = { .moveName = _("Reflect") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates a wall of light that\n" + "weakens physical attacks."), .effect = EFFECT_REFLECT, .power = 0, .type = TYPE_PSYCHIC, @@ -2070,7 +2299,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_ENERGY] = { .name = { .moveName = _("Focus Energy") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Focuses power to raise the\n" + "critical-hit ratio."), .effect = EFFECT_FOCUS_ENERGY, .power = 0, .type = TYPE_NORMAL, @@ -2088,7 +2318,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIDE] = { .name = { .moveName = _("Bide") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Endures attack for 2\n" + "turns to retaliate double."), .effect = EFFECT_BIDE, .power = 1, .type = TYPE_NORMAL, @@ -2106,7 +2337,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METRONOME] = { .name = { .moveName = _("Metronome") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Waggles a finger to use any\n" + "Pokémon move at random."), .effect = EFFECT_METRONOME, .power = 0, .type = TYPE_NORMAL, @@ -2129,7 +2361,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_MOVE] = { .name = { .moveName = _("Mirror Move") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Counters the foe's attack\n" + "with the same move."), .effect = EFFECT_MIRROR_MOVE, .power = 0, .type = TYPE_FLYING, @@ -2150,8 +2383,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SELF_DESTRUCT] = { - .name = { .moveName = _("SelfDestruct") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Self-Destruct") }, + #else + .name = { .moveName = _("SelfDestruct") }, + #endif + .description = COMPOUND_STRING("Inflicts severe damage but\n" + "makes the user faint."), .effect = EFFECT_EXPLOSION, .power = 200, .type = TYPE_NORMAL, @@ -2166,7 +2404,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EGG_BOMB] = { .name = { .moveName = _("Egg Bomb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An egg is forcibly hurled at\n" + "the foe."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -2181,7 +2420,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LICK] = { .name = { .moveName = _("Lick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Licks with a long tongue to\n" + "injure. May also paralyze."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 30 : 20, .type = TYPE_GHOST, @@ -2201,7 +2441,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOG] = { .name = { .moveName = _("Smog") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An exhaust-gas attack\n" + "that may also poison."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 30 : 20, .type = TYPE_POISON, @@ -2220,7 +2461,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE] = { .name = { .moveName = _("Sludge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sludge is hurled to inflict\n" + "damage. May also poison."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_POISON, @@ -2239,7 +2481,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_CLUB] = { .name = { .moveName = _("Bone Club") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Clubs the foe with a bone.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_GROUND, @@ -2258,7 +2501,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_BLAST] = { .name = { .moveName = _("Fire Blast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Incinerates everything it\n" + "strikes. May cause a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_FIRE, @@ -2277,7 +2521,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATERFALL] = { .name = { .moveName = _("Waterfall") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Charges the foe with speed\n" + "to climb waterfalls."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_WATER, @@ -2299,7 +2544,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLAMP] = { .name = { .moveName = _("Clamp") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Traps and squeezes the\n" + "foe for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_WATER, @@ -2318,7 +2564,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWIFT] = { .name = { .moveName = _("Swift") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sprays star-shaped rays\n" + "that never miss."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_NORMAL, @@ -2332,7 +2579,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKULL_BASH] = { .name = { .moveName = _("Skull Bash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Tucks in the head, then\n" + "attacks on the next turn."), .effect = EFFECT_SKULL_BASH, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 100, .type = TYPE_NORMAL, @@ -2350,7 +2598,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKE_CANNON] = { .name = { .moveName = _("Spike Cannon") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Launches sharp spikes that\n" + "strike 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 20, .type = TYPE_NORMAL, @@ -2364,7 +2613,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONSTRICT] = { .name = { .moveName = _("Constrict") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Constricts to inflict pain.\n" + "May lower Speed."), .effect = EFFECT_HIT, .power = 10, .type = TYPE_NORMAL, @@ -2384,7 +2634,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AMNESIA] = { .name = { .moveName = _("Amnesia") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Forgets about something\n" + "and sharply raises Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -2402,7 +2653,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINESIS] = { .name = { .moveName = _("Kinesis") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Distracts the foe.\n" + "May lower accuracy."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_PSYCHIC, @@ -2418,7 +2670,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOFT_BOILED] = { .name = { .moveName = _("Soft-Boiled") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Recovers up to half the\n" + "user's maximum HP."), .effect = EFFECT_SOFTBOILED, .power = 0, .type = TYPE_NORMAL, @@ -2436,8 +2689,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_JUMP_KICK] = { - .name = { .moveName = _("HighJumpKick") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("High Jump Kick") }, + #else + .name = { .moveName = _("HighJumpKick") }, + #endif + .description = COMPOUND_STRING("A jumping knee kick. If it\n" + "misses, the user is hurt."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 130, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -2459,7 +2717,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLARE] = { .name = { .moveName = _("Glare") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Intimidates and frightens\n" + "the foe into paralysis."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_5 @@ -2481,7 +2740,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DREAM_EATER] = { .name = { .moveName = _("Dream Eater") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Takes one half the damage\n" + "inflicted on a sleeping foe."), .effect = EFFECT_DREAM_EATER, .power = 100, .type = TYPE_PSYCHIC, @@ -2496,7 +2756,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_GAS] = { .name = { .moveName = _("Poison Gas") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Envelops the foe in a toxic\n" + "gas that may poison."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 90, #elif B_UPDATED_MOVE_DATA >= GEN_5 @@ -2518,7 +2779,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRAGE] = { .name = { .moveName = _("Barrage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurls round objects at the\n" + "foe 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -2533,7 +2795,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_LIFE] = { .name = { .moveName = _("Leech Life") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that steals half\n" + "the damage inflicted."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 80 : 20, .type = TYPE_BUG, @@ -2550,7 +2813,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOVELY_KISS] = { .name = { .moveName = _("Lovely Kiss") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Demands a kiss with a scary\n" + "face that induces sleep."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -2566,7 +2830,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_ATTACK] = { .name = { .moveName = _("Sky Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Searches out weak spots,\n" + "then strikes the next turn."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_FLYING, @@ -2591,7 +2856,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRANSFORM] = { .name = { .moveName = _("Transform") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Alters the user's cells to\n" + "become a copy of the foe."), .effect = EFFECT_TRANSFORM, .power = 0, .type = TYPE_NORMAL, @@ -2614,7 +2880,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE] = { .name = { .moveName = _("Bubble") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack using bubbles.\n" + "May lower the foe's Speed."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 40 : 20, .type = TYPE_WATER, @@ -2633,7 +2900,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIZZY_PUNCH] = { .name = { .moveName = _("Dizzy Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A rhythmic punch that may\n" + "confuse the foe."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -2654,7 +2922,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPORE] = { .name = { .moveName = _("Spore") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Scatters a cloud of spores\n" + "that always induce sleep."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -2671,7 +2940,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH] = { .name = { .moveName = _("Flash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Looses a powerful blast of\n" + "light that cuts accuracy."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -2687,7 +2957,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYWAVE] = { .name = { .moveName = _("Psywave") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a psychic\n" + "wave of varying intensity."), .effect = EFFECT_PSYWAVE, .power = 1, .type = TYPE_PSYCHIC, @@ -2701,7 +2972,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLASH] = { .name = { .moveName = _("Splash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("It's just a splash...\n" + "Has no effect whatsoever."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -2719,7 +2991,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_ARMOR] = { .name = { .moveName = _("Acid Armor") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Liquifies the user's body\n" + "to sharply raise Defense."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_POISON, @@ -2737,7 +3010,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRABHAMMER] = { .name = { .moveName = _("Crabhammer") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hammers with a pincer. Has a\n" + "high critical-hit ratio."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 90, .type = TYPE_WATER, @@ -2753,7 +3027,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPLOSION] = { .name = { .moveName = _("Explosion") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts severe damage but\n" + "makes the user faint."), .effect = EFFECT_EXPLOSION, .power = 250, .type = TYPE_NORMAL, @@ -2768,7 +3043,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_SWIPES] = { .name = { .moveName = _("Fury Swipes") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Rakes the foe with sharp\n" + "claws, etc., 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -2783,7 +3059,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONEMERANG] = { .name = { .moveName = _("Bonemerang") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Throws a bone boomerang\n" + "that strikes twice."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_GROUND, @@ -2798,7 +3075,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REST] = { .name = { .moveName = _("Rest") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user sleeps for 2 turns,\n" + "restoring HP and status."), .effect = EFFECT_REST, .power = 0, .type = TYPE_PSYCHIC, @@ -2817,7 +3095,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SLIDE] = { .name = { .moveName = _("Rock Slide") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Large boulders are hurled.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_ROCK, @@ -2836,7 +3115,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_FANG] = { .name = { .moveName = _("Hyper Fang") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with sharp fangs.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -2857,7 +3137,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHARPEN] = { .name = { .moveName = _("Sharpen") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Reduces the polygon count\n" + "and raises Attack."), .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -2874,8 +3155,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION] = { - .name = { .moveName = _("Conversin") }, - .description = COMPOUND_STRING("Dummy2 description."), + .name = { .moveName = _("Conversion") }, + .description = COMPOUND_STRING("Changes the user's type\n" + "into a known move's type."), .effect = EFFECT_CONVERSION, .power = 0, .type = TYPE_NORMAL, @@ -2893,7 +3175,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRI_ATTACK] = { .name = { .moveName = _("Tri Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires three types of beams\n" + "at the same time."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -2912,7 +3195,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPER_FANG] = { .name = { .moveName = _("Super Fang") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with sharp fangs\n" + "and cuts half the foe's HP."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_NORMAL, @@ -2928,7 +3212,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLASH] = { .name = { .moveName = _("Slash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slashes with claws, etc. Has\n" + "a high critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -2945,7 +3230,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBSTITUTE] = { .name = { .moveName = _("Substitute") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates a decoy using 1/4\n" + "of the user's maximum HP."), .effect = EFFECT_SUBSTITUTE, .power = 0, .type = TYPE_NORMAL, @@ -2964,7 +3250,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE] = { .name = { .moveName = _("Struggle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Used only if all PP are gone.\n" + "Also hurts the user a little."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_RECOIL_HP_25, .accuracy = 0, @@ -2999,7 +3286,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKETCH] = { .name = { .moveName = _("Sketch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Copies the foe's last move\n" + "permanently."), .effect = EFFECT_SKETCH, .power = 0, .type = TYPE_NORMAL, @@ -3025,7 +3313,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_KICK] = { .name = { .moveName = _("Triple Kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Kicks the foe 3 times in a\n" + "row with rising intensity."), .effect = EFFECT_TRIPLE_KICK, .power = 10, .type = TYPE_FIGHTING, @@ -3041,7 +3330,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THIEF] = { .name = { .moveName = _("Thief") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("While attacking, it may\n" + "steal the foe's held item."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, .type = TYPE_DARK, @@ -3064,7 +3354,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIDER_WEB] = { .name = { .moveName = _("Spider Web") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Ensnares the foe to stop it\n" + "from fleeing or switching."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_BUG, @@ -3081,7 +3372,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_READER] = { .name = { .moveName = _("Mind Reader") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Senses the foe's action to\n" + "ensure the next move's hit."), .effect = EFFECT_LOCK_ON, .power = 0, .type = TYPE_NORMAL, @@ -3096,7 +3388,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHTMARE] = { .name = { .moveName = _("Nightmare") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts 1/4 damage on a\n" + "sleeping foe every turn."), .effect = EFFECT_NIGHTMARE, .power = 0, .type = TYPE_GHOST, @@ -3112,7 +3405,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_WHEEL] = { .name = { .moveName = _("Flame Wheel") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A fiery charge attack that\n" + "may inflict a burn."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FIRE, @@ -3133,7 +3427,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNORE] = { .name = { .moveName = _("Snore") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A loud attack that can be\n" + "used only while asleep."), .effect = EFFECT_SNORE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 40, .type = TYPE_NORMAL, @@ -3155,7 +3450,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CURSE] = { .name = { .moveName = _("Curse") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A move that functions\n" + "differently for GHOSTS."), .effect = EFFECT_CURSE, .power = 0, .type = B_UPDATED_MOVE_TYPES >= GEN_5 ? TYPE_GHOST : TYPE_MYSTERY, @@ -3173,7 +3469,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAIL] = { .name = { .moveName = _("Flail") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts more damage when\n" + "the user's HP is down."), .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_NORMAL, @@ -3188,7 +3485,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION_2] = { .name = { .moveName = _("Conversion 2") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the user resistant\n" + "to the last attack's type."), .effect = EFFECT_CONVERSION_2, .power = 0, .type = TYPE_NORMAL, @@ -3206,7 +3504,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AEROBLAST] = { .name = { .moveName = _("Aeroblast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Launches a vacuumed blast.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FLYING, @@ -3222,7 +3521,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_SPORE] = { .name = { .moveName = _("Cotton Spore") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Spores cling to the foe,\n" + "sharply reducing Speed."), .effect = EFFECT_SPEED_DOWN_2, .power = 0, .type = TYPE_GRASS, @@ -3239,7 +3539,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVERSAL] = { .name = { .moveName = _("Reversal") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts more damage when\n" + "the user's HP is down."), .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_FIGHTING, @@ -3254,7 +3555,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPITE] = { .name = { .moveName = _("Spite") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Spitefully cuts the PP\n" + "of the foe's last move."), .effect = EFFECT_SPITE, .power = 0, .type = TYPE_GHOST, @@ -3271,7 +3573,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER_SNOW] = { .name = { .moveName = _("Powder Snow") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Blasts the foe with a snowy\n" + "gust. May cause freezing."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ICE, @@ -3290,7 +3593,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PROTECT] = { .name = { .moveName = _("Protect") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades attack, but may fail\n" + "if used in succession."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_NORMAL, @@ -3309,7 +3613,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MACH_PUNCH] = { .name = { .moveName = _("Mach Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A punch is thrown at wicked\n" + "speed to strike first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -3325,7 +3630,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCARY_FACE] = { .name = { .moveName = _("Scary Face") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Frightens with a scary face\n" + "to sharply reduce Speed."), .effect = EFFECT_SPEED_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -3341,7 +3647,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT_ATTACK] = { .name = { .moveName = _("Feint Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sFeintDescription, .effect = EFFECT_HIT, .power = 60, .type = TYPE_DARK, @@ -3356,7 +3662,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_KISS] = { .name = { .moveName = _("Sweet Kiss") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Demands a kiss with a cute\n" + "look. May cause confusion."), .effect = EFFECT_CONFUSE, .power = 0, .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, @@ -3372,7 +3679,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELLY_DRUM] = { .name = { .moveName = _("Belly Drum") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Maximizes Attack while\n" + "sacrificing HP."), .effect = EFFECT_BELLY_DRUM, .power = 0, .type = TYPE_NORMAL, @@ -3390,7 +3698,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_BOMB] = { .name = { .moveName = _("Sludge Bomb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sludge is hurled to inflict\n" + "damage. May also poison."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_POISON, @@ -3410,7 +3719,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SLAP] = { .name = { .moveName = _("Mud-Slap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurls mud in the foe's face\n" + "to reduce its accuracy."), .effect = EFFECT_HIT, .power = 20, .type = TYPE_GROUND, @@ -3429,7 +3739,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTAZOOKA] = { .name = { .moveName = _("Octazooka") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires a lump of ink to\n" + "damage and cut accuracy."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_WATER, @@ -3449,7 +3760,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKES] = { .name = { .moveName = _("Spikes") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sets spikes that hurt a \n" + "foe switching in."), .effect = EFFECT_SPIKES, .power = 0, .type = TYPE_GROUND, @@ -3469,7 +3781,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZAP_CANNON] = { .name = { .moveName = _("Zap Cannon") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Powerful and sure to cause\n" + "paralysis, but inaccurate."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 120 : 100, .type = TYPE_ELECTRIC, @@ -3489,7 +3802,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESIGHT] = { .name = { .moveName = _("Foresight") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Negates the foe's efforts\n" + "to heighten evasiveness."), .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, @@ -3506,7 +3820,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DESTINY_BOND] = { .name = { .moveName = _("Destiny Bond") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("If the user faints, the foe\n" + "is also made to faint."), .effect = EFFECT_DESTINY_BOND, .power = 0, .type = TYPE_GHOST, @@ -3527,7 +3842,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PERISH_SONG] = { .name = { .moveName = _("Perish Song") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Any Pokémon hearing this\n" + "song faints in 3 turns."), .effect = EFFECT_PERISH_SONG, .power = 0, .type = TYPE_NORMAL, @@ -3546,7 +3862,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICY_WIND] = { .name = { .moveName = _("Icy Wind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A chilling attack that\n" + "lowers the foe's Speed."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_ICE, @@ -3566,7 +3883,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DETECT] = { .name = { .moveName = _("Detect") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades attack, but may fail\n" + "if used in succession."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIGHTING, @@ -3587,7 +3905,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_RUSH] = { .name = { .moveName = _("Bone Rush") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes the foe with a bone\n" + "in hand 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_GROUND, @@ -3601,7 +3920,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOCK_ON] = { .name = { .moveName = _("Lock-On") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Locks on to the foe to\n" + "ensure the next move hits."), .effect = EFFECT_LOCK_ON, .power = 0, .type = TYPE_NORMAL, @@ -3616,7 +3936,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OUTRAGE] = { .name = { .moveName = _("Outrage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" + "that confuses the user."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 120 : 90, .type = TYPE_DRAGON, @@ -3636,7 +3957,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSTORM] = { .name = { .moveName = _("Sandstorm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Causes a sandstorm that\n" + "rages for several turns."), .effect = EFFECT_SANDSTORM, .power = 0, .type = TYPE_ROCK, @@ -3654,7 +3976,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_DRAIN] = { .name = { .moveName = _("Giga Drain") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that steals half\n" + "the damage inflicted."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, .type = TYPE_GRASS, @@ -3670,7 +3993,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDURE] = { .name = { .moveName = _("Endure") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Endures any attack for\n" + "1 turn, leaving at least 1HP."), .effect = EFFECT_ENDURE, .power = 0, .type = TYPE_NORMAL, @@ -3691,7 +4015,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARM] = { .name = { .moveName = _("Charm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Charms the foe and sharply\n" + "reduces its Attack."), .effect = EFFECT_ATTACK_DOWN_2, .power = 0, .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, @@ -3707,7 +4032,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLOUT] = { .name = { .moveName = _("Rollout") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack lasting 5 turns\n" + "with rising intensity."), .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ROCK, @@ -3724,7 +4050,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SWIPE] = { .name = { .moveName = _("False Swipe") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sFalseSwipeDescription, .effect = EFFECT_FALSE_SWIPE, .power = 40, .type = TYPE_NORMAL, @@ -3739,7 +4065,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWAGGER] = { .name = { .moveName = _("Swagger") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Confuses the foe, but also\n" + "sharply raises Attack."), .effect = EFFECT_SWAGGER, .power = 0, .type = TYPE_NORMAL, @@ -3755,7 +4082,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MILK_DRINK] = { .name = { .moveName = _("Milk Drink") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Recovers up to half the\n" + "user's maximum HP."), .effect = EFFECT_SOFTBOILED, .power = 0, .type = TYPE_NORMAL, @@ -3774,7 +4102,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARK] = { .name = { .moveName = _("Spark") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An electrified tackle that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ELECTRIC, @@ -3794,7 +4123,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_CUTTER] = { .name = { .moveName = _("Fury Cutter") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that intensifies\n" + "on each successive hit."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 40, #elif B_UPDATED_MOVE_DATA >= GEN_5 @@ -3816,7 +4146,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_WING] = { .name = { .moveName = _("Steel Wing") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes the foe with hard\n" + "wings spread wide."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_STEEL, @@ -3837,7 +4168,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEAN_LOOK] = { .name = { .moveName = _("Mean Look") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fixes the foe with a mean\n" + "look that prevents escape."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -3854,7 +4186,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTRACT] = { .name = { .moveName = _("Attract") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the opposite gender\n" + "less likely to attack."), .effect = EFFECT_ATTRACT, .power = 0, .type = TYPE_NORMAL, @@ -3871,7 +4204,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_TALK] = { .name = { .moveName = _("Sleep Talk") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Uses an available move\n" + "randomly while asleep."), .effect = EFFECT_SLEEP_TALK, .power = 0, .type = TYPE_NORMAL, @@ -3895,7 +4229,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BELL] = { .name = { .moveName = _("Heal Bell") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Chimes soothingly to heal\n" + "all status abnormalities."), .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_NORMAL, @@ -3915,7 +4250,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETURN] = { .name = { .moveName = _("Return") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that increases\n" + "in power with friendship."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -3930,7 +4266,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRESENT] = { .name = { .moveName = _("Present") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A gift in the form of a\n" + "bomb. May restore HP."), .effect = EFFECT_PRESENT, .power = 1, .type = TYPE_NORMAL, @@ -3945,7 +4282,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRUSTRATION] = { .name = { .moveName = _("Frustration") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that is stronger\n" + "if the Trainer is disliked."), .effect = EFFECT_FRUSTRATION, .power = 1, .type = TYPE_NORMAL, @@ -3960,7 +4298,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAFEGUARD] = { .name = { .moveName = _("Safeguard") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A mystical force prevents\n" + "all status problems."), .effect = EFFECT_SAFEGUARD, .power = 0, .type = TYPE_NORMAL, @@ -3978,7 +4317,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAIN_SPLIT] = { .name = { .moveName = _("Pain Split") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Adds the user and foe's HP,\n" + "then shares them equally."), .effect = EFFECT_PAIN_SPLIT, .power = 0, .type = TYPE_NORMAL, @@ -3993,7 +4333,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_FIRE] = { .name = { .moveName = _("Sacred Fire") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A mystical fire attack that\n" + "may inflict a burn."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIRE, @@ -4013,7 +4354,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNITUDE] = { .name = { .moveName = _("Magnitude") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A ground-shaking attack\n" + "of random intensity."), .effect = EFFECT_MAGNITUDE, .power = 1, .type = TYPE_GROUND, @@ -4028,8 +4370,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMIC_PUNCH] = { - .name = { .moveName = _("DynamicPunch") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Dynamic Punch") }, + #else + .name = { .moveName = _("DynamicPunch") }, + #endif + .description = COMPOUND_STRING("Powerful and sure to cause\n" + "confusion, but inaccurate."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -4050,7 +4397,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGAHORN] = { .name = { .moveName = _("Megahorn") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A brutal ramming attack\n" + "using out-thrust horns."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_BUG, @@ -4064,8 +4412,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_BREATH] = { - .name = { .moveName = _("DragonBreath") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Dragon Breath") }, + #else + .name = { .moveName = _("DragonBreath") }, + #endif + .description = COMPOUND_STRING("Strikes the foe with an\n" + "incredible blast of breath."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DRAGON, @@ -4085,7 +4438,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BATON_PASS] = { .name = { .moveName = _("Baton Pass") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Switches out the user while\n" + "keeping effects in play."), .effect = EFFECT_BATON_PASS, .power = 0, .type = TYPE_NORMAL, @@ -4102,7 +4456,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENCORE] = { .name = { .moveName = _("Encore") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the foe repeat its\n" + "last move over 2 to 6 turns."), .effect = EFFECT_ENCORE, .power = 0, .type = TYPE_NORMAL, @@ -4120,7 +4475,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURSUIT] = { .name = { .moveName = _("Pursuit") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts bad damage if used\n" + "on a foe switching out."), .effect = EFFECT_PURSUIT, .power = 40, .type = TYPE_DARK, @@ -4136,7 +4492,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAPID_SPIN] = { .name = { .moveName = _("Rapid Spin") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Spins the body at high\n" + "speed to strike the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 50 : 20, .type = TYPE_NORMAL, @@ -4163,7 +4520,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_SCENT] = { .name = { .moveName = _("Sweet Scent") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Allures the foe to reduce\n" + "evasiveness."), .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_EVASION_DOWN_2 : EFFECT_EVASION_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -4179,7 +4537,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_TAIL] = { .name = { .moveName = _("Iron Tail") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a rock-hard\n" + "tail. May lower Defense."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_STEEL, @@ -4199,7 +4558,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_CLAW] = { .name = { .moveName = _("Metal Claw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A claw attack that may\n" + "raise the user's Attack."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -4220,7 +4580,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VITAL_THROW] = { .name = { .moveName = _("Vital Throw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the user's move last,\n" + "but it never misses."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_FIGHTING, @@ -4235,7 +4596,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORNING_SUN] = { .name = { .moveName = _("Morning Sun") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Restores HP. The amount\n" + "varies with the weather."), .effect = EFFECT_MORNING_SUN, .power = 0, .type = TYPE_NORMAL, @@ -4254,7 +4616,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNTHESIS] = { .name = { .moveName = _("Synthesis") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Restores HP. The amount\n" + "varies with the weather."), .effect = EFFECT_SYNTHESIS, .power = 0, .type = TYPE_GRASS, @@ -4273,7 +4636,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONLIGHT] = { .name = { .moveName = _("Moonlight") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Restores HP. The amount\n" + "varies with the weather."), .effect = EFFECT_MOONLIGHT, .power = 0, .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, @@ -4292,7 +4656,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIDDEN_POWER] = { .name = { .moveName = _("Hidden Power") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The effectiveness varies\n" + "with the user."), .power = B_HIDDEN_POWER_DMG >= GEN_6 ? 60 : 1, .effect = EFFECT_HIDDEN_POWER, .type = TYPE_NORMAL, @@ -4306,7 +4671,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_CHOP] = { .name = { .moveName = _("Cross Chop") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A double-chopping attack.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -4322,7 +4688,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWISTER] = { .name = { .moveName = _("Twister") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Whips up a vicious twister\n" + "to tear at the foe."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_DRAGON, @@ -4343,7 +4710,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAIN_DANCE] = { .name = { .moveName = _("Rain Dance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Boosts the power of Water-\n" + "type moves for 5 turns."), .effect = EFFECT_RAIN_DANCE, .power = 0, .type = TYPE_WATER, @@ -4360,7 +4728,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNNY_DAY] = { .name = { .moveName = _("Sunny Day") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Boosts the power of Fire-\n" + "type moves for 5 turns."), .effect = EFFECT_SUNNY_DAY, .power = 0, .type = TYPE_FIRE, @@ -4377,7 +4746,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUNCH] = { .name = { .moveName = _("Crunch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Crunches with sharp fangs.\n" + #if B_UPDATED_MOVE_DATA >= GEN_4 + "May lower Defense."), + #else + "May lower Sp. Def."), + #endif .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -4402,7 +4776,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_COAT] = { .name = { .moveName = _("Mirror Coat") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Counters the foe's special\n" + "attack at double the power."), .effect = EFFECT_MIRROR_COAT, .power = 1, .type = TYPE_PSYCHIC, @@ -4420,7 +4795,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCH_UP] = { .name = { .moveName = _("Psych Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Copies the foe's effect(s)\n" + "and gives to the user."), .effect = EFFECT_PSYCH_UP, .power = 0, .type = TYPE_NORMAL, @@ -4438,8 +4814,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_SPEED] = { - .name = { .moveName = _("ExtremeSpeed") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Extreme Speed") }, + #else + .name = { .moveName = _("ExtremeSpeed") }, + #endif + .description = COMPOUND_STRING("An extremely fast and\n" + "powerful attack."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -4453,8 +4834,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCIENT_POWER] = { - .name = { .moveName = _("AncientPower") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Ancient Power") }, + #else + .name = { .moveName = _("AncientPower") }, + #endif + .description = COMPOUND_STRING("An attack that may raise\n" + "all stats."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_ROCK, @@ -4475,7 +4861,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BALL] = { .name = { .moveName = _("Shadow Ball") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurls a black blob that may\n" + "lower the foe's Sp. Def."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GHOST, @@ -4495,7 +4882,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUTURE_SIGHT] = { .name = { .moveName = _("Future Sight") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Heightens inner power to\n" + "strike 2 turns later."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, #elif B_UPDATED_MOVE_DATA >= GEN_5 @@ -4517,7 +4905,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SMASH] = { .name = { .moveName = _("Rock Smash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A rock-crushing attack\n" + "that may lower Defense."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 40 : 20, .type = TYPE_FIGHTING, @@ -4537,7 +4926,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLPOOL] = { .name = { .moveName = _("Whirlpool") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Traps and hurts the foe in\n" + "a whirlpool for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_WATER, @@ -4555,7 +4945,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAT_UP] = { .name = { .moveName = _("Beat Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Summons party Pokémon to\n" + "join in the attack."), .effect = EFFECT_BEAT_UP, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 1 : 10, .type = TYPE_DARK, @@ -4569,7 +4960,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_OUT] = { .name = { .moveName = _("Fake Out") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A 1st-turn, 1st-strike move\n" + "that causes flinching."), .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 3 : 1, .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, .effect = EFFECT_FAKE_OUT, @@ -4589,7 +4981,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPROAR] = { .name = { .moveName = _("Uproar") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING( + #if B_UPROAR_TURNS >= GEN_5 + "Causes an uproar for 2 to 5\n" + #else + "Causes an uproar for 3\n" + #endif + "turns and prevents sleep."), .effect = EFFECT_UPROAR, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 90 : 50, .type = TYPE_NORMAL, @@ -4611,7 +5009,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOCKPILE] = { .name = { .moveName = _("Stockpile") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Charges up power for up to\n" + "3 turns."), .effect = EFFECT_STOCKPILE, .power = 0, .type = TYPE_NORMAL, @@ -4629,7 +5028,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIT_UP] = { .name = { .moveName = _("Spit Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Releases stockpiled power\n" + "(the more the better)."), .effect = EFFECT_SPIT_UP, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 1 : 100, .type = TYPE_NORMAL, @@ -4644,7 +5044,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWALLOW] = { .name = { .moveName = _("Swallow") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Absorbs stockpiled power\n" + "and restores HP."), .effect = EFFECT_SWALLOW, .power = 0, .type = TYPE_NORMAL, @@ -4663,7 +5064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_WAVE] = { .name = { .moveName = _("Heat Wave") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Exhales a hot breath on the\n" + "foe. May inflict a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 95 : 100, .type = TYPE_FIRE, @@ -4683,7 +5085,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAIL] = { .name = { .moveName = _("Hail") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Summons a hailstorm that\n" + "strikes every turn."), .effect = EFFECT_HAIL, .power = 0, .type = TYPE_ICE, @@ -4700,7 +5103,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORMENT] = { .name = { .moveName = _("Torment") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Torments the foe and stops\n" + "successive use of a move."), .effect = EFFECT_TORMENT, .power = 0, .type = TYPE_DARK, @@ -4716,7 +5120,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLATTER] = { .name = { .moveName = _("Flatter") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Confuses the foe, but\n" + "raises its Sp. Atk."), .effect = EFFECT_FLATTER, .power = 0, .type = TYPE_DARK, @@ -4732,7 +5137,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILL_O_WISP] = { .name = { .moveName = _("Will-o-Wisp") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts a burn on the foe\n" + "with intense fire."), .effect = EFFECT_WILL_O_WISP, .power = 0, .type = TYPE_FIRE, @@ -4748,7 +5154,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEMENTO] = { .name = { .moveName = _("Memento") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user faints and lowers\n" + "the foe's abilities."), .effect = EFFECT_MEMENTO, .power = 0, .type = TYPE_DARK, @@ -4763,7 +5170,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FACADE] = { .name = { .moveName = _("Facade") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Boosts Attack when burned,\n" + "paralyzed, or poisoned."), .effect = EFFECT_FACADE, .power = 70, .type = TYPE_NORMAL, @@ -4778,7 +5186,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_PUNCH] = { .name = { .moveName = _("Focus Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A powerful loyalty attack.\n" + "The user flinches if hit."), .effect = EFFECT_FOCUS_PUNCH, .power = 150, .type = TYPE_FIGHTING, @@ -4800,8 +5209,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMELLING_SALTS] = { - .name = { .moveName = _("SmellngSalts") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Smelling Salts") }, + #else + .name = { .moveName = _("SmellngSalts") }, + #endif + .description = COMPOUND_STRING("Powerful against paralyzed\n" + "foes, but also heals them."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 70 : 60, .type = TYPE_NORMAL, @@ -4820,7 +5234,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOLLOW_ME] = { .name = { .moveName = _("Follow Me") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Draws attention to make\n" + "foes attack only the user."), .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_NORMAL, @@ -4840,7 +5255,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURE_POWER] = { .name = { .moveName = _("Nature Power") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The type of attack varies\n" + "depending on the location."), .effect = EFFECT_NATURE_POWER, .power = 1, .type = TYPE_NORMAL, @@ -4861,7 +5277,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE] = { .name = { .moveName = _("Charge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Charges power to boost the\n" + "electric move used next."), .effect = EFFECT_CHARGE, .power = 0, .type = TYPE_ELECTRIC, @@ -4879,7 +5296,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAUNT] = { .name = { .moveName = _("Taunt") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Taunts the foe into only\n" + "using attack moves."), .effect = EFFECT_TAUNT, .power = 0, .type = TYPE_DARK, @@ -4896,7 +5314,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HELPING_HAND] = { .name = { .moveName = _("Helping Hand") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Boosts the power of the\n" + "recipient's moves."), .effect = EFFECT_HELPING_HAND, .power = 0, .type = TYPE_NORMAL, @@ -4917,7 +5336,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK] = { .name = { .moveName = _("Trick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Tricks the foe into trading\n" + "held items."), .effect = EFFECT_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -4935,7 +5355,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLE_PLAY] = { .name = { .moveName = _("Role Play") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Mimics the target and\n" + "copies its special ability."), .effect = EFFECT_ROLE_PLAY, .power = 0, .type = TYPE_PSYCHIC, @@ -4953,7 +5374,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WISH] = { .name = { .moveName = _("Wish") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A wish that restores HP.\n" + "It takes time to work."), .effect = EFFECT_WISH, .power = 0, .type = TYPE_NORMAL, @@ -4972,7 +5394,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSIST] = { .name = { .moveName = _("Assist") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks randomly with one\n" + "of the partner's moves."), .effect = EFFECT_ASSIST, .power = 0, .type = TYPE_NORMAL, @@ -4995,7 +5418,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INGRAIN] = { .name = { .moveName = _("Ingrain") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lays roots that restore HP.\n" + "The user can't switch out."), .effect = EFFECT_INGRAIN, .power = 0, .type = TYPE_GRASS, @@ -5014,7 +5438,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERPOWER] = { .name = { .moveName = _("Superpower") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Boosts strength sharply,\n" + "but lowers abilities."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIGHTING, @@ -5033,7 +5458,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_COAT] = { .name = { .moveName = _("Magic Coat") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Reflects special effects\n" + "back to the attacker."), .effect = EFFECT_MAGIC_COAT, .power = 0, .type = TYPE_PSYCHIC, @@ -5050,7 +5476,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECYCLE] = { .name = { .moveName = _("Recycle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Recycles a used item for\n" + "one more use."), .effect = EFFECT_RECYCLE, .power = 0, .type = TYPE_NORMAL, @@ -5068,7 +5495,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVENGE] = { .name = { .moveName = _("Revenge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sRevengeDescription, .effect = EFFECT_REVENGE, .power = 60, .type = TYPE_FIGHTING, @@ -5083,7 +5510,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRICK_BREAK] = { .name = { .moveName = _("Brick Break") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Destroys barriers such as\n" + "REFLECT and causes damage."), .effect = EFFECT_BRICK_BREAK, .power = 75, .type = TYPE_FIGHTING, @@ -5098,7 +5526,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_YAWN] = { .name = { .moveName = _("Yawn") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lulls the foe into yawning,\n" + "then sleeping next turn."), .effect = EFFECT_YAWN, .power = 0, .type = TYPE_NORMAL, @@ -5114,7 +5543,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KNOCK_OFF] = { .name = { .moveName = _("Knock Off") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Knocks down the foe's held\n" + "item to prevent its use."), .effect = EFFECT_KNOCK_OFF, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 20, .type = TYPE_DARK, @@ -5132,7 +5562,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDEAVOR] = { .name = { .moveName = _("Endeavor") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Gains power if the user's HP\n" + "is lower than the foe's HP."), .effect = EFFECT_ENDEAVOR, .power = 1, .type = TYPE_NORMAL, @@ -5148,7 +5579,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ERUPTION] = { .name = { .moveName = _("Eruption") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The higher the user's HP,\n" + "the more damage caused."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_FIRE, @@ -5162,7 +5594,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKILL_SWAP] = { .name = { .moveName = _("Skill Swap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user swaps special\n" + "abilities with the target."), .effect = EFFECT_SKILL_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -5178,7 +5611,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IMPRISON] = { .name = { .moveName = _("Imprison") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Prevents foes from using\n" + "moves known by the user."), .effect = EFFECT_IMPRISON, .power = 0, .type = TYPE_PSYCHIC, @@ -5198,7 +5632,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFRESH] = { .name = { .moveName = _("Refresh") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Heals poisoning, paralysis,\n" + "or a burn."), .effect = EFFECT_REFRESH, .power = 0, .type = TYPE_NORMAL, @@ -5216,7 +5651,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRUDGE] = { .name = { .moveName = _("Grudge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("If the user faints, deletes\n" + "all PP of foe's last move."), .effect = EFFECT_GRUDGE, .power = 0, .type = TYPE_GHOST, @@ -5234,7 +5670,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNATCH] = { .name = { .moveName = _("Snatch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Steals the effects of the\n" + "move the target uses next."), .effect = EFFECT_SNATCH, .power = 0, .type = TYPE_DARK, @@ -5254,7 +5691,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_POWER] = { .name = { .moveName = _("Secret Power") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack with effects\n" + "that vary by location."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -5273,7 +5711,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIVE] = { .name = { .moveName = _("Dive") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Dives underwater the first\n" + "turn and strikes next turn."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 80 : 60, .type = TYPE_WATER, @@ -5293,7 +5732,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARM_THRUST] = { .name = { .moveName = _("Arm Thrust") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Straight-arm punches that\n" + "strike the foe 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_FIGHTING, @@ -5308,7 +5748,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAMOUFLAGE] = { .name = { .moveName = _("Camouflage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Alters the Pokémon's type\n" + "depending on the location."), .effect = EFFECT_CAMOUFLAGE, .power = 0, .type = TYPE_NORMAL, @@ -5326,7 +5767,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_GLOW] = { .name = { .moveName = _("Tail Glow") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Flashes a light that sharply\n" + "raises Sp. Atk."), .effect = B_UPDATED_MOVE_DATA >= GEN_5 ? EFFECT_SPECIAL_ATTACK_UP_3 : EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, .type = TYPE_BUG, @@ -5344,7 +5786,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUSTER_PURGE] = { .name = { .moveName = _("Luster Purge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a burst of\n" + "light. May lower Sp. Def."), .effect = EFFECT_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, @@ -5363,7 +5806,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST_BALL] = { .name = { .moveName = _("Mist Ball") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a flurry of\n" + "down. May lower Sp. Atk."), .effect = EFFECT_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, @@ -5382,8 +5826,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEATHER_DANCE] = { - .name = { .moveName = _("FeatherDance") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Feather Dance") }, + #else + .name = { .moveName = _("FeatherDance") }, + #endif + .description = COMPOUND_STRING("Envelops the foe with down\n" + "to sharply reduce Attack."), .effect = EFFECT_ATTACK_DOWN_2, .power = 0, .type = TYPE_FLYING, @@ -5400,7 +5849,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEETER_DANCE] = { .name = { .moveName = _("Teeter Dance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Confuses all Pokémon on\n" + "the scene."), .effect = EFFECT_TEETER_DANCE, .power = 0, .type = TYPE_NORMAL, @@ -5417,7 +5867,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZE_KICK] = { .name = { .moveName = _("Blaze Kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A kick with a high critical-\n" + "hit ratio. May cause a burn."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_FIRE, @@ -5438,7 +5889,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SPORT] = { .name = { .moveName = _("Mud Sport") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Covers the user in mud to\n" + "raise electrical resistance."), .effect = EFFECT_MUD_SPORT, .power = 0, .type = TYPE_GROUND, @@ -5456,7 +5908,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BALL] = { .name = { .moveName = _("Ice Ball") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A 5-turn attack that gains\n" + "power on successive hits."), .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ICE, @@ -5474,7 +5927,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NEEDLE_ARM] = { .name = { .moveName = _("Needle Arm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with thorny arms.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GRASS, @@ -5495,7 +5949,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLACK_OFF] = { .name = { .moveName = _("Slack Off") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slacks off and restores\n" + "half the maximum HP."), .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_NORMAL, @@ -5514,7 +5969,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_VOICE] = { .name = { .moveName = _("Hyper Voice") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A loud attack that uses\n" + "sound waves to injure."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -5530,7 +5986,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_FANG] = { .name = { .moveName = _("Poison Fang") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A sharp-fanged attack.\n" + "May badly poison the foe."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_POISON, @@ -5551,7 +6008,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_CLAW] = { .name = { .moveName = _("Crush Claw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Tears at the foe with sharp\n" + "claws. May lower Defense."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_NORMAL, @@ -5571,7 +6029,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAST_BURN] = { .name = { .moveName = _("Blast Burn") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Powerful, but leaves the\n" + "user immobile the next turn."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_FIRE, @@ -5589,7 +6048,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_CANNON] = { .name = { .moveName = _("Hydro Cannon") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Powerful, but leaves the\n" + "user immobile the next turn."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_WATER, @@ -5607,7 +6067,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_MASH] = { .name = { .moveName = _("Meteor Mash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires a meteor-like punch.\n" + "May raise Attack."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 100, .type = TYPE_STEEL, @@ -5629,7 +6090,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTONISH] = { .name = { .moveName = _("Astonish") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that may shock\n" + "the foe into flinching."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_GHOST, @@ -5650,7 +6112,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WEATHER_BALL] = { .name = { .moveName = _("Weather Ball") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The move's type and power\n" + "change with the weather."), .effect = EFFECT_WEATHER_BALL, .power = 50, .type = TYPE_NORMAL, @@ -5665,7 +6128,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATHERAPY] = { .name = { .moveName = _("Aromatherapy") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Heals all status problems\n" + "with a soothing scent."), .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_GRASS, @@ -5683,7 +6147,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_TEARS] = { .name = { .moveName = _("Fake Tears") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Feigns crying to sharply\n" + "lower the foe's Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_DARK, @@ -5699,7 +6164,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_CUTTER] = { .name = { .moveName = _("Air Cutter") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hacks with razorlike wind.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 55, .type = TYPE_FLYING, @@ -5716,7 +6182,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERHEAT] = { .name = { .moveName = _("Overheat") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Allows a full-power attack,\n" + "but sharply lowers Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, .type = TYPE_FIRE, @@ -5735,7 +6202,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ODOR_SLEUTH] = { .name = { .moveName = _("Odor Sleuth") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Negates the foe's efforts\n" + "to heighten evasiveness."), .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, @@ -5752,7 +6220,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_TOMB] = { .name = { .moveName = _("Rock Tomb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stops the foe from moving\n" + "with rocks and cuts Speed."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 50, .type = TYPE_ROCK, @@ -5771,7 +6240,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILVER_WIND] = { .name = { .moveName = _("Silver Wind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A powdery attack that may\n" + "raise abilities."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_BUG, @@ -5792,7 +6262,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_SOUND] = { .name = { .moveName = _("Metal Sound") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Emits a horrible screech\n" + "that sharply lowers Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_STEEL, @@ -5809,8 +6280,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_WHISTLE] = { - .name = { .moveName = _("GrassWhistle") }, - .description = COMPOUND_STRING("Dummy2 description."), + #if B_EXPANDED_MOVE_NAMES == TRUE + .name = { .moveName = _("Grass Whistle") }, + #else + .name = { .moveName = _("GrassWhistle") }, + #endif + .description = COMPOUND_STRING("Lulls the foe into sleep\n" + "with a pleasant melody."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -5828,7 +6304,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TICKLE] = { .name = { .moveName = _("Tickle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the foe laugh to\n" + "lower Attack and Defense."), .effect = EFFECT_TICKLE, .power = 0, .type = TYPE_NORMAL, @@ -5844,7 +6321,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COSMIC_POWER] = { .name = { .moveName = _("Cosmic Power") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises Defense and Sp. Def\n" + "with a mystic power."), .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_PSYCHIC, @@ -5862,7 +6340,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPOUT] = { .name = { .moveName = _("Water Spout") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Inflicts more damage if the\n" + "user's HP is high."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_WATER, @@ -5876,7 +6355,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIGNAL_BEAM] = { .name = { .moveName = _("Signal Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A strange beam attack that\n" + "may confuse the foe."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_BUG, @@ -5894,8 +6374,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_PUNCH] = { - .name = { .moveName = _("hadow Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .name = { .moveName = _("Shadow Punch") }, + .description = COMPOUND_STRING("An unavoidable punch that\n" + "is thrown from shadows."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GHOST, @@ -5911,7 +6392,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTRASENSORY] = { .name = { .moveName = _("Extrasensory") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a peculiar\n" + "power. May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -5931,7 +6413,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_UPPERCUT] = { .name = { .moveName = _("Sky Uppercut") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An uppercut thrown as if\n" + "leaping into the sky."), .effect = EFFECT_SKY_UPPERCUT, .power = 85, .type = TYPE_FIGHTING, @@ -5948,7 +6431,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_TOMB] = { .name = { .moveName = _("Sand Tomb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Traps and hurts the foe in\n" + "quicksand for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_GROUND, @@ -5965,7 +6449,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHEER_COLD] = { .name = { .moveName = _("Sheer Cold") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A chilling attack that\n" + "causes fainting if it hits."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_ICE, @@ -5979,7 +6464,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUDDY_WATER] = { .name = { .moveName = _("Muddy Water") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with muddy water.\n" + "May lower accuracy."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_WATER, @@ -5999,7 +6485,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_SEED] = { .name = { .moveName = _("Bullet Seed") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Shoots 2 to 5 seeds in a row\n" + "to strike the foe."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 25 : 10, .type = TYPE_GRASS, @@ -6014,7 +6501,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AERIAL_ACE] = { .name = { .moveName = _("Aerial Ace") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An extremely speedy and\n" + "unavoidable attack."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -6030,7 +6518,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_SPEAR] = { .name = { .moveName = _("Icicle Spear") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks the foe by firing\n" + "2 to 5 icicles in a row."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 25 : 10, .type = TYPE_ICE, @@ -6044,7 +6533,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_DEFENSE] = { .name = { .moveName = _("Iron Defense") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hardens the body's surface\n" + "to sharply raise Defense."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -6062,7 +6552,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOCK] = { .name = { .moveName = _("Block") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Blocks the foe's way to\n" + "prevent escape."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -6079,7 +6570,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOWL] = { .name = { .moveName = _("Howl") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Howls to raise the spirit\n" + "and boosts Attack."), .power = 0, .effect = B_UPDATED_MOVE_DATA >= GEN_8 ? EFFECT_ATTACK_UP_USER_ALLY : EFFECT_ATTACK_UP, .type = TYPE_NORMAL, @@ -6098,7 +6590,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CLAW] = { .name = { .moveName = _("Dragon Claw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slashes the foe with sharp\n" + "claws."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DRAGON, @@ -6113,7 +6606,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRENZY_PLANT] = { .name = { .moveName = _("Frenzy Plant") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Powerful, but leaves the\n" + "user immobile the next turn."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_GRASS, @@ -6132,7 +6626,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULK_UP] = { .name = { .moveName = _("Bulk Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Bulks up the body to boost\n" + "both Attack and Defense."), .effect = EFFECT_BULK_UP, .power = 0, .type = TYPE_FIGHTING, @@ -6150,7 +6645,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCE] = { .name = { .moveName = _("Bounce") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Bounces up, then down the\n" + "next turn. May paralyze."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 85, .type = TYPE_FLYING, @@ -6175,7 +6671,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SHOT] = { .name = { .moveName = _("Mud Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurls mud at the foe and\n" + "reduces Speed."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_GROUND, @@ -6194,7 +6691,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_TAIL] = { .name = { .moveName = _("Poison Tail") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Has a high critical-hit\n" + "ratio. May also poison."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_POISON, @@ -6215,7 +6713,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COVET] = { .name = { .moveName = _("Covet") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Cutely begs to obtain an\n" + "item held by the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 60 : 40, .type = TYPE_NORMAL, @@ -6237,7 +6736,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_TACKLE] = { .name = { .moveName = _("Volt Tackle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A life-risking tackle that\n" + "slightly hurts the user."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_ELECTRIC, @@ -6260,7 +6760,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_LEAF] = { .name = { .moveName = _("Magical Leaf") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a strange leaf\n" + "that cannot be evaded."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GRASS, @@ -6274,7 +6775,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPORT] = { .name = { .moveName = _("Water Sport") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user becomes soaked to\n" + "raise resistance to fire."), .effect = EFFECT_WATER_SPORT, .power = 0, .type = TYPE_WATER, @@ -6292,7 +6794,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CALM_MIND] = { .name = { .moveName = _("Calm Mind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises Sp. Atk and Sp. Def\n" + "by focusing the mind."), .effect = EFFECT_CALM_MIND, .power = 0, .type = TYPE_PSYCHIC, @@ -6310,7 +6813,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_BLADE] = { .name = { .moveName = _("Leaf Blade") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slashes with a sharp leaf.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 90 : 70, .type = TYPE_GRASS, @@ -6327,7 +6831,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DANCE] = { .name = { .moveName = _("Dragon Dance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A mystical dance that ups\n" + "Attack and Speed."), .effect = EFFECT_DRAGON_DANCE, .power = 0, .type = TYPE_DRAGON, @@ -6346,7 +6851,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_BLAST] = { .name = { .moveName = _("Rock Blast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurls boulders at the foe\n" + "2 to 5 times in a row."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_ROCK, @@ -6361,7 +6867,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHOCK_WAVE] = { .name = { .moveName = _("Shock Wave") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A fast and unavoidable\n" + "electric attack."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_ELECTRIC, @@ -6375,7 +6882,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PULSE] = { .name = { .moveName = _("Water Pulse") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with ultrasonic\n" + "waves. May confuse the foe."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_WATER, @@ -6395,7 +6903,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOOM_DESIRE] = { .name = { .moveName = _("Doom Desire") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Summons strong sunlight to\n" + "attack 2 turns later."), .effect = EFFECT_FUTURE_SIGHT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 120, .type = TYPE_STEEL, @@ -6411,7 +6920,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_BOOST] = { .name = { .moveName = _("Psycho Boost") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Allows a full-power attack,\n" + "but sharply lowers Sp. Atk."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_PSYCHIC, @@ -6429,7 +6939,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROOST] = { .name = { .moveName = _("Roost") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Restores the user's HP by\n" + "half of its max HP."), .effect = EFFECT_ROOST, .power = 0, .type = TYPE_FLYING, @@ -6448,7 +6959,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAVITY] = { .name = { .moveName = _("Gravity") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Gravity is intensified\n" + "negating levitation."), .effect = EFFECT_GRAVITY, .power = 0, .type = TYPE_PSYCHIC, @@ -6466,7 +6978,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRACLE_EYE] = { .name = { .moveName = _("Miracle Eye") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Negate evasiveness and\n" + "Dark-type's immunities."), .effect = EFFECT_MIRACLE_EYE, .power = 0, .type = TYPE_PSYCHIC, @@ -6483,7 +6996,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAKE_UP_SLAP] = { .name = { .moveName = _("Wake-Up Slap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Powerful against sleeping\n" + "foes, but also heals them."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 70 : 60, .type = TYPE_FIGHTING, @@ -6502,7 +7016,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAMMER_ARM] = { .name = { .moveName = _("Hammer Arm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A swinging fist attack\n" + "that also lowers Speed."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -6522,7 +7037,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GYRO_BALL] = { .name = { .moveName = _("Gyro Ball") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A high-speed spin that does\n" + "more damage to faster foes."), .effect = EFFECT_GYRO_BALL, .power = 1, .type = TYPE_STEEL, @@ -6538,7 +7054,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEALING_WISH] = { .name = { .moveName = _("Healing Wish") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHealingWishDescription, .effect = EFFECT_HEALING_WISH, .power = 0, .type = TYPE_PSYCHIC, @@ -6556,7 +7072,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRINE] = { .name = { .moveName = _("Brine") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Does double damage to foes\n" + "with half HP."), .effect = EFFECT_BRINE, .power = 65, .type = TYPE_WATER, @@ -6570,7 +7087,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURAL_GIFT] = { .name = { .moveName = _("Natural Gift") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The effectiveness varies\n" + "with the held Berry."), .effect = EFFECT_NATURAL_GIFT, .power = 1, .type = TYPE_NORMAL, @@ -6584,7 +7102,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT] = { .name = { .moveName = _("Feint") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that hits foes\n" + "using moves like Protect."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 30 : 50, .type = TYPE_NORMAL, @@ -6606,7 +7125,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLUCK] = { .name = { .moveName = _("Pluck") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sPluckDescription, .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -6624,7 +7143,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAILWIND] = { .name = { .moveName = _("Tailwind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Whips up a turbulent breeze\n" + "that raises Speed."), .effect = EFFECT_TAILWIND, .power = 0, .type = TYPE_FLYING, @@ -6643,7 +7163,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACUPRESSURE] = { .name = { .moveName = _("Acupressure") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user sharply raises\n" + "one of its stats."), .effect = EFFECT_ACUPRESSURE, .power = 0, .type = TYPE_NORMAL, @@ -6661,7 +7182,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_BURST] = { .name = { .moveName = _("Metal Burst") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Retaliates any hit with\n" + "greater power."), .effect = EFFECT_METAL_BURST, .power = 1, .type = TYPE_STEEL, @@ -6676,7 +7198,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_U_TURN] = { .name = { .moveName = _("U-turn") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sUTurnDescription, .effect = EFFECT_HIT_ESCAPE, .power = 70, .type = TYPE_BUG, @@ -6691,7 +7213,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLOSE_COMBAT] = { .name = { .moveName = _("Close Combat") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sCloseCombatDescription, .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIGHTING, @@ -6710,7 +7232,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAYBACK] = { .name = { .moveName = _("Payback") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that gains power\n" + "if the user moves last."), .effect = EFFECT_PAYBACK, .power = 50, .type = TYPE_DARK, @@ -6724,8 +7247,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSURANCE] = { - .name = { .moveName = _("Asurance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .name = { .moveName = _("Assurance") }, + .description = COMPOUND_STRING("An attack that gains power\n" + "if the foe has been hurt."), .effect = EFFECT_ASSURANCE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 50, .type = TYPE_DARK, @@ -6740,7 +7264,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBARGO] = { .name = { .moveName = _("Embargo") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Prevents the foe from\n" + "using any items."), .effect = EFFECT_EMBARGO, .power = 0, .type = TYPE_DARK, @@ -6756,7 +7281,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLING] = { .name = { .moveName = _("Fling") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The effectiveness varies\n" + "with the held item."), .effect = EFFECT_FLING, .power = 1, .type = TYPE_DARK, @@ -6771,7 +7297,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_SHIFT] = { .name = { .moveName = _("Psycho Shift") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Transfers status problems\n" + "to the foe."), .effect = EFFECT_PSYCHO_SHIFT, .power = 0, .type = TYPE_PSYCHIC, @@ -6786,7 +7313,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRUMP_CARD] = { .name = { .moveName = _("Trump Card") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The less PP the move has\n" + "the more damage it does."), .effect = EFFECT_TRUMP_CARD, .power = 1, .type = TYPE_NORMAL, @@ -6801,7 +7329,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BLOCK] = { .name = { .moveName = _("Heal Block") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Prevents the foe from\n" + "recovering any HP."), .effect = EFFECT_HEAL_BLOCK, .power = 0, .type = TYPE_PSYCHIC, @@ -6817,7 +7346,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRING_OUT] = { .name = { .moveName = _("Wring Out") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_NORMAL, @@ -6832,7 +7361,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRICK] = { .name = { .moveName = _("Power Trick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user swaps its Attack\n" + "and Defense stats."), .effect = EFFECT_POWER_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -6850,7 +7380,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GASTRO_ACID] = { .name = { .moveName = _("Gastro Acid") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stomach acid suppresses\n" + "the foe's ability."), .effect = EFFECT_GASTRO_ACID, .power = 0, .type = TYPE_POISON, @@ -6866,7 +7397,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUCKY_CHANT] = { .name = { .moveName = _("Lucky Chant") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Prevents the foe from\n" + "landing critical hits."), .effect = EFFECT_LUCKY_CHANT, .power = 0, .type = TYPE_NORMAL, @@ -6884,7 +7416,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ME_FIRST] = { .name = { .moveName = _("Me First") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Executes the foe's attack\n" + "with greater power."), .effect = EFFECT_ME_FIRST, .power = 0, .type = TYPE_NORMAL, @@ -6909,7 +7442,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COPYCAT] = { .name = { .moveName = _("Copycat") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user mimics the last\n" + "move used by a foe."), .effect = EFFECT_COPYCAT, .power = 0, .type = TYPE_NORMAL, @@ -6933,7 +7467,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SWAP] = { .name = { .moveName = _("Power Swap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swaps changes to Attack\n" + "and Sp. Atk with the foe."), .effect = EFFECT_POWER_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -6949,7 +7484,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SWAP] = { .name = { .moveName = _("Guard Swap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swaps changes to Defense\n" + "and Sp. Def with the foe."), .effect = EFFECT_GUARD_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -6965,7 +7501,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PUNISHMENT] = { .name = { .moveName = _("Punishment") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Does more damage if the\n" + "foe has powered up."), .effect = EFFECT_PUNISHMENT, .power = 60, .type = TYPE_DARK, @@ -6980,7 +7517,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESORT] = { .name = { .moveName = _("Last Resort") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Can only be used if every\n" + "other move has been used."), .effect = EFFECT_LAST_RESORT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 130, .type = TYPE_NORMAL, @@ -6995,7 +7533,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORRY_SEED] = { .name = { .moveName = _("Worry Seed") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Plants a seed on the foe\n" + "giving it Insomnia."), .effect = EFFECT_WORRY_SEED, .power = 0, .type = TYPE_GRASS, @@ -7011,7 +7550,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUCKER_PUNCH] = { .name = { .moveName = _("Sucker Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sSuckerPunchDescription, .effect = EFFECT_SUCKER_PUNCH, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 70 : 80, .type = TYPE_DARK, @@ -7026,7 +7565,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_SPIKES] = { .name = { .moveName = _("Toxic Spikes") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sets spikes that poison a\n" + "foe switching in."), .effect = EFFECT_TOXIC_SPIKES, .power = 0, .type = TYPE_POISON, @@ -7046,7 +7586,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_SWAP] = { .name = { .moveName = _("Heart Swap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swaps any stat changes\n" + "with the foe."), .effect = EFFECT_HEART_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -7062,7 +7603,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_RING] = { .name = { .moveName = _("Aqua Ring") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Forms a veil of water\n" + "that restores HP."), .effect = EFFECT_AQUA_RING, .power = 0, .type = TYPE_WATER, @@ -7080,7 +7622,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_RISE] = { .name = { .moveName = _("Magnet Rise") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user levitates with\n" + "electromagnetism."), .effect = EFFECT_MAGNET_RISE, .power = 0, .type = TYPE_ELECTRIC, @@ -7099,7 +7642,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLARE_BLITZ] = { .name = { .moveName = _("Flare Blitz") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A charge that may burn the\n" + "foe. Also hurts the user."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIRE, @@ -7122,7 +7666,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORCE_PALM] = { .name = { .moveName = _("Force Palm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A shock wave attack that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -7142,7 +7687,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_SPHERE] = { .name = { .moveName = _("Aura Sphere") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with an aura blast\n" + "that cannot be evaded."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 90, .type = TYPE_FIGHTING, @@ -7158,7 +7704,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_POLISH] = { .name = { .moveName = _("Rock Polish") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Polishes the body to\n" + "sharply raise Speed."), .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_ROCK, @@ -7176,7 +7723,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_JAB] = { .name = { .moveName = _("Poison Jab") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A stabbing attack that\n" + "may poison the foe."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_POISON, @@ -7196,7 +7744,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_PULSE] = { .name = { .moveName = _("Dark Pulse") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a horrible\n" + "aura. May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -7216,7 +7765,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SLASH] = { .name = { .moveName = _("Night Slash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits as soon as possible.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_DARK, @@ -7233,7 +7783,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_TAIL] = { .name = { .moveName = _("Aqua Tail") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user swings its tail\n" + "like a wave to attack."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -7248,7 +7799,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_BOMB] = { .name = { .moveName = _("Seed Bomb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A barrage of hard seeds\n" + "is fired at the foe."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GRASS, @@ -7263,7 +7815,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_SLASH] = { .name = { .moveName = _("Air Slash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a blade of\n" + "air. May cause flinching."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_FLYING, @@ -7283,7 +7836,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_X_SCISSOR] = { .name = { .moveName = _("X-Scissor") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slashes the foe with crossed\n" + "scythes, claws, etc."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_BUG, @@ -7299,7 +7853,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BUZZ] = { .name = { .moveName = _("Bug Buzz") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A damaging sound wave that\n" + "may lower Sp. Def."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_BUG, @@ -7320,7 +7875,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_PULSE] = { .name = { .moveName = _("Dragon Pulse") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Generates a shock wave to\n" + "damage the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 85 : 90, .type = TYPE_DRAGON, @@ -7335,7 +7891,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RUSH] = { .name = { .moveName = _("Dragon Rush") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Tackles the foe with menace.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -7356,7 +7913,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_GEM] = { .name = { .moveName = _("Power Gem") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with rays of light\n" + "that sparkle like diamonds."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 70, .type = TYPE_ROCK, @@ -7370,7 +7928,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAIN_PUNCH] = { .name = { .moveName = _("Drain Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, .type = TYPE_FIGHTING, @@ -7387,7 +7945,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VACUUM_WAVE] = { .name = { .moveName = _("Vacuum Wave") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Whirls its fists to send\n" + "a wave that strikes first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -7401,7 +7960,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_BLAST] = { .name = { .moveName = _("Focus Blast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks at full power.\n" + "May lower Sp. Def."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIGHTING, @@ -7421,7 +7981,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENERGY_BALL] = { .name = { .moveName = _("Energy Ball") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Draws power from nature to\n" + "attack. May lower Sp. Def."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 80, .type = TYPE_GRASS, @@ -7441,7 +8002,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRAVE_BIRD] = { .name = { .moveName = _("Brave Bird") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A low altitude charge that\n" + "also hurts the user."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FLYING, @@ -7457,7 +8019,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTH_POWER] = { .name = { .moveName = _("Earth Power") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the ground erupt with\n" + "power. May lower Sp. Def."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -7477,7 +8040,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWITCHEROO] = { .name = { .moveName = _("Switcheroo") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swaps items with the foe\n" + "faster than the eye can see."), .effect = EFFECT_TRICK, .power = 0, .type = TYPE_DARK, @@ -7495,7 +8059,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_IMPACT] = { .name = { .moveName = _("Giga Impact") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, .type = TYPE_NORMAL, @@ -7514,7 +8078,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NASTY_PLOT] = { .name = { .moveName = _("Nasty Plot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Thinks bad thoughts to\n" + "sharply boost Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, .type = TYPE_DARK, @@ -7532,7 +8097,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_PUNCH] = { .name = { .moveName = _("Bullet Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Punches as fast as a bul-\n" + "let. It always hits first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_STEEL, @@ -7548,7 +8114,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AVALANCHE] = { .name = { .moveName = _("Avalanche") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sRevengeDescription, .effect = EFFECT_REVENGE, .power = 60, .type = TYPE_ICE, @@ -7563,7 +8129,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SHARD] = { .name = { .moveName = _("Ice Shard") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurls a chunk of ice that\n" + "always strike first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ICE, @@ -7577,7 +8144,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_CLAW] = { .name = { .moveName = _("Shadow Claw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes with a shadow claw.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GHOST, @@ -7593,7 +8161,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_FANG] = { .name = { .moveName = _("Thunder Fang") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("May cause flinching or\n" + "leave the foe paralyzed."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ELECTRIC, @@ -7619,7 +8188,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_FANG] = { .name = { .moveName = _("Ice Fang") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("May cause flinching or\n" + "leave the foe frozen."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ICE, @@ -7644,7 +8214,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_FANG] = { .name = { .moveName = _("Fire Fang") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("May cause flinching or\n" + "leave the foe with a burn."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_FIRE, @@ -7670,7 +8241,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_SNEAK] = { .name = { .moveName = _("Shadow Sneak") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Extends the user's shadow\n" + "to strike first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GHOST, @@ -7685,7 +8257,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_BOMB] = { .name = { .moveName = _("Mud Bomb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Throws a blob of mud to\n" + "damage and cut accuracy."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_GROUND, @@ -7705,7 +8278,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_CUT] = { .name = { .moveName = _("Psycho Cut") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Tears with psychic blades.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -7721,7 +8295,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZEN_HEADBUTT] = { .name = { .moveName = _("Zen Headbutt") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with a strong head-\n" + "butt. May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -7740,8 +8315,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_SHOT] = { - .name = { .moveName = _("Mirro Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .name = { .moveName = _("Mirror Shot") }, + .description = COMPOUND_STRING("Emits a flash of energy to\n" + "damage and cut accuracy."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_STEEL, @@ -7760,7 +8336,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH_CANNON] = { .name = { .moveName = _("Flash Cannon") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Releases a blast of light\n" + "that may lower Sp. Def."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_STEEL, @@ -7779,7 +8356,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_CLIMB] = { .name = { .moveName = _("Rock Climb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A charging attack that may\n" + "confuse the foe."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -7799,7 +8377,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFOG] = { .name = { .moveName = _("Defog") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Removes obstacles and\n" + "lowers evasion."), .effect = EFFECT_DEFOG, .power = 0, .type = TYPE_FLYING, @@ -7816,7 +8395,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_ROOM] = { .name = { .moveName = _("Trick Room") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slower Pokémon get to move\n" + "first for 5 turns."), .effect = EFFECT_TRICK_ROOM, .power = 0, .type = TYPE_PSYCHIC, @@ -7832,7 +8412,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRACO_METEOR] = { .name = { .moveName = _("Draco Meteor") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Casts comets onto the foe.\n" + "Harshly lowers the Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, .type = TYPE_DRAGON, @@ -7850,7 +8431,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISCHARGE] = { .name = { .moveName = _("Discharge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Zaps the foes with electri-\n" + "city. May paralyze them."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -7869,7 +8451,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAVA_PLUME] = { .name = { .moveName = _("Lava Plume") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sLavaPlumeDescription, .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -7888,7 +8470,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_STORM] = { .name = { .moveName = _("Leaf Storm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Whips up a storm of leaves.\n" + "Harshly lowers the Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, .type = TYPE_GRASS, @@ -7906,7 +8489,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_WHIP] = { .name = { .moveName = _("Power Whip") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Violently lashes the foe\n" + "with vines or tentacles."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GRASS, @@ -7921,7 +8505,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_WRECKER] = { .name = { .moveName = _("Rock Wrecker") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, .type = TYPE_ROCK, @@ -7940,7 +8524,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_POISON] = { .name = { .moveName = _("Cross Poison") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A slash that may poison a\n" + "foe and do critical damage."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_POISON, @@ -7962,7 +8547,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUNK_SHOT] = { .name = { .moveName = _("Gunk Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Shoots filthy garbage at\n" + "the foe. May also poison."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_POISON, @@ -7981,7 +8567,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_HEAD] = { .name = { .moveName = _("Iron Head") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slams the foe with a hard\n" + "head. May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_STEEL, @@ -8001,7 +8588,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_BOMB] = { .name = { .moveName = _("Magnet Bomb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Launches a magnet that\n" + "strikes without fail."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_STEEL, @@ -8016,7 +8604,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_EDGE] = { .name = { .moveName = _("Stone Edge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stabs the foe with stones.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_ROCK, @@ -8031,7 +8620,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAPTIVATE] = { .name = { .moveName = _("Captivate") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the opposite gender\n" + "sharply reduce its Sp. Atk."), .effect = EFFECT_CAPTIVATE, .power = 0, .type = TYPE_NORMAL, @@ -8047,7 +8637,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEALTH_ROCK] = { .name = { .moveName = _("Stealth Rock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sets floating stones that\n" + "hurt a foe switching in."), .effect = EFFECT_STEALTH_ROCK, .power = 0, .type = TYPE_ROCK, @@ -8066,7 +8657,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_KNOT] = { .name = { .moveName = _("Grass Knot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A snare attack that does\n" + "more damage to heavier foes."), .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_GRASS, @@ -8082,7 +8674,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHATTER] = { .name = { .moveName = _("Chatter") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a sound wave\n" + "that causes confusion."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 60, .type = TYPE_FLYING, @@ -8116,7 +8709,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUDGMENT] = { .name = { .moveName = _("Judgment") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The type varies with the\n" + "kind of Plate held."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = 100, .type = TYPE_NORMAL, @@ -8131,7 +8725,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BITE] = { .name = { .moveName = _("Bug Bite") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sPluckDescription, .effect = EFFECT_HIT, .power = 60, .type = TYPE_BUG, @@ -8149,7 +8743,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE_BEAM] = { .name = { .moveName = _("Charge Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires a beam of electricity.\n" + "May raise Sp. Atk."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_ELECTRIC, @@ -8169,7 +8764,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WOOD_HAMMER] = { .name = { .moveName = _("Wood Hammer") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slams the body into a foe.\n" + "The user gets hurt too."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GRASS, @@ -8185,7 +8781,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_JET] = { .name = { .moveName = _("Aqua Jet") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes first by dashing\n" + "at the foe at a high speed."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -8200,7 +8797,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTACK_ORDER] = { .name = { .moveName = _("Attack Order") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Underlings pummel the foe.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_BUG, @@ -8215,7 +8813,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFEND_ORDER] = { .name = { .moveName = _("Defend Order") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises Defense and Sp. Def\n" + "with a living shield."), .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_BUG, @@ -8233,7 +8832,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_ORDER] = { .name = { .moveName = _("Heal Order") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user's underlings show\n" + "up to heal half its max HP."), .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_BUG, @@ -8252,7 +8852,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_SMASH] = { .name = { .moveName = _("Head Smash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A life-risking headbutt that\n" + "seriously hurts the user."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_ROCK, @@ -8268,7 +8869,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_HIT] = { .name = { .moveName = _("Double Hit") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slams the foe with a tail\n" + "etc. Strikes twice."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_NORMAL, @@ -8284,7 +8886,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR_OF_TIME] = { .name = { .moveName = _("Roar of Time") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Powerful, but leaves the\n" + "user immobile the next turn."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_DRAGON, @@ -8302,7 +8905,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPACIAL_REND] = { .name = { .moveName = _("Spacial Rend") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Tears the foe, and space.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -8317,7 +8921,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_DANCE] = { .name = { .moveName = _("Lunar Dance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHealingWishDescription, .effect = EFFECT_HEALING_WISH, .power = 0, .type = TYPE_PSYCHIC, @@ -8336,7 +8940,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_GRIP] = { .name = { .moveName = _("Crush Grip") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_NORMAL, @@ -8351,7 +8955,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGMA_STORM] = { .name = { .moveName = _("Magma Storm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Traps the foe in a vortex\n" + "of fire for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 120, .type = TYPE_FIRE, @@ -8368,7 +8973,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_VOID] = { .name = { .moveName = _("Dark Void") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Drags the foe into total\n" + "darkness, inducing Sleep."), .effect = EFFECT_DARK_VOID, .power = 0, .type = TYPE_DARK, @@ -8385,7 +8991,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_FLARE] = { .name = { .moveName = _("Seed Flare") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Generates a shock wave that\n" + "sharply reduces Sp. Def."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GRASS, @@ -8404,7 +9011,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OMINOUS_WIND] = { .name = { .moveName = _("Ominous Wind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A repulsive attack that may\n" + "raise all stats."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GHOST, @@ -8425,7 +9033,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_FORCE] = { .name = { .moveName = _("Shadow Force") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sShadowForceDescription, .effect = EFFECT_SEMI_INVULNERABLE, .power = 120, .type = TYPE_GHOST, @@ -8449,7 +9057,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HONE_CLAWS] = { .name = { .moveName = _("Hone Claws") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sharpens its claws to raise\n" + "Attack and Accuracy."), .effect = EFFECT_ATTACK_ACCURACY_UP, .power = 0, .type = TYPE_DARK, @@ -8467,7 +9076,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WIDE_GUARD] = { .name = { .moveName = _("Wide Guard") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades wide-ranging attacks\n" + "for one turn."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_ROCK, @@ -8488,7 +9098,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SPLIT] = { .name = { .moveName = _("Guard Split") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Averages changes to Defense\n" + "and Sp. Def with the foe."), .effect = EFFECT_GUARD_SPLIT, .power = 0, .type = TYPE_PSYCHIC, @@ -8504,7 +9115,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SPLIT] = { .name = { .moveName = _("Power Split") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Averages changes to Attack\n" + "and Sp. Atk with the foe."), .effect = EFFECT_POWER_SPLIT, .power = 0, .type = TYPE_PSYCHIC, @@ -8520,7 +9132,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WONDER_ROOM] = { .name = { .moveName = _("Wonder Room") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Defense and Sp. Def stats\n" + "are swapped for 5 turns."), .effect = EFFECT_WONDER_ROOM, .power = 0, .type = TYPE_PSYCHIC, @@ -8536,7 +9149,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHOCK] = { .name = { .moveName = _("Psyshock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sPsyshockDescription, .effect = EFFECT_PSYSHOCK, .power = 80, .type = TYPE_PSYCHIC, @@ -8550,7 +9163,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOSHOCK] = { .name = { .moveName = _("Venoshock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Does double damage if the\n" + "foe is poisoned."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = 65, .type = TYPE_POISON, @@ -8565,7 +9179,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AUTOTOMIZE] = { .name = { .moveName = _("Autotomize") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sheds additional weight to\n" + "sharply boost Speed."), .effect = EFFECT_AUTOTOMIZE, .power = 0, .type = TYPE_STEEL, @@ -8583,7 +9198,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_POWDER] = { .name = { .moveName = _("Rage Powder") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Scatters powder to make\n" + "foes attack only the user."), .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_BUG, @@ -8604,7 +9220,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEKINESIS] = { .name = { .moveName = _("Telekinesis") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the foe float. It is\n" + "easier to hit for 3 turns."), .effect = EFFECT_TELEKINESIS, .power = 0, .type = TYPE_PSYCHIC, @@ -8621,7 +9238,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_ROOM] = { .name = { .moveName = _("Magic Room") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hold items lose their\n" + "effects for 5 turns."), .effect = EFFECT_MAGIC_ROOM, .power = 0, .type = TYPE_PSYCHIC, @@ -8637,7 +9255,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMACK_DOWN] = { .name = { .moveName = _("Smack Down") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Throws a rock to knock the\n" + "foe down to the ground."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_ROCK, @@ -8656,7 +9275,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORM_THROW] = { .name = { .moveName = _("Storm Throw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sStormThrowDescription, .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, .type = TYPE_FIGHTING, @@ -8672,7 +9291,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_BURST] = { .name = { .moveName = _("Flame Burst") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A bursting flame that does\n" + "damage to all foes."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_FIRE, @@ -8690,7 +9310,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_WAVE] = { .name = { .moveName = _("Sludge Wave") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swamps the foe with a wave\n" + "of sludge. May also poison."), .effect = EFFECT_HIT, .power = 95, .type = TYPE_POISON, @@ -8709,7 +9330,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUIVER_DANCE] = { .name = { .moveName = _("Quiver Dance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Dances to raise Sp. Atk\n" + "Sp. Def and Speed."), .effect = EFFECT_QUIVER_DANCE, .power = 0, .type = TYPE_BUG, @@ -8728,7 +9350,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAVY_SLAM] = { .name = { .moveName = _("Heavy Slam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHeavySlamDescription, .effect = EFFECT_HEAT_CRASH, .power = 1, .type = TYPE_STEEL, @@ -8745,7 +9367,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNCHRONOISE] = { .name = { .moveName = _("Synchronoise") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An odd shock wave that only\n" + "damages same-type foes."), .effect = EFFECT_SYNCHRONOISE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 70, .type = TYPE_PSYCHIC, @@ -8759,7 +9382,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_BALL] = { .name = { .moveName = _("Electro Ball") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurls an orb that does more\n" + "damage to slower foes."), .effect = EFFECT_ELECTRO_BALL, .power = 1, .type = TYPE_ELECTRIC, @@ -8774,7 +9398,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOAK] = { .name = { .moveName = _("Soak") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sprays water at the foe\n" + "making it Water-type."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_WATER, @@ -8790,7 +9415,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_CHARGE] = { .name = { .moveName = _("Flame Charge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks in a cloak of\n" + "flames. Raises Speed."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_FIRE, @@ -8811,7 +9437,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COIL] = { .name = { .moveName = _("Coil") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Coils up to raise Attack\n" + "Defense and Accuracy."), .effect = EFFECT_COIL, .power = 0, .type = TYPE_POISON, @@ -8829,7 +9456,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_SWEEP] = { .name = { .moveName = _("Low Sweep") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks the foe's legs\n" + "lowering its Speed."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 60, .type = TYPE_FIGHTING, @@ -8849,7 +9477,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_SPRAY] = { .name = { .moveName = _("Acid Spray") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sprays a hide-melting acid.\n" + "Sharply reduces Sp. Def."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_POISON, @@ -8869,7 +9498,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOUL_PLAY] = { .name = { .moveName = _("Foul Play") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The higher the foe's Attack\n" + "the more damage caused."), .effect = EFFECT_FOUL_PLAY, .power = 95, .type = TYPE_DARK, @@ -8884,7 +9514,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIMPLE_BEAM] = { .name = { .moveName = _("Simple Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A beam that changes the\n" + "foe's ability to Simple."), .effect = EFFECT_SIMPLE_BEAM, .power = 0, .type = TYPE_NORMAL, @@ -8900,7 +9531,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENTRAINMENT] = { .name = { .moveName = _("Entrainment") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the foe mimic the\n" + "user, gaining its ability."), .effect = EFFECT_ENTRAINMENT, .power = 0, .type = TYPE_NORMAL, @@ -8916,7 +9548,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AFTER_YOU] = { .name = { .moveName = _("After You") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Helps out the foe, letting\n" + "it move next."), .effect = EFFECT_AFTER_YOU, .power = 0, .type = TYPE_NORMAL, @@ -8935,7 +9568,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROUND] = { .name = { .moveName = _("Round") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A song that inflicts damage.\n" + "Others can join in too."), .effect = EFFECT_ROUND, .power = 60, .type = TYPE_NORMAL, @@ -8954,7 +9588,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ECHOED_VOICE] = { .name = { .moveName = _("Echoed Voice") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Does more damage every turn\n" + "it is used."), .effect = EFFECT_ECHOED_VOICE, .power = 40, .type = TYPE_NORMAL, @@ -8970,7 +9605,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHIP_AWAY] = { .name = { .moveName = _("Chip Away") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sChipAwayDescription, .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -8986,7 +9621,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLEAR_SMOG] = { .name = { .moveName = _("Clear Smog") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with white haze that\n" + "eliminates all stat changes."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_POISON, @@ -9003,7 +9639,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORED_POWER] = { .name = { .moveName = _("Stored Power") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The higher the user's stats\n" + "the more damage caused."), .effect = EFFECT_STORED_POWER, .power = 20, .type = TYPE_PSYCHIC, @@ -9017,7 +9654,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_GUARD] = { .name = { .moveName = _("Quick Guard") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades priority attacks\n" + "for one turn."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIGHTING, @@ -9038,7 +9676,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLY_SWITCH] = { .name = { .moveName = _("Ally Switch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user switches places\n" + "with its partner."), .effect = EFFECT_ALLY_SWITCH, .power = 0, .type = TYPE_PSYCHIC, @@ -9055,7 +9694,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALD] = { .name = { .moveName = _("Scald") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Shoots boiling water at the\n" + "foe. May inflict a burn."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_WATER, @@ -9075,7 +9715,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SMASH] = { .name = { .moveName = _("Shell Smash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises offensive stats, but\n" + "lowers defensive stats."), .effect = EFFECT_SHELL_SMASH, .power = 0, .type = TYPE_NORMAL, @@ -9093,7 +9734,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_PULSE] = { .name = { .moveName = _("Heal Pulse") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Recovers up to half the\n" + "target's maximum HP."), .effect = EFFECT_HEAL_PULSE, .power = 0, .type = TYPE_PSYCHIC, @@ -9112,7 +9754,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEX] = { .name = { .moveName = _("Hex") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Does double damage if the\n" + "foe has a status problem."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 50, .type = TYPE_GHOST, @@ -9127,7 +9770,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_DROP] = { .name = { .moveName = _("Sky Drop") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Takes the foe into the sky\n" + "then drops it the next turn."), .effect = EFFECT_SKY_DROP, .power = 60, .type = TYPE_FLYING, @@ -9147,7 +9791,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHIFT_GEAR] = { .name = { .moveName = _("Shift Gear") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Rotates its gears to raise\n" + "Attack and Speed."), .effect = EFFECT_SHIFT_GEAR, .power = 0, .type = TYPE_STEEL, @@ -9165,7 +9810,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CIRCLE_THROW] = { .name = { .moveName = _("Circle Throw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sCircleThrowDescription, .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, .type = TYPE_FIGHTING, @@ -9182,7 +9827,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INCINERATE] = { .name = { .moveName = _("Incinerate") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Burns up Berries and Gems\n" + "preventing their use."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 30, .type = TYPE_FIRE, @@ -9199,7 +9845,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUASH] = { .name = { .moveName = _("Quash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Suppresses the foe, making\n" + "it move last."), .effect = EFFECT_QUASH, .power = 0, .type = TYPE_DARK, @@ -9215,7 +9862,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACROBATICS] = { .name = { .moveName = _("Acrobatics") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Does double damage if the\n" + "user has no item."), .effect = EFFECT_ACROBATICS, .power = 55, .type = TYPE_FLYING, @@ -9230,7 +9878,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT_TYPE] = { .name = { .moveName = _("Reflect Type") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user reflects the foe's\n" + "type, copying it."), .effect = EFFECT_REFLECT_TYPE, .power = 0, .type = TYPE_NORMAL, @@ -9247,7 +9896,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETALIATE] = { .name = { .moveName = _("Retaliate") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that does more\n" + "damage if an ally fainted."), .effect = EFFECT_RETALIATE, .power = 70, .type = TYPE_NORMAL, @@ -9262,7 +9912,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FINAL_GAMBIT] = { .name = { .moveName = _("Final Gambit") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user faints to damage\n" + "the foe equal to its HP."), .effect = EFFECT_FINAL_GAMBIT, .power = 1, .type = TYPE_FIGHTING, @@ -9278,7 +9929,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BESTOW] = { .name = { .moveName = _("Bestow") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user gives its held\n" + "item to the foe."), .effect = EFFECT_BESTOW, .power = 0, .type = TYPE_NORMAL, @@ -9298,7 +9950,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNO] = { .name = { .moveName = _("Inferno") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Powerful and sure to inflict\n" + "a burn, but inaccurate."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIRE, @@ -9317,7 +9970,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PLEDGE] = { .name = { .moveName = _("Water Pledge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a column of\n" + "water. May make a rainbow."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_WATER, @@ -9332,7 +9986,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PLEDGE] = { .name = { .moveName = _("Fire Pledge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a column of\n" + "fire. May burn the grass."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_FIRE, @@ -9347,7 +10002,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_PLEDGE] = { .name = { .moveName = _("Grass Pledge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a column of\n" + "grass. May create a swamp."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_GRASS, @@ -9362,7 +10018,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_SWITCH] = { .name = { .moveName = _("Volt Switch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sUTurnDescription, .effect = EFFECT_HIT_ESCAPE, .power = 70, .type = TYPE_ELECTRIC, @@ -9375,8 +10031,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE_BUG] = { - .name = { .moveName = _("Strugle Bug") }, - .description = COMPOUND_STRING("Dummy2 description."), + .name = { .moveName = _("Struggle Bug") }, + .description = COMPOUND_STRING("Resisting, the user attacks\n" + "the foe. Lowers Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 30, .type = TYPE_BUG, @@ -9395,7 +10052,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLDOZE] = { .name = { .moveName = _("Bulldoze") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stomps down on the ground.\n" + "Lowers Speed."), .effect = EFFECT_BULLDOZE, .power = 60, .type = TYPE_GROUND, @@ -9415,7 +10073,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FROST_BREATH] = { .name = { .moveName = _("Frost Breath") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sStormThrowDescription, .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, .type = TYPE_ICE, @@ -9430,7 +10088,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_TAIL] = { .name = { .moveName = _("Dragon Tail") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sCircleThrowDescription, .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, .type = TYPE_DRAGON, @@ -9447,7 +10105,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORK_UP] = { .name = { .moveName = _("Work Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user is roused.\n" + "Ups Attack and Sp. Atk."), .effect = EFFECT_ATTACK_SPATK_UP, .power = 0, .type = TYPE_NORMAL, @@ -9465,7 +10124,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTROWEB] = { .name = { .moveName = _("Electroweb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Snares the foe with an\n" + "electric net. Lowers Speed."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_ELECTRIC, @@ -9483,8 +10143,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILD_CHARGE] = { - .name = { .moveName = _("Wild Chagre") }, - .description = COMPOUND_STRING("Dummy2 description."), + .name = { .moveName = _("Wild Charge") }, + .description = COMPOUND_STRING("An electrical tackle that\n" + "also hurts the user."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_ELECTRIC, @@ -9500,7 +10161,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_RUN] = { .name = { .moveName = _("Drill Run") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Spins its body like a drill.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GROUND, @@ -9516,7 +10178,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_CHOP] = { .name = { .moveName = _("Dual Chop") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with brutal hits\n" + "that strike twice."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_DRAGON, @@ -9532,7 +10195,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_STAMP] = { .name = { .moveName = _("Heart Stamp") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A sudden blow after a cute\n" + "act. May cause flinching."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_PSYCHIC, @@ -9552,7 +10216,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_LEECH] = { .name = { .moveName = _("Horn Leech") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = 75, .type = TYPE_GRASS, @@ -9568,7 +10232,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_SWORD] = { .name = { .moveName = _("Sacred Sword") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sChipAwayDescription, .effect = EFFECT_HIT, .power = 90, .type = TYPE_FIGHTING, @@ -9585,7 +10249,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_SHELL] = { .name = { .moveName = _("Razor Shell") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Tears at the foe with sharp\n" + "shells. May lower Defense."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_WATER, @@ -9606,7 +10271,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_CRASH] = { .name = { .moveName = _("Heat Crash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHeavySlamDescription, .effect = EFFECT_HEAT_CRASH, .power = 1, .type = TYPE_FIRE, @@ -9622,7 +10287,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_TORNADO] = { .name = { .moveName = _("Leaf Tornado") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Circles the foe with leaves\n" + "to damage and cut accuracy."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_GRASS, @@ -9642,7 +10308,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAMROLLER] = { .name = { .moveName = _("Steamroller") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Crushes the foe with its\n" + "body. May cause flinching."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_BUG, @@ -9663,7 +10330,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_GUARD] = { .name = { .moveName = _("Cotton Guard") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Wraps its body in cotton.\n" + "Drastically raises Defense."), .effect = EFFECT_DEFENSE_UP_3, .power = 0, .type = TYPE_GRASS, @@ -9681,7 +10349,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_DAZE] = { .name = { .moveName = _("Night Daze") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Looses a pitch-black shock\n" + "wave. May lower accuracy."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -9700,7 +10369,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSTRIKE] = { .name = { .moveName = _("Psystrike") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sPsyshockDescription, .effect = EFFECT_PSYSHOCK, .power = 100, .type = TYPE_PSYCHIC, @@ -9714,7 +10383,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_SLAP] = { .name = { .moveName = _("Tail Slap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes the foe with its\n" + "tail 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_NORMAL, @@ -9729,7 +10399,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HURRICANE] = { .name = { .moveName = _("Hurricane") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Traps the foe in a fierce\n" + "wind. May cause confusion."), .effect = EFFECT_THUNDER, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_FLYING, @@ -9750,7 +10421,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_CHARGE] = { .name = { .moveName = _("Head Charge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A charge using guard hair.\n" + "It hurts the user a little."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -9766,7 +10438,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_GRIND] = { .name = { .moveName = _("Gear Grind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Throws two steel gears\n" + "that strike twice."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -9782,7 +10455,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEARING_SHOT] = { .name = { .moveName = _("Searing Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sLavaPlumeDescription, .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIRE, @@ -9802,7 +10475,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TECHNO_BLAST] = { .name = { .moveName = _("Techno Blast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The type varies with the\n" + "kind of Drive held."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 85, .type = TYPE_NORMAL, @@ -9818,7 +10492,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RELIC_SONG] = { .name = { .moveName = _("Relic Song") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with an ancient\n" + "song. May induce sleep."), .effect = EFFECT_RELIC_SONG, .power = 75, .type = TYPE_NORMAL, @@ -9841,7 +10516,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_SWORD] = { .name = { .moveName = _("Secret Sword") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Cuts with a long horn that\n" + "does physical damage."), .effect = EFFECT_PSYSHOCK, .power = 85, .type = TYPE_FIGHTING, @@ -9857,7 +10533,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIATE] = { .name = { .moveName = _("Glaciate") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Blows very cold air at the\n" + "foe. It lowers their Speed."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ICE, @@ -9876,7 +10553,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_STRIKE] = { .name = { .moveName = _("Bolt Strike") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes with a great amount\n" + "of lightning. May paralyze."), .effect = EFFECT_HIT, .power = 130, .type = TYPE_ELECTRIC, @@ -9896,7 +10574,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLUE_FLARE] = { .name = { .moveName = _("Blue Flare") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Engulfs the foe in a blue\n" + "flame. May inflict a burn."), .effect = EFFECT_HIT, .power = 130, .type = TYPE_FIRE, @@ -9915,7 +10594,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_DANCE] = { .name = { .moveName = _("Fiery Dance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Dances cloaked in flames.\n" + "May raise Sp. Atk."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -9936,7 +10616,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_SHOCK] = { .name = { .moveName = _("Freeze Shock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A powerful 2-turn move that\n" + "may paralyze the foe."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_ICE, @@ -9959,7 +10640,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BURN] = { .name = { .moveName = _("Ice Burn") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A powerful 2-turn move that\n" + "may inflict a burn."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_ICE, @@ -9982,7 +10664,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNARL] = { .name = { .moveName = _("Snarl") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Yells and rants at the foe\n" + "lowering its Sp. Atk."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_DARK, @@ -10004,7 +10687,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_CRASH] = { .name = { .moveName = _("Icicle Crash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Drops large icicles on the\n" + "foe. May cause flinching."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_ICE, @@ -10023,7 +10707,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_V_CREATE] = { .name = { .moveName = _("V-create") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Very powerful, but lowers\n" + "Defense, Sp. Def and Speed."), .effect = EFFECT_HIT, .power = 180, .type = TYPE_FIRE, @@ -10043,7 +10728,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_FLARE] = { .name = { .moveName = _("Fusion Flare") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Summons a fireball. Works\n" + "well with a thunderbolt."), .effect = EFFECT_FUSION_COMBO, .power = 100, .type = TYPE_FIRE, @@ -10058,7 +10744,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_BOLT] = { .name = { .moveName = _("Fusion Bolt") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Summons a thunderbolt.\n" + "Works well with a fireball."), .effect = EFFECT_FUSION_COMBO, .power = 100, .type = TYPE_ELECTRIC, @@ -10072,7 +10759,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLYING_PRESS] = { .name = { .moveName = _("Flying Press") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("This attack does Fighting\n" + "and Flying-type damage."), .effect = EFFECT_TWO_TYPED_MOVE, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 100 : 80, .type = TYPE_FIGHTING, @@ -10091,7 +10779,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAT_BLOCK] = { .name = { .moveName = _("Mat Block") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades damaging moves\n" + "for one turn."), .effect = EFFECT_MAT_BLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -10114,7 +10803,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELCH] = { .name = { .moveName = _("Belch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lets out a loud belch.\n" + "Must eat a Berry to use it."), .effect = EFFECT_BELCH, .power = 120, .type = TYPE_POISON, @@ -10136,7 +10826,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROTOTILLER] = { .name = { .moveName = _("Rototiller") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Ups the Attack and Sp. Atk\n" + "of Grass-type Pokémon."), .effect = EFFECT_ROTOTILLER, .power = 0, .type = TYPE_GROUND, @@ -10154,7 +10845,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STICKY_WEB] = { .name = { .moveName = _("Sticky Web") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Weaves a sticky net that\n" + "slows foes switching in."), .effect = EFFECT_STICKY_WEB, .power = 0, .type = TYPE_BUG, @@ -10173,7 +10865,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FELL_STINGER] = { .name = { .moveName = _("Fell Stinger") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("If it knocks out a foe\n" + "the Attack stat is raised."), .effect = EFFECT_FELL_STINGER, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 50 : 30, .type = TYPE_BUG, @@ -10192,7 +10885,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PhantomForce") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = sShadowForceDescription, .effect = EFFECT_SEMI_INVULNERABLE, .power = 90, .type = TYPE_GHOST, @@ -10216,11 +10909,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_OR_TREAT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Trick-or-Treat") }, + .name = { .moveName = _("Trick-Or-Treat") }, #else .name = { .moveName = _("TrickOrTreat") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Goes trick-or-treating\n" + "making the foe Ghost-type."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GHOST, @@ -10237,7 +10931,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOBLE_ROAR] = { .name = { .moveName = _("Noble Roar") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Intimidates the foe, to cut\n" + "Attack and Sp. Atk."), .effect = EFFECT_NOBLE_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -10255,7 +10950,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ION_DELUGE] = { .name = { .moveName = _("Ion Deluge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Electrifies Normal-type\n" + "moves with charged atoms."), .effect = EFFECT_ION_DELUGE, .power = 0, .type = TYPE_ELECTRIC, @@ -10274,9 +10970,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #if B_EXPANDED_MOVE_NAMES == TRUE .name = { .moveName = _("Parabolic Charge") }, #else - .name = { .moveName = _("ParaboldChrg") }, + .name = { .moveName = _("ParabolcChrg") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Damages adjacent Pokémon and\n" + "heals up by half of it."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 65 : 50, .type = TYPE_ELECTRIC, @@ -10295,7 +10992,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("Forest'sCurs") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Puts a curse on the foe\n" + "making the foe Grass-type."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GRASS, @@ -10316,7 +11014,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PetalBlizzrd") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stirs up a violent storm\n" + "of petals to attack."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GRASS, @@ -10331,7 +11030,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_DRY] = { .name = { .moveName = _("Freeze-Dry") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Super effective on Water-\n" + "types. May cause freezing."), .effect = EFFECT_FREEZE_DRY, .power = 70, .type = TYPE_ICE, @@ -10354,7 +11054,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DisrmngVoice") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lets out a charming cry\n" + "that cannot be evaded."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FAIRY, @@ -10370,7 +11071,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARTING_SHOT] = { .name = { .moveName = _("Parting Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lowers the foe's Attack and\n" + "Sp. Atk, then switches out."), .effect = EFFECT_PARTING_SHOT, .power = 0, .type = TYPE_DARK, @@ -10388,7 +11090,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOPSY_TURVY] = { .name = { .moveName = _("Topsy-Turvy") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swaps all stat changes that\n" + "affect the target."), .effect = EFFECT_TOPSY_TURVY, .power = 0, .type = TYPE_DARK, @@ -10408,7 +11111,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DrainingKiss") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = sDrainingKissDescription, .effect = EFFECT_ABSORB, .power = 50, .type = TYPE_FAIRY, @@ -10429,7 +11132,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("CraftyShield") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades status moves for\n" + "one turn."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FAIRY, @@ -10452,7 +11156,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("FlowerShield") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises the Defense of\n" + "Grass-type Pokémon."), .effect = EFFECT_FLOWER_SHIELD, .power = 0, .type = TYPE_FAIRY, @@ -10473,7 +11178,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("GrssyTerrain") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The ground turns to grass\n" + "for 5 turns. Restores HP."), .effect = EFFECT_GRASSY_TERRAIN, .power = 0, .type = TYPE_GRASS, @@ -10495,7 +11201,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MistyTerrain") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Covers the ground with mist\n" + "for 5 turns. Blocks status."), .effect = EFFECT_MISTY_TERRAIN, .power = 0, .type = TYPE_FAIRY, @@ -10513,7 +11220,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIFY] = { .name = { .moveName = _("Electrify") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Electrifies the foe, making\n" + "its next move Electric-type."), .effect = EFFECT_ELECTRIFY, .power = 0, .type = TYPE_ELECTRIC, @@ -10528,7 +11236,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_ROUGH] = { .name = { .moveName = _("Play Rough") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Plays rough with the foe.\n" + "May lower Attack."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_FAIRY, @@ -10548,7 +11257,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_WIND] = { .name = { .moveName = _("Fairy Wind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stirs up a fairy wind to\n" + "strike the foe."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FAIRY, @@ -10563,7 +11273,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONBLAST] = { .name = { .moveName = _("Moonblast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with the power of\n" + "the moon. May lower Sp. Atk."), .effect = EFFECT_HIT, .power = 95, .type = TYPE_FAIRY, @@ -10582,7 +11293,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOOMBURST] = { .name = { .moveName = _("Boomburst") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks everything with a\n" + "destructive sound wave."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_NORMAL, @@ -10598,7 +11310,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_LOCK] = { .name = { .moveName = _("Fairy Lock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Locks down the battlefield\n" + "preventing escape next turn."), .effect = EFFECT_FAIRY_LOCK, .power = 0, .type = TYPE_FAIRY, @@ -10619,7 +11332,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("King'sShield") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades damage, and sharply\n" + "reduces Attack if struck."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_STEEL, @@ -10641,7 +11355,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_NICE] = { .name = { .moveName = _("Play Nice") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Befriend the foe, lowering\n" + "its Attack without fail."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -10659,7 +11374,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFIDE] = { .name = { .moveName = _("Confide") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Shares a secret with the\n" + "foe, lowering Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -10682,7 +11398,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DiamondStorm") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Whips up a storm of\n" + "diamonds. May up Defense."), .power = 100, .type = TYPE_ROCK, .accuracy = 95, @@ -10705,7 +11422,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SteamErption") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Immerses the foe in heated\n" + "steam. May inflict a burn."), .effect = EFFECT_HIT, .power = 110, .type = TYPE_WATER, @@ -10726,11 +11444,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_HOLE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Hyperspace Hole") }, + .name = { .moveName = _("Hyprspace Hole") }, #else .name = { .moveName = _("HyprspceHole") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHyperspaceHoleDescription, .effect = EFFECT_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -10754,7 +11472,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("WatrShuriken") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Throws 2 to 5 stars that\n" + "are sure to strike first."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_WATER, @@ -10772,7 +11491,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MysticalFire") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Breathes a special, hot\n" + "fire. Lowers Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 75 : 65, .type = TYPE_FIRE, @@ -10791,7 +11511,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKY_SHIELD] = { .name = { .moveName = _("Spiky Shield") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades attack, and damages\n" + "the foe if struck."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_GRASS, @@ -10816,7 +11537,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("AromaticMist") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises the Sp. Def of a\n" + "partner Pokémon."), .effect = EFFECT_AROMATIC_MIST, .power = 0, .type = TYPE_FAIRY, @@ -10838,7 +11560,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("EerieImpulse") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Exposes the foe to a pulse\n" + "that sharply cuts Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_2, .power = 0, .type = TYPE_ELECTRIC, @@ -10854,7 +11577,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOM_DRENCH] = { .name = { .moveName = _("Venom Drench") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lowers the Attack, Sp. Atk\n" + "and Speed of a poisoned foe."), .effect = EFFECT_VENOM_DRENCH, .power = 0, .type = TYPE_POISON, @@ -10870,7 +11594,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER] = { .name = { .moveName = _("Powder") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Damages the foe if it uses\n" + "a Fire-type move."), .effect = EFFECT_POWDER, .power = 0, .type = TYPE_BUG, @@ -10887,7 +11612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEOMANCY] = { .name = { .moveName = _("Geomancy") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises Sp. Atk, Sp. Def and\n" + "Speed on the 2nd turn."), .effect = EFFECT_GEOMANCY, .power = 0, .type = TYPE_FAIRY, @@ -10910,7 +11636,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MagneticFlux") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Boosts the defenses of\n" + "those with Plus or Minus."), .effect = EFFECT_MAGNETIC_FLUX, .power = 0, .type = TYPE_ELECTRIC, @@ -10929,7 +11656,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAPPY_HOUR] = { .name = { .moveName = _("Happy Hour") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Doubles the amount of\n" + "Prize Money received."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -10950,7 +11678,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ElctrcTrrain") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Electrifies the ground for\n" + "5 turns. Prevents sleep."), .effect = EFFECT_ELECTRIC_TERRAIN, .power = 0, .type = TYPE_ELECTRIC, @@ -10972,7 +11701,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DazzlngGleam") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Damages foes by emitting\n" + "a bright flash."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FAIRY, @@ -10986,7 +11716,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CELEBRATE] = { .name = { .moveName = _("Celebrate") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Congratulates you on your\n" + "special day."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -11009,7 +11740,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_HANDS] = { .name = { .moveName = _("Hold Hands") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user and ally hold hands\n" + "making them happy."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -11036,7 +11768,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BabyDollEyes") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lowers the foe's Attack\n" + "before it can move."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_FAIRY, @@ -11052,7 +11785,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NUZZLE] = { .name = { .moveName = _("Nuzzle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Rubs its cheecks against\n" + "the foe, paralyzing it."), .effect = EFFECT_HIT, .power = 20, .type = TYPE_ELECTRIC, @@ -11072,7 +11806,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_BACK] = { .name = { .moveName = _("Hold Back") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sFalseSwipeDescription, .effect = EFFECT_FALSE_SWIPE, .power = 40, .type = TYPE_NORMAL, @@ -11087,7 +11821,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFESTATION] = { .name = { .moveName = _("Infestation") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The foe is infested and\n" + "attacked for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = 20, .type = TYPE_BUG, @@ -11109,7 +11844,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PowerUpPunch") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A hard punch that raises\n" + "the user's Attack."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -11135,7 +11871,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("OblivionWing") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = sDrainingKissDescription, .effect = EFFECT_ABSORB, .power = 80, .type = TYPE_FLYING, @@ -11155,7 +11891,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ThousndArrws") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Can hit Flying foes, then\n" + "knocks them to the ground."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -11180,7 +11917,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ThousndWaves") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Those hit by the wave can\n" + "no longer escape."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -11199,7 +11937,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LANDS_WRATH] = { .name = { .moveName = _("Land's Wrath") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Gathers the energy of the\n" + "land to attack every foe."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -11214,11 +11953,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_OF_RUIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Light of Ruin") }, + .name = { .moveName = _("Light Of Ruin") }, #else .name = { .moveName = _("LightOfRuin") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires a great beam of light\n" + "that also hurts the user."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_FAIRY, @@ -11234,7 +11974,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORIGIN_PULSE] = { .name = { .moveName = _("Origin Pulse") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Beams of glowing blue light\n" + "blast both foes."), .effect = EFFECT_HIT, .power = 110, .type = TYPE_WATER, @@ -11254,7 +11995,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PrcipceBldes") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fearsome blades of stone\n" + "attack both foes."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GROUND, @@ -11273,7 +12015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DragonAscent") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = sCloseCombatDescription, .effect = EFFECT_HIT, .power = 120, .type = TYPE_FLYING, @@ -11297,7 +12039,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("HyprspceFury") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = sHyperspaceHoleDescription, .effect = EFFECT_HYPERSPACE_FURY, .power = 100, .type = TYPE_DARK, @@ -11321,7 +12063,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHORE_UP] = { .name = { .moveName = _("Shore Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Restores the user's HP.\n" + "More HP in a sandstorm."), .effect = EFFECT_SHORE_UP, .power = 0, .type = TYPE_GROUND, @@ -11344,7 +12087,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("FrstImpressn") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits hard and first.\n" + "Only works first turn."), .effect = EFFECT_FAKE_OUT, .power = 90, .type = TYPE_BUG, @@ -11363,7 +12107,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BanefulBunkr") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Protects user and poisons\n" + "foes on contact."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_POISON, @@ -11388,7 +12133,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SpiritShackl") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("After being hit, foes can\n" + "no longer escape."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GHOST, @@ -11411,7 +12157,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DarkstLariat") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swings the arms to strike\n" + "It ignores stat changes."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -11431,7 +12178,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SparklngAria") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sings with bubbles. Cures\n" + "burns on contact."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -11453,7 +12201,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_HAMMER] = { .name = { .moveName = _("Ice Hammer") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swings the fist to strike.\n" + "Lowers the user's Speed."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_ICE, @@ -11473,11 +12222,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLORAL_HEALING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Floral Healing") }, + .name = { .moveName = _("Floral Healng") }, #else .name = { .moveName = _("FloralHealng") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Restores an ally's HP.\n" + "Heals more on grass."), .effect = EFFECT_HEAL_PULSE, .power = 0, .type = TYPE_FAIRY, @@ -11498,9 +12248,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #if B_EXPANDED_MOVE_NAMES == TRUE .name = { .moveName = _("High Horsepower") }, #else - .name = { .moveName = _("HighHorseprw") }, + .name = { .moveName = _("HighHorsepwr") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slams hard into the foe with\n" + "its entire body."), .effect = EFFECT_HIT, .power = 95, .type = TYPE_GROUND, @@ -11515,7 +12266,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH_SAP] = { .name = { .moveName = _("Strength Sap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Saps the foe's Attack to\n" + "heal HP, then drops Attack."), .effect = EFFECT_STRENGTH_SAP, .power = 0, .type = TYPE_GRASS, @@ -11532,7 +12284,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BLADE] = { .name = { .moveName = _("Solar Blade") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Charges first turn, then\n" + "chops with a blade of light."), .effect = EFFECT_SOLAR_BEAM, .power = 125, .type = TYPE_GRASS, @@ -11551,7 +12304,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAFAGE] = { .name = { .moveName = _("Leafage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a flurry of\n" + "small leaves."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GRASS, @@ -11565,7 +12319,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPOTLIGHT] = { .name = { .moveName = _("Spotlight") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the foe attack the\n" + "spotlighted Pokémon."), .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_NORMAL, @@ -11585,7 +12340,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_THREAD] = { .name = { .moveName = _("Toxic Thread") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a thread that\n" + "poisons and drops Speed."), .effect = EFFECT_TOXIC_THREAD, .power = 0, .type = TYPE_POISON, @@ -11601,7 +12357,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASER_FOCUS] = { .name = { .moveName = _("Laser Focus") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Guarantees the next move\n" + "will be a critical hit."), .effect = EFFECT_LASER_FOCUS, .power = 0, .type = TYPE_NORMAL, @@ -11619,7 +12376,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_UP] = { .name = { .moveName = _("Gear Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Boosts the attacks of\n" + "those with Plus or Minus."), .effect = EFFECT_GEAR_UP, .power = 0, .type = TYPE_STEEL, @@ -11638,7 +12396,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THROAT_CHOP] = { .name = { .moveName = _("Throat Chop") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Chops the throat to disable\n" + "sound moves for a while."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -11658,7 +12417,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLLEN_PUFF] = { .name = { .moveName = _("Pollen Puff") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Explodes on foes, but\n" + "restores ally's HP."), .effect = EFFECT_HIT_ENEMY_HEAL_ALLY, .power = 90, .type = TYPE_BUG, @@ -11673,7 +12433,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCHOR_SHOT] = { .name = { .moveName = _("Anchor Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strangles the foe with a\n" + "chain. The foe can't escape."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_STEEL, @@ -11697,7 +12458,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PsychcTrrain") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The ground turns weird for\n" + "5 turns. Blocks priority."), .effect = EFFECT_PSYCHIC_TERRAIN, .power = 0, .type = TYPE_PSYCHIC, @@ -11714,7 +12476,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNGE] = { .name = { .moveName = _("Lunge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lunges at the foe to lower\n" + "its Attack stat."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_BUG, @@ -11734,7 +12497,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_LASH] = { .name = { .moveName = _("Fire Lash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Whips the foe with fire\n" + "lowering its Defense."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -11754,7 +12518,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRIP] = { .name = { .moveName = _("Power Trip") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("It hits harder the more\n" + "stat boosts the user has."), .effect = EFFECT_STORED_POWER, .power = 20, .type = TYPE_DARK, @@ -11769,7 +12534,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURN_UP] = { .name = { .moveName = _("Burn Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Burns out the user fully\n" + "removing the Fire type."), .effect = EFFECT_FAIL_IF_NOT_ARG_TYPE, .power = 130, .type = TYPE_FIRE, @@ -11789,7 +12555,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPEED_SWAP] = { .name = { .moveName = _("Speed Swap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swaps user's Speed with\n" + "the target's."), .effect = EFFECT_SPEED_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -11805,7 +12572,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMART_STRIKE] = { .name = { .moveName = _("Smart Strike") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with an accurate\n" + "horn that never misses."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_STEEL, @@ -11820,7 +12588,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURIFY] = { .name = { .moveName = _("Purify") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Cures the foe's status\n" + "to restore HP."), .effect = EFFECT_PURIFY, .power = 0, .type = TYPE_POISON, @@ -11842,7 +12611,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("RvlationDnce") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Dances with mystical power.\n" + "Matches user's first type."), .effect = EFFECT_REVELATION_DANCE, .power = 90, .type = TYPE_NORMAL, @@ -11861,7 +12631,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("CoreEnforcer") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with a ray that\n" + "nullifies the foe's ability."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -11878,8 +12649,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TROP_KICK] = { - .name = { .moveName = _("Trop kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .name = { .moveName = _("Trop Kick") }, + .description = COMPOUND_STRING("An intense kick from the\n" + "tropics. Lowers Attack."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GRASS, @@ -11899,7 +12671,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INSTRUCT] = { .name = { .moveName = _("Instruct") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Orders the target to use\n" + "its last move again."), .effect = EFFECT_INSTRUCT, .power = 0, .type = TYPE_PSYCHIC, @@ -11918,7 +12691,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAK_BLAST] = { .name = { .moveName = _("Beak Blast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Heats up beak to attack.\n" + "Burns foe on contact."), .effect = EFFECT_BEAK_BLAST, .power = 100, .type = TYPE_FLYING, @@ -11944,7 +12718,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ClngngScales") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes a big noise with\n" + "its scales. Drops Defense."), .effect = EFFECT_HIT, .power = 110, .type = TYPE_DRAGON, @@ -11968,7 +12743,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DragonHammer") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swings its whole body\n" + "like a hammer to damage."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_DRAGON, @@ -11983,7 +12759,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRUTAL_SWING] = { .name = { .moveName = _("Brutal Swing") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Violently swings around\n" + "to hurt everyone nearby."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DARK, @@ -11998,7 +12775,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_VEIL] = { .name = { .moveName = _("Aurora Veil") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Weakens all attacks, but\n" + "only usable with hail."), .effect = EFFECT_AURORA_VEIL, .power = 0, .type = TYPE_ICE, @@ -12016,7 +12794,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_TRAP] = { .name = { .moveName = _("Shell Trap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sets a shell trap that\n" + "damages on contact."), .effect = EFFECT_SHELL_TRAP, .power = 150, .type = TYPE_FIRE, @@ -12037,7 +12816,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLEUR_CANNON] = { .name = { .moveName = _("Fleur Cannon") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A strong ray that harshly\n" + "lowers Sp. Attack."), .effect = EFFECT_HIT, .power = 130, .type = TYPE_FAIRY, @@ -12060,7 +12840,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PsychicFangs") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Chomps with psychic fangs.\n" + "Destroys any barriers."), .effect = EFFECT_BRICK_BREAK, .power = 85, .type = TYPE_PSYCHIC, @@ -12080,7 +12861,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("StmpngTantrm") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Stomps around angrily.\n" + "Stronger after a failure."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, .type = TYPE_GROUND, @@ -12096,7 +12878,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BONE] = { .name = { .moveName = _("Shadow Bone") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes with a haunted\n" + "bone. Might drop Defense."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_GHOST, @@ -12115,7 +12898,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACCELEROCK] = { .name = { .moveName = _("Accelerock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with a high-speed\n" + "rock that always goes first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ROCK, @@ -12130,7 +12914,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIQUIDATION] = { .name = { .moveName = _("Liquidation") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Slams the foe with water.\n" + "Can lower Defense."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_WATER, @@ -12154,7 +12939,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PrsmaticLasr") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A high power laser that\n" + "forces recharge next turn."), .effect = EFFECT_HIT, .power = 160, .type = TYPE_PSYCHIC, @@ -12176,7 +12962,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SpectrlThief") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Steals the target's stat\n" + "boosts, then attacks."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GHOST, @@ -12200,7 +12987,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SnsteelStrke") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A sun-fueled strike that\n" + "ignores abilities."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_STEEL, @@ -12221,7 +13009,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MoongestBeam") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A moon-powered beam that\n" + "ignores abilities."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_GHOST, @@ -12237,7 +13026,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEARFUL_LOOK] = { .name = { .moveName = _("Tearful Look") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user tears up, dropping\n" + "Attack and Sp. Attack."), .effect = EFFECT_NOBLE_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -12254,7 +13044,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZING_ZAP] = { .name = { .moveName = _("Zing Zap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An electrified impact that\n" + "can cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -12277,7 +13068,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("Natur'sMadns") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Halves the foe's HP with\n" + "the power of nature."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_FAIRY, @@ -12292,7 +13084,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MULTI_ATTACK] = { .name = { .moveName = _("Multi-Attack") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that changes\n" + "with Memories."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 120 : 90, .type = TYPE_NORMAL, @@ -12308,7 +13101,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_BLOWN] = { .name = { .moveName = _("Mind Blown") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("It explodes the user's head\n" + "to damage everything around."), .effect = EFFECT_MIND_BLOWN, .power = 150, .type = TYPE_FIRE, @@ -12323,7 +13117,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLASMA_FISTS] = { .name = { .moveName = _("Plasma Fists") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with electrical fists.\n" + "Normal moves become Electric."), .effect = EFFECT_PLASMA_FISTS, .power = 100, .type = TYPE_ELECTRIC, @@ -12344,7 +13139,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PhotonGeyser") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("User's highest attack stat\n" + "determines its category."), .effect = EFFECT_PHOTON_GEYSER, .power = 100, .type = TYPE_PSYCHIC, @@ -12360,7 +13156,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZIPPY_ZAP] = { .name = { .moveName = _("Zippy Zap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Electric bursts always go\n" + "first and land a critical hit."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 50, .type = TYPE_ELECTRIC, @@ -12389,7 +13186,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SplishySplsh") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A huge electrified wave that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -12410,7 +13208,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOATY_FALL] = { .name = { .moveName = _("Floaty Fall") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Floats in air and dives at\n" + "angle. May cause flinching."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_FLYING, @@ -12433,7 +13232,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIKA_PAPOW] = { .name = { .moveName = _("Pika Papow") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Pikachu's love increases its\n" + "power. It never misses."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_ELECTRIC, @@ -12453,7 +13253,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BouncyBubble") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that absorbs\n" + #if B_UPDATED_MOVE_DATA >= GEN_8 + "all the damage inflicted."), + #else + "half the damage inflicted."), + #endif .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_WATER, @@ -12471,7 +13276,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUZZY_BUZZ] = { .name = { .moveName = _("Buzzy Buzz") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Shoots a jolt of electricity\n" + "that always paralyzes."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_ELECTRIC, @@ -12491,7 +13297,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIZZLY_SLIDE] = { .name = { .moveName = _("Sizzly Slide") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("User cloaked in fire charges.\n" + "Leaves the foe with a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_FIRE, @@ -12513,7 +13320,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLITZY_GLOW] = { .name = { .moveName = _("Glitzy Glow") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Telekinetic force that sets\n" + "wall, lowering Sp. Atk damage."), .effect = EFFECT_GLITZY_GLOW, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 90, .type = TYPE_PSYCHIC, @@ -12529,7 +13337,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BADDY_BAD] = { .name = { .moveName = _("Baddy Bad") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Acting badly, attacks. Sets\n" + "wall, lowering Attack damage."), .effect = EFFECT_BADDY_BAD, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 90, .type = TYPE_DARK, @@ -12545,7 +13354,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAPPY_SEED] = { .name = { .moveName = _("Sappy Seed") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Giant stalk scatters seeds\n" + "that drain HP every turn."), .effect = EFFECT_SAPPY_SEED, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 90, .type = TYPE_GRASS, @@ -12562,7 +13372,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZY_FROST] = { .name = { .moveName = _("Freezy Frost") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Crystal from cold haze hits.\n" + "Eliminates all stat changes."), .effect = EFFECT_FREEZY_FROST, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 90, .type = TYPE_ICE, @@ -12582,7 +13393,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SparklySwirl") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Wrap foe with whirlwind of\n" + "scent. Heals party's status."), .effect = EFFECT_SPARKLY_SWIRL, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 120 : 90, .type = TYPE_FAIRY, @@ -12602,7 +13414,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("VeeveeVolley") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Eevee's love increases its\n" + "power. It never misses."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -12623,7 +13436,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DublIronBash") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user spins and hits with\n" + "its arms. May cause flinch."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_STEEL, @@ -12651,7 +13465,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DynamxCannon") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires a strong beam. Deals\n" + "2x damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_DRAGON, @@ -12674,7 +13489,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNIPE_SHOT] = { .name = { .moveName = _("Snipe Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user ignores effects\n" + "that draw in moves."), .effect = EFFECT_SNIPE_SHOT, .power = 80, .type = TYPE_WATER, @@ -12689,7 +13505,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JAW_LOCK] = { .name = { .moveName = _("Jaw Lock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Prevents the user and\n" + "the target from escaping."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -12708,7 +13525,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUFF_CHEEKS] = { .name = { .moveName = _("Stuff Cheeks") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Consumes the user's Berry,\n" + "then sharply raises Def."), .effect = EFFECT_STUFF_CHEEKS, .power = 0, .type = TYPE_NORMAL, @@ -12725,7 +13543,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NO_RETREAT] = { .name = { .moveName = _("No Retreat") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises all of the user's\n" + "stats but prevents escape."), .effect = EFFECT_NO_RETREAT, .power = 0, .type = TYPE_FIGHTING, @@ -12742,7 +13561,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAR_SHOT] = { .name = { .moveName = _("Tar Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lowers the foe's Speed and\n" + "makes it weak to Fire."), .effect = EFFECT_TAR_SHOT, .power = 0, .type = TYPE_ROCK, @@ -12757,7 +13577,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_POWDER] = { .name = { .moveName = _("Magic Powder") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Magic powder changes the\n" + "target into a Psychic-type."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_PSYCHIC, @@ -12774,7 +13595,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DARTS] = { .name = { .moveName = _("Dragon Darts") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user attacks twice. Two\n" + "targets are hit once each."), .effect = EFFECT_HIT, // TODO: EFFECT_DRAGON_DARTS .power = 50, .type = TYPE_DRAGON, @@ -12790,7 +13612,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEATIME] = { .name = { .moveName = _("Teatime") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("All Pokémon have teatime\n" + "and eat their Berries."), .effect = EFFECT_TEATIME, .power = 0, .type = TYPE_NORMAL, @@ -12807,7 +13630,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTOLOCK] = { .name = { .moveName = _("Octolock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Traps the foe to lower Def\n" + "and Sp. Def fall each turn."), .effect = EFFECT_OCTOLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -12821,7 +13645,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_BEAK] = { .name = { .moveName = _("Bolt Beak") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Double power if the user\n" + "moves before the target."), .effect = EFFECT_BOLT_BEAK, .power = 85, .type = TYPE_ELECTRIC, @@ -12840,7 +13665,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("FishiousRend") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Double power if the user\n" + "moves before the target."), .effect = EFFECT_BOLT_BEAK, .power = 85, .type = TYPE_WATER, @@ -12856,7 +13682,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COURT_CHANGE] = { .name = { .moveName = _("Court Change") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user swaps effects on\n" + "either side of the field."), .effect = EFFECT_COURT_CHANGE, .power = 0, .type = TYPE_NORMAL, @@ -12875,7 +13702,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ClngrousSoul") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user uses some of its\n" + "HP to raise all its stats."), .effect = EFFECT_CLANGOROUS_SOUL, .power = 0, .type = TYPE_DRAGON, @@ -12895,7 +13723,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_PRESS] = { .name = { .moveName = _("Body Press") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Does more damage the\n" + "higher the user's Def."), .effect = EFFECT_BODY_PRESS, .power = 80, .type = TYPE_FIGHTING, @@ -12912,7 +13741,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DECORATE] = { .name = { .moveName = _("Decorate") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user sharply raises\n" + "the target's Atk and Sp.Atk"), .effect = EFFECT_DECORATE, .power = 0, .type = TYPE_FAIRY, @@ -12929,7 +13759,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRUM_BEATING] = { .name = { .moveName = _("Drum Beating") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Plays a drum to attack.\n" + "The foe's Speed is lowered."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GRASS, @@ -12949,7 +13780,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNAP_TRAP] = { .name = { .moveName = _("Snap Trap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Snares the target in a snap\n" + "trap for four to five turns."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_GRASS, @@ -12969,7 +13801,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PYRO_BALL] = { .name = { .moveName = _("Pyro Ball") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Launches a fiery ball at the\n" + "target. It may cause a burn."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIRE, @@ -12995,7 +13828,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BehemthBlade") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes as a sword. Deals 2x\n" + "damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_STEEL, @@ -13019,7 +13853,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BehemothBash") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks as a shield. Deals 2x\n" + "damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_STEEL, @@ -13038,7 +13873,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_WHEEL] = { .name = { .moveName = _("Aura Wheel") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Raises Speed to attack. The\n" + "Type is based on its form."), .effect = EFFECT_AURA_WHEEL, .power = 110, .type = TYPE_ELECTRIC, @@ -13063,7 +13899,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BreakngSwipe") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swings its tail to attack.\n" + "Lowers the Atk of those hit."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DRAGON, @@ -13084,7 +13921,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRANCH_POKE] = { .name = { .moveName = _("Branch Poke") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user pokes the target\n" + "with a pointed branch."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GRASS, @@ -13100,7 +13938,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERDRIVE] = { .name = { .moveName = _("Overdrive") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user twangs its guitar,\n" + "causing strong vibrations."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -13117,7 +13956,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_APPLE_ACID] = { .name = { .moveName = _("Apple Acid") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with tart apple acid\n" + "to lower the foe's Sp. Def."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GRASS, @@ -13137,7 +13977,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAV_APPLE] = { .name = { .moveName = _("Grav Apple") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Drops an apple from above.\n" + "Lowers the foe's Defense."), .effect = EFFECT_GRAV_APPLE, .power = 80, .type = TYPE_GRASS, @@ -13157,7 +13998,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_BREAK] = { .name = { .moveName = _("Spirit Break") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with spirit-breaking\n" + "force. Lowers Sp. Atk."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_FAIRY, @@ -13182,7 +14024,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("StrangeSteam") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Emits a strange steam to\n" + "potentially confuse the foe."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_FAIRY, @@ -13202,7 +14045,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIFE_DEW] = { .name = { .moveName = _("Life Dew") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Scatters water to restore\n" + "the HP of itself and allies."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_WATER, @@ -13222,7 +14066,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBSTRUCT] = { .name = { .moveName = _("Obstruct") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Protects itself, harshly\n" + "lowering Def on contact."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_DARK, @@ -13245,7 +14090,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("FalsSurrendr") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Bows to stab the foe\n" + "with hair. It never misses."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -13265,7 +14111,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MeteorAssalt") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with a thick leek.\n" + "The user must then rest."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_FIGHTING, @@ -13285,7 +14132,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ETERNABEAM] = { .name = { .moveName = _("Eternabeam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Eternatus' strongest move.\n" + "The user rests next turn."), .effect = EFFECT_HIT, .power = 160, .type = TYPE_DRAGON, @@ -13304,7 +14152,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_BEAM] = { .name = { .moveName = _("Steel Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Fires a beam of steel from\n" + "its body. It hurts the user."), .effect = EFFECT_MAX_HP_50_RECOIL, .power = 140, .type = TYPE_STEEL, @@ -13323,7 +14172,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ExpandngForc") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Power goes up and damages\n" + "all foes on Psychic Terrain."), .effect = EFFECT_EXPANDING_FORCE, .power = 80, .type = TYPE_PSYCHIC, @@ -13337,7 +14187,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_ROLLER] = { .name = { .moveName = _("Steel Roller") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Destroys terrain. Fails if\n" + "ground isn't terrain."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 130, .type = TYPE_STEEL, @@ -13354,7 +14205,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALE_SHOT] = { .name = { .moveName = _("Scale Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Shoots scales 2 to 5 times.\n" + "Ups Speed, lowers defense."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_DRAGON, @@ -13369,7 +14221,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_BEAM] = { .name = { .moveName = _("Meteor Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A 2-turn move that raises\n" + "Sp. Attack before attacking."), .effect = EFFECT_METEOR_BEAM, .power = 120, .type = TYPE_ROCK, @@ -13394,7 +14247,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ShellSideArm") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Deals better of physical and\n" + "special damage. May poison."), .effect = EFFECT_SHELL_SIDE_ARM, .power = 90, .type = TYPE_POISON, @@ -13417,7 +14271,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MstyExplsion") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hit everything and faint.\n" + "Powers up on Misty Terrain."), .effect = EFFECT_EXPLOSION, .power = 100, .type = TYPE_FAIRY, @@ -13431,7 +14286,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_GLIDE] = { .name = { .moveName = _("Grassy Glide") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Gliding on ground, hits. Goes\n" + "first on Grassy Terrain."), .effect = EFFECT_GRASSY_GLIDE, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 55 : 70, .type = TYPE_GRASS, @@ -13451,7 +14307,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("RisngVoltage") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("This move's power doubles\n" + "when on Electric Terrain."), .effect = EFFECT_RISING_VOLTAGE, .power = 70, .type = TYPE_ELECTRIC, @@ -13469,7 +14326,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("TerrainPulse") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Type and power changes\n" + "depending on the terrain."), .effect = EFFECT_TERRAIN_PULSE, .power = 50, .type = TYPE_NORMAL, @@ -13488,7 +14346,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SkitterSmack") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("User skitters behind foe to\n" + "attack. Lowers foe's Sp. Atk."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_BUG, @@ -13512,7 +14371,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BrningJelosy") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Foes that have stats upped\n" + "during the turn get burned."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_FIRE, @@ -13532,7 +14392,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASH_OUT] = { .name = { .moveName = _("Lash Out") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("If stats lowered during this\n" + "turn, power is doubled."), .effect = EFFECT_LASH_OUT, .power = 75, .type = TYPE_DARK, @@ -13547,7 +14408,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLTERGEIST] = { .name = { .moveName = _("Poltergeist") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Control foe's item to attack.\n" + "Fails if foe has no item."), .effect = EFFECT_POLTERGEIST, .power = 110, .type = TYPE_GHOST, @@ -13565,7 +14427,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("CorrosiveGas") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Highly acidic gas melts items\n" + "held by surrounding Pokémon."), .effect = EFFECT_CORROSIVE_GAS, .power = 0, .type = TYPE_POISON, @@ -13580,7 +14443,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COACHING] = { .name = { .moveName = _("Coaching") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Properly coaches allies to\n" + "up their Attack and Defense."), .effect = EFFECT_COACHING, .power = 0, .type = TYPE_FIGHTING, @@ -13597,7 +14461,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLIP_TURN] = { .name = { .moveName = _("Flip Turn") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks and rushes back to\n" + "switch with a party Pokémon."), .effect = EFFECT_HIT_ESCAPE, .power = 60, .type = TYPE_WATER, @@ -13612,7 +14477,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_AXEL] = { .name = { .moveName = _("Triple Axel") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A 3-kick attack that gets\n" + "more powerful with each hit."), .effect = EFFECT_TRIPLE_KICK, .power = 20, .type = TYPE_ICE, @@ -13632,7 +14498,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DualWingbeat") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("User slams the target with\n" + "wings and hits twice in a row."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FLYING, @@ -13652,7 +14519,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ScorchngSnds") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Throws scorching sand at\n" + "the target. May leave a burn."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GROUND, @@ -13672,11 +14540,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUNGLE_HEALING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Jungle Healing") }, + .name = { .moveName = _("Jungle Healng") }, #else .name = { .moveName = _("JungleHealng") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Heals HP and status of\n" + "itself and allies in battle."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_GRASS, @@ -13695,7 +14564,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_BLOW] = { .name = { .moveName = _("Wicked Blow") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Mastering the Dark style,\n" + "strikes with a critical hit."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 75 : 80, .type = TYPE_DARK, @@ -13715,9 +14585,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #if B_EXPANDED_MOVE_NAMES == TRUE .name = { .moveName = _("Surging Strikes") }, #else - .name = { .moveName = _("SrgngStrkes") }, + .name = { .moveName = _("SurgngStrkes") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Mastering the Water style,\n" + "strikes with 3 critical hits."), .effect = EFFECT_HIT, .power = 25, .type = TYPE_WATER, @@ -13736,7 +14607,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_CAGE] = { .name = { .moveName = _("Thunder Cage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Traps the foe in a cage of\n" + "electricity for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -13758,7 +14630,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("DragonEnergy") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The higher the user's HP\n" + "the more damage caused."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_DRAGON, @@ -13777,7 +14650,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("FreezngGlare") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Shoots psychic power from\n" + #if B_USE_FROSTBITE == TRUE + "the eyes. May frostbite."), + #else + "the eyes. May freeze the foe."), + #endif .power = 90, .effect = EFFECT_HIT, .type = TYPE_PSYCHIC, @@ -13797,7 +14675,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_WRATH] = { .name = { .moveName = _("Fiery Wrath") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack fueled by your\n" + "wrath. May cause flinching."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_DARK, @@ -13820,7 +14699,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ThnderusKick") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Uses a lightning-like kick\n" + "to hit. Lowers foe's Defense."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_FIGHTING, @@ -13845,7 +14725,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("GlacialLance") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes by hurling a blizzard-\n" + "cloaked icicle lance at foes."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 130, .type = TYPE_ICE, @@ -13864,7 +14745,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("AstrlBarrage") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Strikes by sending a frightful\n" + "amount of ghosts at foes."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GHOST, @@ -13879,7 +14761,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_SPELL] = { .name = { .moveName = _("Eerie Spell") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Attacks with psychic power.\n" + "Foe's last move has 3 PP cut."), .effect = EFFECT_EERIE_SPELL, .power = 80, .type = TYPE_PSYCHIC, @@ -13896,7 +14779,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIRE_CLAW] = { .name = { .moveName = _("Dire Claw") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("High critical hit chance. May\n" + "paralyze, poison or drowse."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 80 : 60, .type = TYPE_POISON, @@ -13920,7 +14804,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PsyshieldBsh") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits a foe with psychic\n" + "energy. May raise Defense."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -13941,7 +14826,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SHIFT] = { .name = { .moveName = _("Power Shift") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user swaps its Attack\n" + "and Defense stats."), .effect = EFFECT_POWER_TRICK, .power = 0, .type = TYPE_NORMAL, @@ -13959,7 +14845,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_AXE] = { .name = { .moveName = _("Stone Axe") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("High critical hit ratio. Sets\n" + "Splinters that hurt the foe."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ROCK, @@ -13984,7 +14871,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SprngtdeStrm") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Wraps a foe in fierce winds.\n" + "Varies with the user's form."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_FAIRY, @@ -14009,7 +14897,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MystcalPower") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A mysterious power strikes,\n" + "raising the user's Sp. Atk."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -14029,7 +14918,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_FURY] = { .name = { .moveName = _("Raging Fury") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" + "that confuses the user."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 90, .type = TYPE_FIRE, @@ -14048,7 +14938,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAVE_CRASH] = { .name = { .moveName = _("Wave Crash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A slam shrouded in water.\n" + "It also hurts the user."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 75, .type = TYPE_WATER, @@ -14065,7 +14956,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHLOROBLAST] = { .name = { .moveName = _("Chloroblast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A user-hurting blast of\n" + "amassed chlorophyll."), .effect = EFFECT_MAX_HP_50_RECOIL, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 150 : 120, .type = TYPE_GRASS, @@ -14083,7 +14975,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MountainGale") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Giant chunks of ice damage\n" + "the foe. It may flinch."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_ICE, @@ -14106,7 +14999,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("VictoryDance") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Dances to raise Attack,\n" + "Defense and Speed."), .effect = EFFECT_VICTORY_DANCE, .power = 0, .type = TYPE_FIGHTING, @@ -14128,7 +15022,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("HeadlongRush") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with a full-body tackle.\n" + "Lowers the users's defenses."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 100, .type = TYPE_GROUND, @@ -14148,7 +15043,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARB_BARRAGE] = { .name = { .moveName = _("Barb Barrage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Can poison on impact. Powers\n" + "up against poisoned foes."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = 60, .type = TYPE_POISON, @@ -14168,7 +15064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ESPER_WING] = { .name = { .moveName = _("Esper Wing") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("High critical hit ratio.\n" + "Ups the user's Speed."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 80 : 75, .type = TYPE_PSYCHIC, @@ -14193,7 +15090,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BitterMalice") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A spine-chilling resentment.\n" + "May lower the foe's Attack."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 75 : 60, .type = TYPE_GHOST, @@ -14212,7 +15110,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELTER] = { .name = { .moveName = _("Shelter") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user hardens their skin,\n" + "sharply raising its Defense."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -14233,7 +15132,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("TripleArrows") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("High critical hit ratio.\n" + "May lower Defense or flinch."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 90 : 50, .type = TYPE_FIGHTING, @@ -14261,7 +15161,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("InfrnlParade") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurts a foe harder if it has\n" + "an ailment. May leave a burn."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = 60, .type = TYPE_GHOST, @@ -14281,11 +15182,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CEASELESS_EDGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Ceasless Edge") }, + .name = { .moveName = _("Ceaseless Edge") }, #else .name = { .moveName = _("CeaslessEdge") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("High critical hit ratio. Sets\n" + "Splinters that hurt the foe."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_DARK, @@ -14310,7 +15212,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BlekwndStorm") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with brutal, cold winds.\n" + "May lower the foe's Speed."), .effect = EFFECT_RAIN_ALWAYS_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_FLYING, @@ -14334,7 +15237,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("WildbltStorm") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with a brutal tempest.\n" + "May inflict paralysis."), .effect = EFFECT_RAIN_ALWAYS_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_ELECTRIC, @@ -14358,7 +15262,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SndsearStorm") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with brutally hot sand.\n" + "May inflict a burn."), .effect = EFFECT_RAIN_ALWAYS_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_GROUND, @@ -14382,7 +15287,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("LunarBlessng") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user heals and cures\n" + "itself and its ally."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_PSYCHIC, @@ -14400,7 +15306,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_HEART] = { .name = { .moveName = _("Take Heart") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user lifts its spirits to\n" + "heal and strengthen itself."), .effect = EFFECT_TAKE_HEART, .power = 0, .type = TYPE_PSYCHIC, @@ -14417,7 +15324,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_BLAST] = { .name = { .moveName = _("Tera Blast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("If the user's Terastallized,\n" + "it hits with its Tera-type."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TERA_BLAST, .power = 80, .type = TYPE_NORMAL, @@ -14433,7 +15341,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILK_TRAP] = { .name = { .moveName = _("Silk Trap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Protects itself, lowering\n" + "Speed on contact."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_BUG, @@ -14451,7 +15360,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AXE_KICK] = { .name = { .moveName = _("Axe Kick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("May miss and hurt the kicker.\n" + "May cause confusion."), .effect = EFFECT_RECOIL_IF_MISS, .power = 120, .type = TYPE_FIGHTING, @@ -14475,7 +15385,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("LastRespects") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("This move deals more damage\n" + "for each defeated ally."), .effect = EFFECT_PLACEHOLDER, // EFFECT_LAST_RESPECTS .power = 50, .type = TYPE_GHOST, @@ -14490,7 +15401,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUMINA_CRASH] = { .name = { .moveName = _("Lumina Crash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A mind-affecting light\n" + "harshly lowers Sp. Def."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -14509,7 +15421,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORDER_UP] = { .name = { .moveName = _("Order Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Boosts a user's stats\n" + "depending on Tatsugiri."), .effect = EFFECT_PLACEHOLDER, // EFFECT_ORDER_UP .power = 80, .type = TYPE_DRAGON, @@ -14526,7 +15439,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JET_PUNCH] = { .name = { .moveName = _("Jet Punch") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A punch is thrown at blinding\n" + "speed to strike first."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_WATER, @@ -14548,7 +15462,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SpicyExtract") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sharply ups target's Attack,\n" + "harshly lowers its Defense."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SPICY_EXTRACT .power = 0, .type = TYPE_GRASS, @@ -14564,7 +15479,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIN_OUT] = { .name = { .moveName = _("Spin Out") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Furiously strains its legs.\n" + "Harshly lowers user's Speed."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_STEEL, @@ -14588,7 +15504,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PoplatinBomb") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user's fellows hit one\n" + "to ten times in a row."), .effect = EFFECT_POPULATION_BOMB, .power = 20, .type = TYPE_NORMAL, @@ -14606,7 +15523,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SPINNER] = { .name = { .moveName = _("Ice Spinner") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Ice-covered feet hit a foe\n" + "and destroy the terrain."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 80, .type = TYPE_ICE, @@ -14623,7 +15541,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLAIVE_RUSH] = { .name = { .moveName = _("Glaive Rush") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Foe attacks next turn can't\n" + "miss and do double damage."), .effect = EFFECT_GLAIVE_RUSH, .power = 120, .type = TYPE_DRAGON, @@ -14643,7 +15562,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("RevivlBlesng") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Revives a fainted party {PKMN}\n" + "and restores half of its HP."), .effect = EFFECT_REVIVAL_BLESSING, .power = 0, .type = TYPE_NORMAL, @@ -14662,7 +15582,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SALT_CURE] = { .name = { .moveName = _("Salt Cure") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hurts foe every turn. Double\n" + "damage to Steel and Water."), .effect = EFFECT_SALT_CURE, .power = 40, .type = TYPE_ROCK, @@ -14678,7 +15599,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_DIVE] = { .name = { .moveName = _("Triple Dive") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits target with splashes\n" + "of water 3 times in a row."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_WATER, @@ -14694,7 +15616,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORTAL_SPIN] = { .name = { .moveName = _("Mortal Spin") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Erases trap moves and Leech\n" + "Seed. Poisons adjecent foes."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_POISON, @@ -14718,7 +15641,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOODLE] = { .name = { .moveName = _("Doodle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Changes user's and ally's\n" + "Ability into the target's."), .effect = EFFECT_DOODLE, .power = 0, .type = TYPE_NORMAL, @@ -14735,7 +15659,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FILLET_AWAY] = { .name = { .moveName = _("Fillet Away") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Sharply boosts offenses and\n" + "Speed by using its own HP."), .effect = EFFECT_FILLET_AWAY, .power = 0, .type = TYPE_NORMAL, @@ -14758,7 +15683,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("KowtowCleave") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("User slashes the foe after\n" + "kowtowing. It never misses."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -14774,7 +15700,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_TRICK] = { .name = { .moveName = _("Flower Trick") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Rigged bouquet. Always gets\n" + "a critical hit, never missing."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GRASS, @@ -14789,7 +15716,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORCH_SONG] = { .name = { .moveName = _("Torch Song") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Flames scorch the target.\n" + "Boosts the user's Sp. Atk."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -14811,7 +15739,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_STEP] = { .name = { .moveName = _("Aqua Step") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Hits with light, fluid dance\n" + "steps. Ups the user's Speed."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_WATER, @@ -14833,7 +15762,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_BULL] = { .name = { .moveName = _("Raging Bull") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Tackle that breaks barriers.\n" + "User's form determines type."), .effect = EFFECT_RAGING_BULL, .power = 90, .type = TYPE_NORMAL, @@ -14849,7 +15779,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAKE_IT_RAIN] = { .name = { .moveName = _("Make It Rain") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lowers the user's Sp. Atk.\n" + "Money is recovered after."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_STEEL, @@ -14871,7 +15802,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RUINATION] = { .name = { .moveName = _("Ruination") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Summons a ruinous disaster\n" + "and cuts half the foe's HP."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_DARK, @@ -14886,11 +15818,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COLLISION_COURSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Colision Course") }, + .name = { .moveName = _("Collision Course") }, #else .name = { .moveName = _("ColisinCours") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Prehistoric explosion that's\n" + "stronger if supereffective."), .effect = EFFECT_COLLISION_COURSE, .power = 100, .type = TYPE_FIGHTING, @@ -14910,7 +15843,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ElectroDrift") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Futuristic electricity. It's\n" + "stronger if supereffective."), .effect = EFFECT_COLLISION_COURSE, .power = 100, .type = TYPE_ELECTRIC, @@ -14926,7 +15860,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHED_TAIL] = { .name = { .moveName = _("Shed Tail") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Creates a Substitute for\n" + "itself before switching out."), .effect = EFFECT_SHED_TAIL, .power = 0, .type = TYPE_NORMAL, @@ -14948,7 +15883,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ChilReceptin") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Bad joke summons snowstorm.\n" + "The user also switches out."), .effect = EFFECT_CHILLY_RECEPTION, .power = 0, .type = TYPE_ICE, @@ -14966,7 +15902,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TIDY_UP] = { .name = { .moveName = _("Tidy Up") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("User tidies up hazards and\n" + "raises its Attack and Speed."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TIDY_UP .power = 0, .type = TYPE_NORMAL, @@ -14983,7 +15920,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNOWSCAPE] = { .name = { .moveName = _("Snowscape") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Summons a snowstorm that\n" + "lasts for five turns."), .effect = EFFECT_SNOWSCAPE, .power = 0, .type = TYPE_ICE, @@ -15001,7 +15939,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUNCE] = { .name = { .moveName = _("Pounce") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user pounces on the foe,\n" + "lowering its Speed."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_BUG, @@ -15022,7 +15961,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRAILBLAZE] = { .name = { .moveName = _("Trailblaze") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The user attacks suddenly,\n" + "raising its Speed."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_GRASS, @@ -15047,7 +15987,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("ChillingWatr") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A shower with ice-cold water\n" + "lowers the target's Attack."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_WATER, @@ -15066,7 +16007,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_DRILL] = { .name = { .moveName = _("Hyper Drill") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A spinning pointed part\n" + "bypasses a foe's Protect."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -15083,7 +16025,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWIN_BEAM] = { .name = { .moveName = _("Twin Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Mystical eye-beams that hit\n" + "the target twice in a row."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_PSYCHIC, @@ -15099,7 +16042,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_FIST] = { .name = { .moveName = _("Rage Fist") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("The more the user has been\n" + "hit, the stronger the move."), .effect = EFFECT_RAGE_FIST, .power = 50, .type = TYPE_GHOST, @@ -15116,7 +16060,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARMOR_CANNON] = { .name = { .moveName = _("Armor Cannon") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A strong attack but lowers\n" + "the defensive stats."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIRE, @@ -15135,7 +16080,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_BLADE] = { .name = { .moveName = _("Bitter Blade") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An attack that absorbs\n" + "half the damage inflicted."), .effect = EFFECT_ABSORB, .power = 90, .type = TYPE_FIRE, @@ -15152,7 +16098,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SHOCK] = { .name = { .moveName = _("Double Shock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Discharges all electricity,\n" + "losing the Electric type."), .effect = EFFECT_FAIL_IF_NOT_ARG_TYPE, .power = 120, .type = TYPE_ELECTRIC, @@ -15177,7 +16124,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("GigatonHammr") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Swings a huge hammer. Can't\n" + "be used twice in a row."), .effect = EFFECT_HIT, .power = 160, .type = TYPE_STEEL, @@ -15192,7 +16140,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMEUPPANCE] = { .name = { .moveName = _("Comeuppance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Retaliates strongly against\n" + "who last hurt the user."), .effect = EFFECT_METAL_BURST, .power = 1, .type = TYPE_DARK, @@ -15209,7 +16158,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_CUTTER] = { .name = { .moveName = _("Aqua Cutter") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Pressurized water cut with a\n" + "high critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_WATER, @@ -15229,7 +16179,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BlazngTorque") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -15262,7 +16212,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("WickedTorque") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -15291,11 +16241,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOXIOUS_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Noxius Torque") }, + .name = { .moveName = _("Noxious Torque") }, #else .name = { .moveName = _("NoxiusTorque") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 100, .type = TYPE_POISON, @@ -15328,7 +16278,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("CombatTorque") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -15361,7 +16311,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MagiclTorque") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FAIRY, @@ -15390,7 +16340,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBLADE] = { .name = { .moveName = _("Psyblade") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("This move's power increases\n" + "when on Electric Terrain."), .effect = EFFECT_PSYBLADE, .power = 80, .type = TYPE_PSYCHIC, @@ -15406,7 +16357,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_STEAM] = { .name = { .moveName = _("Hydro Steam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("This move's power increases\n" + "under harsh sunlight."), .effect = EFFECT_HYDRO_STEAM, .power = 80, .type = TYPE_WATER, @@ -15421,7 +16373,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOOD_MOON] = { .name = { .moveName = _("Blood Moon") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Unleashes the blood moon.\n" + "Can't be used twice in a row."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_NORMAL, @@ -15440,7 +16393,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MatchaGotcha") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Absorbs half the damage\n" + "inflicted. May cause a burn."), .effect = EFFECT_ABSORB, .power = 80, .type = TYPE_GRASS, @@ -15461,7 +16415,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYRUP_BOMB] = { .name = { .moveName = _("Syrup Bomb") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Lowers the foe's speed\n" + "each turn for 3 turns."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GRASS, @@ -15481,7 +16436,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IVY_CUDGEL] = { .name = { .moveName = _("Ivy Cudgel") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Type changes with held mask.\n" + "High critical-hit ratio."), .effect = EFFECT_IVY_CUDGEL, .power = 100, .type = TYPE_GRASS, @@ -15497,7 +16453,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_SHOT] = { .name = { .moveName = _("Electro Shot") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Absorbs electricity in one turn,\n" + "then attacks next turn."), .effect = EFFECT_METEOR_BEAM, .power = 130, .type = TYPE_ELECTRIC, @@ -15521,7 +16478,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("TeraStarstrm") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Damages all opponents if user is\n" + "Stellar form Terapagos."), .effect = EFFECT_PLACEHOLDER, //EFFECT_TERA_STARSTORM .power = 120, .type = TYPE_NORMAL, // Stellar type if used by Terapagos-Stellar @@ -15539,7 +16497,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FICKLE_BEAM] = { .name = { .moveName = _("Fickle Beam") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Shoots a beam of light. Sometimes\n" + "twice as strong."), .effect = EFFECT_FICKLE_BEAM, .power = 80, .type = TYPE_DRAGON, @@ -15557,7 +16516,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("BurnngBulwrk") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Evades attack, and burns\n" + "the foe if struck."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIRE, @@ -15578,7 +16538,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERCLAP] = { .name = { .moveName = _("Thunderclap") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sSuckerPunchDescription, .effect = EFFECT_SUCKER_PUNCH, .power = 70, .type = TYPE_ELECTRIC, @@ -15596,7 +16556,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MightyCleave") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = sFeintDescription, .effect = EFFECT_HIT, .power = 95, .type = TYPE_ROCK, @@ -15617,7 +16577,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("TachyonCuttr") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Launches particle blades at\n" + "the target. Strikes twice."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -15633,7 +16594,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARD_PRESS] = { .name = { .moveName = _("Hard Press") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, .type = TYPE_STEEL, @@ -15648,7 +16609,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CHEER] = { .name = { .moveName = _("Dragon Cheer") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Increases allies' critical hit\n" + "ratio, especially if Dragons."), .effect = EFFECT_PLACEHOLDER, //EFFECT_DRAGON_CHEER .power = 0, .type = TYPE_DRAGON, @@ -15667,7 +16629,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("AllurngVoice") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Confuses the target if their\n" + "stats were boosted this turn."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FAIRY, @@ -15689,7 +16652,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEMPER_FLARE] = { .name = { .moveName = _("Temper Flare") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A desperation attack. Power\n" + "doubles if last move failed."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, .type = TYPE_FIRE, @@ -15708,7 +16672,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("SuprcellSlam") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("An electrified slam. If it\n" + "misses, the user is hurt."), .effect = EFFECT_RECOIL_IF_MISS, .power = 100, .type = TYPE_ELECTRIC, @@ -15727,7 +16692,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("PsychicNoise") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Unpleasant sound waves that\n" + "damage and prevent healing."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_PSYCHIC, @@ -15747,7 +16713,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPPER_HAND] = { .name = { .moveName = _("Upper Hand") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("Makes the target flinch if\n" + "readying a priority move."), .effect = EFFECT_PLACEHOLDER, //EFFECT_UPPER_HAND .power = 65, .type = TYPE_FIGHTING, @@ -15766,7 +16733,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .name = { .moveName = _("MalignntChan") }, #endif - .description = COMPOUND_STRING("Dummy2 description."), + .description = COMPOUND_STRING("A corrosive chain attack\n" + "that may badly poison."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_POISON, @@ -15785,7 +16753,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BREAKNECK_BLITZ] = { .name = { .bigMoveName = COMPOUND_STRING("Breakneck Blitz") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_NORMAL, @@ -15798,7 +16766,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALL_OUT_PUMMELING] = { .name = { .bigMoveName = COMPOUND_STRING("All Out Pummeling") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_FIGHTING, @@ -15811,7 +16779,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERSONIC_SKYSTRIKE] = { .name = { .bigMoveName = COMPOUND_STRING("Supersonic Skystrike") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_FLYING, @@ -15824,7 +16792,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_DOWNPOUR] = { .name = { .bigMoveName = COMPOUND_STRING("Acid Downpour") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_POISON, @@ -15837,7 +16805,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TECTONIC_RAGE] = { .name = { .bigMoveName = COMPOUND_STRING("Tectonic Rage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_GROUND, @@ -15851,7 +16819,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONTINENTAL_CRUSH] = { .name = { .bigMoveName = COMPOUND_STRING("Continental Crush") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_ROCK, @@ -15864,7 +16832,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAVAGE_SPIN_OUT] = { .name = { .bigMoveName = COMPOUND_STRING("Savage Spin Out") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_BUG, @@ -15877,7 +16845,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NEVER_ENDING_NIGHTMARE] = { .name = { .bigMoveName = COMPOUND_STRING("Never Ending Nightmare") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_GHOST, @@ -15890,7 +16858,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORKSCREW_CRASH] = { .name = { .bigMoveName = COMPOUND_STRING("Corkscrew Crash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_STEEL, @@ -15903,7 +16871,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNO_OVERDRIVE] = { .name = { .bigMoveName = COMPOUND_STRING("Inferno Overdrive") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_FIRE, @@ -15916,7 +16884,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_VORTEX] = { .name = { .bigMoveName = COMPOUND_STRING("Hydro Vortex") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_WATER, @@ -15929,7 +16897,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOOM_DOOM] = { .name = { .bigMoveName = COMPOUND_STRING("Bloom Doom") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_GRASS, @@ -15942,7 +16910,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGAVOLT_HAVOC] = { .name = { .bigMoveName = COMPOUND_STRING("Gigavolt Havoc") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_ELECTRIC, @@ -15955,7 +16923,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHATTERED_PSYCHE] = { .name = { .bigMoveName = COMPOUND_STRING("Shattered Psyche") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_PSYCHIC, @@ -15968,7 +16936,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBZERO_SLAMMER] = { .name = { .bigMoveName = COMPOUND_STRING("Subzero Slammer") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_ICE, @@ -15981,7 +16949,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEVASTATING_DRAKE] = { .name = { .bigMoveName = COMPOUND_STRING("Devastating Drake") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_DRAGON, @@ -15994,7 +16962,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLACK_HOLE_ECLIPSE] = { .name = { .bigMoveName = COMPOUND_STRING("Black Hole Eclipse") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_DARK, @@ -16007,7 +16975,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWINKLE_TACKLE] = { .name = { .bigMoveName = COMPOUND_STRING("Twinkle Tackle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, .type = TYPE_FAIRY, @@ -16020,7 +16988,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CATASTROPIKA] = { .name = { .bigMoveName = COMPOUND_STRING("Catastropika") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 210, .type = TYPE_ELECTRIC, @@ -16033,7 +17001,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_10000000_VOLT_THUNDERBOLT] = { .name = { .bigMoveName = COMPOUND_STRING("10000000 Volt Thunderbolt") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, .type = TYPE_ELECTRIC, @@ -16047,7 +17015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOKED_SPARKSURFER] = { .name = { .bigMoveName = COMPOUND_STRING("Stoked Sparksurfer") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 175, .type = TYPE_ELECTRIC, @@ -16064,7 +17032,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_EVOBOOST] = { .name = { .bigMoveName = COMPOUND_STRING("Extreme Evoboost") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, .type = TYPE_NORMAL, @@ -16077,7 +17045,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PULVERIZING_PANCAKE] = { .name = { .bigMoveName = COMPOUND_STRING("Pulverizing Pancake") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 210, .type = TYPE_NORMAL, @@ -16090,7 +17058,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GENESIS_SUPERNOVA] = { .name = { .bigMoveName = COMPOUND_STRING("Genesis Supernova") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, .type = TYPE_PSYCHIC, @@ -16104,7 +17072,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SINISTER_ARROW_RAID] = { .name = { .bigMoveName = COMPOUND_STRING("Sinister Arrow Raid") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 180, .type = TYPE_GHOST, @@ -16117,7 +17085,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MALICIOUS_MOONSAULT] = { .name = { .bigMoveName = COMPOUND_STRING("Malicious Moonsault") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 180, .type = TYPE_DARK, @@ -16130,7 +17098,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCEANIC_OPERETTA] = { .name = { .bigMoveName = COMPOUND_STRING("Oceaning Operetta") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, .type = TYPE_WATER, @@ -16143,7 +17111,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLINTERED_STORMSHARDS] = { .name = { .bigMoveName = COMPOUND_STRING("Splintered Stormshards") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, .type = TYPE_ROCK, @@ -16157,7 +17125,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LETS_SNUGGLE_FOREVER] = { .name = { .bigMoveName = COMPOUND_STRING("Let's Snuggle Forever") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 190, .type = TYPE_FAIRY, @@ -16170,7 +17138,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGOROUS_SOULBLAZE] = { .name = { .bigMoveName = COMPOUND_STRING("Clangorous Soulblaze") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 185, .type = TYPE_DRAGON, @@ -16190,7 +17158,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARDIAN_OF_ALOLA] = { .name = { .bigMoveName = COMPOUND_STRING("Guardian Of Alola") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_FAIRY, @@ -16203,7 +17171,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEARING_SUNRAZE_SMASH] = { .name = { .bigMoveName = COMPOUND_STRING("Searing Sunraze Smash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, .type = TYPE_STEEL, @@ -16216,7 +17184,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MENACING_MOONRAZE_MAELSTROM] = { .name = { .bigMoveName = COMPOUND_STRING("Menacing Moonraze Maelstrom") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, .type = TYPE_GHOST, @@ -16229,7 +17197,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { .name = { .bigMoveName = COMPOUND_STRING("Light That Burns The Sky") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, .type = TYPE_PSYCHIC, @@ -16242,7 +17210,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { .name = { .bigMoveName = COMPOUND_STRING("Soul Stealing 7 Star Strike") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, .type = TYPE_GHOST, @@ -16256,7 +17224,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { .name = { .bigMoveName = COMPOUND_STRING("Max Guard") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_NORMAL, @@ -16271,7 +17239,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { .name = { .bigMoveName = COMPOUND_STRING("Max Flare") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FIRE, @@ -16286,7 +17254,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { .name = { .bigMoveName = COMPOUND_STRING("Max Flutterby") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_BUG, @@ -16301,7 +17269,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { .name = { .bigMoveName = COMPOUND_STRING("Max Lightning") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ELECTRIC, @@ -16316,7 +17284,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { .name = { .bigMoveName = COMPOUND_STRING("Max Strike") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_NORMAL, @@ -16331,7 +17299,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { .name = { .bigMoveName = COMPOUND_STRING("Max Knuckle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FIGHTING, @@ -16346,7 +17314,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { .name = { .bigMoveName = COMPOUND_STRING("Max Phantasm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_GHOST, @@ -16361,7 +17329,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { .name = { .bigMoveName = COMPOUND_STRING("Max Hailstorm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ICE, @@ -16376,7 +17344,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { .name = { .bigMoveName = COMPOUND_STRING("Max Ooze") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_POISON, @@ -16391,7 +17359,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { .name = { .bigMoveName = COMPOUND_STRING("Max Geyser") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_WATER, @@ -16406,7 +17374,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { .name = { .bigMoveName = COMPOUND_STRING("Max Airstream") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FLYING, @@ -16421,7 +17389,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { .name = { .bigMoveName = COMPOUND_STRING("Max Starfall") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FAIRY, @@ -16436,7 +17404,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { .name = { .bigMoveName = COMPOUND_STRING("Max Wyrmwind") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_DRAGON, @@ -16451,7 +17419,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { .name = { .bigMoveName = COMPOUND_STRING("Max Mindstorm") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_PSYCHIC, @@ -16466,7 +17434,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { .name = { .bigMoveName = COMPOUND_STRING("Max Rockfall") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ROCK, @@ -16481,7 +17449,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { .name = { .bigMoveName = COMPOUND_STRING("Max Quake") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_GROUND, @@ -16497,7 +17465,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { .name = { .bigMoveName = COMPOUND_STRING("Max Darkness") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_DARK, @@ -16512,7 +17480,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { .name = { .bigMoveName = COMPOUND_STRING("Max Overgrowth") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16527,7 +17495,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { .name = { .bigMoveName = COMPOUND_STRING("Max Steelspike") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -16542,7 +17510,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VINE_LASH] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Vine Lash") }, - .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO + .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16557,7 +17525,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Wildfire") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -16572,7 +17540,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CANNONADE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Canonade") }, - .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO + .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -16587,7 +17555,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Befuddle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_BUG, @@ -16602,7 +17570,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Volt Crash") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ELECTRIC, @@ -16617,7 +17585,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Gold Rush") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -16632,7 +17600,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Chi Strike") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIGHTING, @@ -16647,7 +17615,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Terror") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GHOST, @@ -16662,7 +17630,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Foam Burst") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -16677,7 +17645,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Resonance") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ICE, @@ -16692,7 +17660,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Cuddle") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -16707,7 +17675,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Replenish") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -16722,7 +17690,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Malodor") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_POISON, @@ -16737,7 +17705,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Meltdown") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -16752,7 +17720,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DRUM_SOLO] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Drum Solo") }, - .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO + .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16768,7 +17736,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FIREBALL] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Fireball") }, - .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO + .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -16784,7 +17752,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_HYDROSNIPE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Hydrosnipe") }, - .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO + .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -16800,7 +17768,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Wind Rage") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FLYING, @@ -16815,7 +17783,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Gravitas") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_PSYCHIC, @@ -16830,7 +17798,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Stonesurge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -16845,7 +17813,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Volcalith") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ROCK, @@ -16860,7 +17828,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Tartness") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16875,7 +17843,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Sweetness") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -16890,7 +17858,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Sandblast") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GROUND, @@ -16905,7 +17873,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Stun Shock") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ELECTRIC, @@ -16920,7 +17888,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Centiferno") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -16935,7 +17903,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Smite") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FAIRY, @@ -16951,7 +17919,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Snooze") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DARK, @@ -16966,7 +17934,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Finale") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FAIRY, @@ -16981,7 +17949,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Steelsurge") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -16996,7 +17964,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Depletion") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DRAGON, @@ -17011,7 +17979,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max One Blow") }, - .description = COMPOUND_STRING("Dummy2 description."), + .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DARK, @@ -17026,7 +17994,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RAPID_FLOW] = { .name = { .bigMoveName = COMPOUND_STRING("G-Max Rapid Flow") }, - .description = COMPOUND_STRING("Dummy2 description."), //ANIM TODO + .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, From e161902a4bd52ef3cad48aac0eb300d05a7ff463 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 25 Jan 2024 09:12:00 -0300 Subject: [PATCH 15/30] Fused the struct ContestMove into the struct BattleMove --- include/contest_effect.h | 9 - include/pokemon.h | 7 + src/contest.c | 34 +- src/contest_ai.c | 24 +- src/contest_effect.c | 24 +- src/data/contest_moves.h | 6108 ---------------------------------- src/menu_specialized.c | 6 +- src/move_relearner.c | 4 +- src/pokedex_plus_hgss.c | 8 +- src/pokemon_summary_screen.c | 12 +- 10 files changed, 63 insertions(+), 6173 deletions(-) diff --git a/include/contest_effect.h b/include/contest_effect.h index 9089207acd5f..87129bd7921f 100644 --- a/include/contest_effect.h +++ b/include/contest_effect.h @@ -2,14 +2,6 @@ #define GUARD_CONTEST_EFFECT_H #define MAX_COMBO_MOVES 5 -struct ContestMove -{ - u8 effect; - u8 contestCategory:3; - u8 comboStarterId; - u8 comboMoves[MAX_COMBO_MOVES]; -}; - struct ContestEffect { u8 effectType; @@ -17,7 +9,6 @@ struct ContestEffect u8 jam; }; -extern const struct ContestMove gContestMoves[]; extern const struct ContestEffect gContestEffects[]; extern const u8 *const gContestEffectDescriptionPointers[]; extern const u8 *const gContestMoveTypeTextPointers[]; diff --git a/include/pokemon.h b/include/pokemon.h index b3369a73f68e..c774f8c2fed2 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -5,6 +5,7 @@ #include "constants/items.h" #include "constants/region_map_sections.h" #include "constants/map_groups.h" +#include "contest_effect.h" #define GET_BASE_SPECIES_ID(speciesId) (GetFormSpeciesId(speciesId, 0)) #define FORM_SPECIES_END (0xffff) @@ -519,6 +520,12 @@ struct BattleMove // primary/secondary effects const struct AdditionalEffect *additionalEffects; + + // contest parameters + u8 contestEffect; + u8 contestCategory:3; + u8 contestComboStarterId; + u8 contestComboMoves[MAX_COMBO_MOVES]; }; #define EFFECTS_ARR(...) (const struct AdditionalEffect[]) {__VA_ARGS__} diff --git a/src/contest.c b/src/contest.c index e206aec2df18..42a210d561bd 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1537,7 +1537,7 @@ static void Task_ShowMoveSelectScreen(u8 taskId) } else if (move != MOVE_NONE && eContestantStatus[gContestPlayerMonIndex].prevMove == move - && gContestMoves[move].effect != CONTEST_EFFECT_REPETITION_NOT_BORING) + && gBattleMoves[move].contestEffect != CONTEST_EFFECT_REPETITION_NOT_BORING) { // Gray the text because it's a repeated move moveNameBuffer = StringCopy(moveName, gText_ColorBlue); @@ -2208,7 +2208,7 @@ static void Task_DoAppeals(u8 taskId) } else { - StringCopy(gStringVar3, sContestConditions[gContestMoves[eContestantStatus[contestant].currMove].contestCategory]); + StringCopy(gStringVar3, sContestConditions[gBattleMoves[eContestantStatus[contestant].currMove].contestCategory]); } if (r3 > 0 && eContestantStatus[contestant].repeatedMove) @@ -3163,7 +3163,7 @@ static u16 GetMoveEffectSymbolTileOffset(u16 move, u8 contestant) { u16 offset; - switch (gContestEffects[gContestMoves[move].effect].effectType) + switch (gContestEffects[gBattleMoves[move].contestEffect].effectType) { case 0: case 1: @@ -3189,7 +3189,7 @@ static void PrintContestMoveDescription(u16 move) u8 numHearts; // The contest category icon is implemented as a 5x2 group of tiles. - category = gContestMoves[move].contestCategory; + category = gBattleMoves[move].contestCategory; if (category == CONTEST_CATEGORY_COOL) categoryTile = 0x4040; else if (category == CONTEST_CATEGORY_BEAUTY) @@ -3205,27 +3205,27 @@ static void PrintContestMoveDescription(u16 move) ContestBG_FillBoxWithIncrementingTile(0, categoryTile + 0x10, 0x0b, 0x20, 0x05, 0x01, 0x11, 0x01); // Appeal hearts - if (gContestEffects[gContestMoves[move].effect].appeal == 0xFF) + if (gContestEffects[gBattleMoves[move].contestEffect].appeal == 0xFF) numHearts = 0; else - numHearts = gContestEffects[gContestMoves[move].effect].appeal / 10; + numHearts = gContestEffects[gBattleMoves[move].contestEffect].appeal / 10; if (numHearts > MAX_CONTEST_MOVE_HEARTS) numHearts = MAX_CONTEST_MOVE_HEARTS; ContestBG_FillBoxWithTile(0, TILE_EMPTY_APPEAL_HEART, 0x15, 0x1f, MAX_CONTEST_MOVE_HEARTS, 0x01, 0x11); ContestBG_FillBoxWithTile(0, TILE_FILLED_APPEAL_HEART, 0x15, 0x1f, numHearts, 0x01, 0x11); // Jam hearts - if (gContestEffects[gContestMoves[move].effect].jam == 0xFF) + if (gContestEffects[gBattleMoves[move].contestEffect].jam == 0xFF) numHearts = 0; else - numHearts = gContestEffects[gContestMoves[move].effect].jam / 10; + numHearts = gContestEffects[gBattleMoves[move].contestEffect].jam / 10; if (numHearts > MAX_CONTEST_MOVE_HEARTS) numHearts = MAX_CONTEST_MOVE_HEARTS; ContestBG_FillBoxWithTile(0, TILE_EMPTY_JAM_HEART, 0x15, 0x20, MAX_CONTEST_MOVE_HEARTS, 0x01, 0x11); ContestBG_FillBoxWithTile(0, TILE_FILLED_JAM_HEART, 0x15, 0x20, numHearts, 0x01, 0x11); FillWindowPixelBuffer(WIN_MOVE_DESCRIPTION, PIXEL_FILL(0)); - Contest_PrintTextToBg0WindowStd(WIN_MOVE_DESCRIPTION, gContestEffectDescriptionPointers[gContestMoves[move].effect]); + Contest_PrintTextToBg0WindowStd(WIN_MOVE_DESCRIPTION, gContestEffectDescriptionPointers[gBattleMoves[move].contestEffect]); Contest_PrintTextToBg0WindowStd(WIN_SLASH, gText_Slash); } @@ -4426,9 +4426,9 @@ static void CalculateAppealMoveImpact(u8 contestant) return; move = eContestantStatus[contestant].currMove; - effect = gContestMoves[move].effect; + effect = gBattleMoves[move].contestEffect; - eContestantStatus[contestant].moveCategory = gContestMoves[eContestantStatus[contestant].currMove].contestCategory; + eContestantStatus[contestant].moveCategory = gBattleMoves[eContestantStatus[contestant].currMove].contestCategory; if (eContestantStatus[contestant].currMove == eContestantStatus[contestant].prevMove && eContestantStatus[contestant].currMove != MOVE_NONE) { eContestantStatus[contestant].repeatedMove = TRUE; @@ -4479,7 +4479,7 @@ static void CalculateAppealMoveImpact(u8 contestant) } else { - if (gContestMoves[eContestantStatus[contestant].currMove].comboStarterId != 0) + if (gBattleMoves[eContestantStatus[contestant].currMove].contestComboStarterId != 0) { eContestantStatus[contestant].hasJudgesAttention = TRUE; eContestantStatus[contestant].usedComboMove = TRUE; @@ -4559,13 +4559,13 @@ static void PrintAppealMoveResultText(u8 contestant, u8 stringId) { StringCopy(gStringVar1, gContestMons[contestant].nickname); StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); - if (gContestMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_COOL) + if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_COOL) StringCopy(gStringVar3, gText_Contest_Shyness); - else if (gContestMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) + else if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) StringCopy(gStringVar3, gText_Contest_Anxiety); - else if (gContestMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_CUTE) + else if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_CUTE) StringCopy(gStringVar3, gText_Contest_Laziness); - else if (gContestMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_SMART) + else if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_SMART) StringCopy(gStringVar3, gText_Contest_Hesitancy); else StringCopy(gStringVar3, gText_Contest_Fear); @@ -4738,7 +4738,7 @@ static void UpdateApplauseMeter(void) s8 Contest_GetMoveExcitement(u16 move) { - return sContestExcitementTable[gSpecialVar_ContestCategory][gContestMoves[move].contestCategory]; + return sContestExcitementTable[gSpecialVar_ContestCategory][gBattleMoves[move].contestCategory]; } static u8 StartApplauseOverflowAnimation(void) diff --git a/src/contest_ai.c b/src/contest_ai.c index a4bb5b454904..d5eb1030e6f8 100644 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -758,7 +758,7 @@ static void ContestAICmd_get_move_effect(void) { u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - eContestAI.scriptResult = gContestMoves[move].effect; + eContestAI.scriptResult = gBattleMoves[move].contestEffect; gAIScriptPtr += 1; } @@ -786,7 +786,7 @@ static void ContestAICmd_get_move_effect_type(void) { u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - eContestAI.scriptResult = gContestEffects[gContestMoves[move].effect].effectType; + eContestAI.scriptResult = gContestEffects[gBattleMoves[move].contestEffect].effectType; gAIScriptPtr += 1; } @@ -814,12 +814,12 @@ static void ContestAICmd_check_most_appealing_move(void) { int i; u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - u8 appeal = gContestEffects[gContestMoves[move].effect].appeal; + u8 appeal = gContestEffects[gBattleMoves[move].contestEffect].appeal; for (i = 0; i < MAX_MON_MOVES; i++) { u16 newMove = gContestMons[eContestAI.contestantId].moves[i]; - if (newMove != 0 && appeal < gContestEffects[gContestMoves[newMove].effect].appeal) + if (newMove != 0 && appeal < gContestEffects[gBattleMoves[newMove].contestEffect].appeal) break; } @@ -845,12 +845,12 @@ static void ContestAICmd_check_most_jamming_move(void) { int i; u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - u8 jam = gContestEffects[gContestMoves[move].effect].jam; + u8 jam = gContestEffects[gBattleMoves[move].contestEffect].jam; for (i = 0; i < MAX_MON_MOVES; i++) { u16 newMove = gContestMons[eContestAI.contestantId].moves[i]; - if (newMove != MOVE_NONE && jam < gContestEffects[gContestMoves[newMove].effect].jam) + if (newMove != MOVE_NONE && jam < gContestEffects[gBattleMoves[newMove].contestEffect].jam) break; } @@ -876,7 +876,7 @@ static void ContestAICmd_get_num_move_hearts(void) { u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - eContestAI.scriptResult = gContestEffects[gContestMoves[move].effect].appeal / 10; + eContestAI.scriptResult = gContestEffects[gBattleMoves[move].contestEffect].appeal / 10; gAIScriptPtr += 1; } @@ -924,7 +924,7 @@ static void ContestAICmd_get_num_move_jam_hearts(void) { u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - eContestAI.scriptResult = gContestEffects[gContestMoves[move].effect].jam / 10; + eContestAI.scriptResult = gContestEffects[gBattleMoves[move].contestEffect].jam / 10; gAIScriptPtr += 1; } @@ -1203,7 +1203,7 @@ static void ContestAICmd_get_used_combo_starter(void) u8 contestant = GetContestantIdByTurn(gAIScriptPtr[1]); if (IsContestantAllowedToCombo(contestant)) - result = gContestMoves[eContestantStatus[contestant].prevMove].comboStarterId ? TRUE : FALSE; + result = gBattleMoves[eContestantStatus[contestant].prevMove].contestComboStarterId ? TRUE : FALSE; eContestAI.scriptResult = result; gAIScriptPtr += 2; @@ -1409,7 +1409,7 @@ static void ContestAICmd_get_used_moves_effect(void) u8 round = gAIScriptPtr[2]; u16 move = eContest.moveHistory[round][contestant]; - eContestAI.scriptResult = gContestMoves[move].effect; + eContestAI.scriptResult = gBattleMoves[move].contestEffect; gAIScriptPtr += 3; } @@ -1509,7 +1509,7 @@ static void ContestAICmd_get_used_moves_effect_type(void) u8 round = gAIScriptPtr[2]; u16 move = eContest.moveHistory[round][contestant]; - eContestAI.scriptResult = gContestEffects[gContestMoves[move].effect].effectType; + eContestAI.scriptResult = gContestEffects[gBattleMoves[move].contestEffect].effectType; gAIScriptPtr += 3; } @@ -1748,7 +1748,7 @@ static void ContestAICmd_check_user_has_move(void) for (i = 0; i < MAX_MON_MOVES; i++) { #ifdef BUGFIX - u16 move = gContestMoves[gContestMons[eContestAI.contestantId].moves[i]].effect; + u16 move = gBattleMoves[gContestMons[eContestAI.contestantId].moves[i]].contestEffect; #else u16 move = gContestMons[eContestAI.contestantId].moves[i]; #endif diff --git a/src/contest_effect.c b/src/contest_effect.c index ae0e9d76c573..0e772b523954 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -60,7 +60,7 @@ static s16 RoundUp(s16); bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove) { int i; - u8 lastMoveComboStarterId = gContestMoves[lastMove].comboStarterId; + u8 lastMoveComboStarterId = gBattleMoves[lastMove].contestComboStarterId; if (lastMoveComboStarterId == 0) { @@ -70,7 +70,7 @@ bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove) { for (i = 0; i < MAX_COMBO_MOVES; i++) { - if (lastMoveComboStarterId == gContestMoves[nextMove].comboMoves[i]) + if (lastMoveComboStarterId == gBattleMoves[nextMove].contestComboMoves[i]) return TRUE; } return FALSE; @@ -314,7 +314,7 @@ static void ContestEffect_JamsOthersButMissOneTurn(void) static void ContestEffect_StartleMonsSameTypeAppeal(void) { u16 move = eContestantStatus[eContestAppealResults.contestant].currMove; - JamByMoveCategory(gContestMoves[move].contestCategory); + JamByMoveCategory(gBattleMoves[move].contestCategory); SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } @@ -427,7 +427,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) for (i = 0; i < CONTESTANT_COUNT; i++) { if (eContestantStatus[i].hasJudgesAttention && IsContestantAllowedToCombo(i)) - oddsMod[i] = gContestMoves[eContestantStatus[i].prevMove].comboStarterId == 0 ? 0 : 10; + oddsMod[i] = gBattleMoves[eContestantStatus[i].prevMove].contestComboStarterId == 0 ? 0 : 10; else oddsMod[i] = 0; oddsMod[i] -= (eContestantStatus[i].condition / 10) * 10; @@ -523,7 +523,7 @@ static void ContestEffect_BetterIfFirst(void) if (gContestantTurnOrder[eContestAppealResults.contestant] == 0) { u16 move = eContestantStatus[eContestAppealResults.contestant].currMove; - eContestantStatus[eContestAppealResults.contestant].appeal += 2 * gContestEffects[gContestMoves[move].effect].appeal; + eContestantStatus[eContestAppealResults.contestant].appeal += 2 * gContestEffects[gBattleMoves[move].contestEffect].appeal; SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_HUSTLE_STANDOUT); } } @@ -534,7 +534,7 @@ static void ContestEffect_BetterIfLast(void) if (gContestantTurnOrder[eContestAppealResults.contestant] == 3) { u16 move = eContestantStatus[eContestAppealResults.contestant].currMove; - eContestantStatus[eContestAppealResults.contestant].appeal += 2 * gContestEffects[gContestMoves[move].effect].appeal; + eContestantStatus[eContestAppealResults.contestant].appeal += 2 * gContestEffects[gBattleMoves[move].contestEffect].appeal; SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_WORK_HARD_UNNOTICED); } } @@ -667,9 +667,9 @@ static void ContestEffect_BetterIfSameType(void) } move = eContestantStatus[eContestAppealResults.contestant].currMove; - if (gContestMoves[move].contestCategory == gContestMoves[eContestantStatus[j].currMove].contestCategory) + if (gBattleMoves[move].contestCategory == gBattleMoves[eContestantStatus[j].currMove].contestCategory) { - eContestantStatus[eContestAppealResults.contestant].appeal += gContestEffects[gContestMoves[move].effect].appeal * 2; + eContestantStatus[eContestAppealResults.contestant].appeal += gContestEffects[gBattleMoves[move].contestEffect].appeal * 2; SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_SAME_TYPE_GOOD); } } @@ -685,9 +685,9 @@ static void ContestEffect_BetterIfDiffType(void) for (i = 0; i < CONTESTANT_COUNT; i++) { if (eContestAppealResults.turnOrder[eContestAppealResults.contestant] - 1 == eContestAppealResults.turnOrder[i] && - gContestMoves[move].contestCategory != gContestMoves[eContestantStatus[i].currMove].contestCategory) + gBattleMoves[move].contestCategory != gBattleMoves[eContestantStatus[i].currMove].contestCategory) { - eContestantStatus[eContestAppealResults.contestant].appeal += gContestEffects[gContestMoves[move].effect].appeal * 2; + eContestantStatus[eContestAppealResults.contestant].appeal += gContestEffects[gBattleMoves[move].contestEffect].appeal * 2; SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_DIFF_TYPE_GOOD); break; } @@ -885,7 +885,7 @@ static void ContestEffect_ScrambleNextTurnOrder(void) // An appeal that excites the audience in any CONTEST. static void ContestEffect_ExciteAudienceInAnyContest(void) { - if (gContestMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory != gSpecialVar_ContestCategory) + if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory != gSpecialVar_ContestCategory) { eContestantStatus[eContestAppealResults.contestant].overrideCategoryExcitementMod = TRUE; } @@ -972,7 +972,7 @@ static void JamByMoveCategory(u8 category) { if (eContestAppealResults.turnOrder[eContestAppealResults.contestant] > eContestAppealResults.turnOrder[i]) { - if (category == gContestMoves[eContestantStatus[i].currMove].contestCategory) + if (category == gBattleMoves[eContestantStatus[i].currMove].contestCategory) eContestAppealResults.jam = 40; else eContestAppealResults.jam = 10; diff --git a/src/data/contest_moves.h b/src/data/contest_moves.h index 8167f2510435..ce88430bb6c2 100644 --- a/src/data/contest_moves.h +++ b/src/data/contest_moves.h @@ -1,6111 +1,3 @@ -// gen 4+ data from urpg's contest movedex -const struct ContestMove gContestMoves[MOVES_COUNT] = -{ - [MOVE_NONE] = {0}, - - [MOVE_POUND] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_POUND, - .comboMoves = {0} - }, - - [MOVE_KARATE_CHOP] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_DOUBLE_SLAP] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_POUND}, - }, - - [MOVE_COMET_PUNCH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MEGA_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_PAY_DAY] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FIRE_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_FIRE_PUNCH, - .comboMoves = {COMBO_STARTER_ICE_PUNCH, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH}, - }, - - [MOVE_ICE_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_ICE_PUNCH, - .comboMoves = {COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_THUNDER_PUNCH}, - }, - - [MOVE_THUNDER_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_THUNDER_PUNCH, - .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH}, - }, - - [MOVE_SCRATCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SCRATCH, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_VISE_GRIP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_VICE_GRIP, - .comboMoves = {0} - }, - - [MOVE_GUILLOTINE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_VICE_GRIP}, - }, - - [MOVE_RAZOR_WIND] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SWORDS_DANCE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SWORDS_DANCE, - .comboMoves = {0} - }, - - [MOVE_CUT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_GUST] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WING_ATTACK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WHIRLWIND] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLY] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BIND] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_VICE_GRIP}, - }, - - [MOVE_SLAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_POUND}, - }, - - [MOVE_VINE_WHIP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_STOMP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_DOUBLE_KICK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MEGA_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_JUMP_KICK] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_ROLLING_KICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SAND_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SAND_ATTACK, - .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_HEADBUTT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_HORN_ATTACK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_HORN_ATTACK, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_FURY_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK}, - }, - - [MOVE_HORN_DRILL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HORN_ATTACK}, - }, - - [MOVE_TACKLE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN, COMBO_STARTER_LEER}, - }, - - [MOVE_BODY_SLAM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WRAP] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TAKE_DOWN] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, - }, - - [MOVE_THRASH] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAGE}, - }, - - [MOVE_DOUBLE_EDGE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, - }, - - [MOVE_TAIL_WHIP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_POISON_STING] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TWINEEDLE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PIN_MISSILE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LEER] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_LEER, - .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_BITE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_GROWL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_ROAR] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SING] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SING, - .comboMoves = {0} - }, - - [MOVE_SUPERSONIC] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SONIC_BOOM] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DISABLE] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ACID] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_EMBER] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_FLAMETHROWER] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MIST] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WATER_GUN] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT}, - }, - - [MOVE_HYDRO_PUMP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SURF] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SURF, - .comboMoves = {COMBO_STARTER_DIVE, COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_ICE_BEAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_BLIZZARD] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_POWDER_SNOW}, - }, - - [MOVE_PSYBEAM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_BUBBLE_BEAM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_AURORA_BEAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_HYPER_BEAM] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PECK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_PECK, - .comboMoves = {0} - }, - - [MOVE_DRILL_PECK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_PECK}, - }, - - [MOVE_SUBMISSION] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_LOW_KICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COUNTER] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_SEISMIC_TOSS] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_STRENGTH] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ABSORB] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_MEGA_DRAIN] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_LEECH_SEED] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_LEECH_SEED, - .comboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_WORRY_SEED}, - }, - - [MOVE_GROWTH] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_GROWTH, - .comboMoves = {0} - }, - - [MOVE_RAZOR_LEAF] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_SOLAR_BEAM] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_POISON_POWDER] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_STUN_SPORE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_SLEEP_POWDER] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_PETAL_DANCE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_STRING_SHOT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_STRING_SHOT, - .comboMoves = {0} - }, - - [MOVE_DRAGON_RAGE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_RAGE, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, - }, - - [MOVE_FIRE_SPIN] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_THUNDER_SHOCK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDERBOLT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDER_WAVE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDER] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_LOCK_ON, COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_ROCK_THROW] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_ROCK_THROW, - .comboMoves = {0} - }, - - [MOVE_EARTHQUAKE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_EARTHQUAKE, - .comboMoves = {0} - }, - - [MOVE_FISSURE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_EARTHQUAKE}, - }, - - [MOVE_DIG] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TOXIC] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_TOXIC, - .comboMoves = {0} - }, - - [MOVE_CONFUSION] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CONFUSION, - .comboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, - }, - - [MOVE_PSYCHIC] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_PSYCHIC, - .comboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_CONFUSION, COMBO_STARTER_KINESIS}, - }, - - [MOVE_HYPNOSIS] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_HYPNOSIS, - .comboMoves = {0} - }, - - [MOVE_MEDITATE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_AGILITY] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, - }, - - [MOVE_QUICK_ATTACK] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, - }, - - [MOVE_RAGE] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_RAGE, - .comboMoves = {0} - }, - - [MOVE_TELEPORT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CONFUSION, COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, - }, - - [MOVE_NIGHT_SHADE] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MIMIC] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SCREECH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DOUBLE_TEAM] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DOUBLE_TEAM, - .comboMoves = {0} - }, - - [MOVE_RECOVER] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HARDEN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_HARDEN, - .comboMoves = {0} - }, - - [MOVE_MINIMIZE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SMOKESCREEN] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SMOG}, - }, - - [MOVE_CONFUSE_RAY] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WITHDRAW] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DEFENSE_CURL] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_DEFENSE_CURL, - .comboMoves = {0} - }, - - [MOVE_BARRIER] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LIGHT_SCREEN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_HAZE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_REFLECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_FOCUS_ENERGY] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_FOCUS_ENERGY, - .comboMoves = {0} - }, - - [MOVE_BIDE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_METRONOME] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MIRROR_MOVE] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SELF_DESTRUCT] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_EGG_BOMB] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SOFT_BOILED}, - }, - - [MOVE_LICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SMOG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SMOG, - .comboMoves = {0} - }, - - [MOVE_SLUDGE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SLUDGE, - .comboMoves = {COMBO_STARTER_SLUDGE_BOMB}, - }, - - [MOVE_BONE_CLUB] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONE_CLUB, - .comboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH, COMBO_STARTER_SHADOW_BONE}, - }, - - [MOVE_FIRE_BLAST] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_WATERFALL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_CLAMP] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SWIFT] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SKULL_BASH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPIKE_CANNON] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CONSTRICT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AMNESIA] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_KINESIS] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_KINESIS, - .comboMoves = {COMBO_STARTER_CONFUSION, COMBO_STARTER_PSYCHIC}, - }, - - [MOVE_SOFT_BOILED] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SOFT_BOILED, - .comboMoves = {0} - }, - - [MOVE_HIGH_JUMP_KICK] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_GLARE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_DREAM_EATER] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_HYPNOSIS}, - }, - - [MOVE_POISON_GAS] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BARRAGE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LEECH_LIFE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LOVELY_KISS] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SKY_ATTACK] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TRANSFORM] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BUBBLE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DIZZY_PUNCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPORE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLASH] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PSYWAVE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_SPLASH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ACID_ARMOR] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CRABHAMMER] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_EXPLOSION] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FURY_SWIPES] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCRATCH}, - }, - - [MOVE_BONEMERANG] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONEMERANG, - .comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH, COMBO_STARTER_SHADOW_BONE}, - }, - - [MOVE_REST] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_REST, - .comboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN}, - }, - - [MOVE_ROCK_SLIDE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ROCK_THROW}, - }, - - [MOVE_HYPER_FANG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SHARPEN] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CONVERSION] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TRI_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_SUPER_FANG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_SLASH] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCRATCH, COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_SUBSTITUTE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STRUGGLE] = {0}, - - [MOVE_SKETCH] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TRIPLE_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_THIEF] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPIDER_WEB] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STRING_SHOT}, - }, - - [MOVE_MIND_READER] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_MIND_READER, - .comboMoves = {0} - }, - - [MOVE_NIGHTMARE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLAME_WHEEL] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SNORE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_REST}, - }, - - [MOVE_CURSE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_CURSE, - .comboMoves = {0} - }, - - [MOVE_FLAIL] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_CONVERSION_2] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AEROBLAST] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COTTON_SPORE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_REVERSAL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_SPITE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_POWDER_SNOW] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_POWDER_SNOW, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_PROTECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HARDEN}, - }, - - [MOVE_MACH_PUNCH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SCARY_FACE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SCARY_FACE, - .comboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_RAGE}, - }, - - [MOVE_FEINT_ATTACK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND}, - }, - - [MOVE_SWEET_KISS] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_BELLY_DRUM] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_BELLY_DRUM, - .comboMoves = {0} - }, - - [MOVE_SLUDGE_BOMB] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SLUDGE_BOMB, - .comboMoves = {COMBO_STARTER_SLUDGE}, - }, - - [MOVE_MUD_SLAP] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_MUD_SLAP, - .comboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_OCTAZOOKA] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON, COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SPIKES] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ZAP_CANNON] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_FORESIGHT] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DESTINY_BOND] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE, COMBO_STARTER_MEAN_LOOK}, - }, - - [MOVE_PERISH_SONG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING}, - }, - - [MOVE_ICY_WIND] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_DETECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_BONE_RUSH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONE_RUSH, - .comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_SHADOW_BONE}, - }, - - [MOVE_LOCK_ON] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_LOCK_ON, - .comboMoves = {0} - }, - - [MOVE_OUTRAGE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SANDSTORM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SANDSTORM, - .comboMoves = {0} - }, - - [MOVE_GIGA_DRAIN] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_ENDURE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_ENDURE, - .comboMoves = {0} - }, - - [MOVE_CHARM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_CHARM, - .comboMoves = {0} - }, - - [MOVE_ROLLOUT] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN}, - }, - - [MOVE_FALSE_SWIPE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_SWAGGER] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MILK_DRINK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPARK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_FURY_CUTTER] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_STEEL_WING] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MEAN_LOOK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_MEAN_LOOK, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_ATTRACT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SLEEP_TALK] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_REST}, - }, - - [MOVE_HEAL_BELL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_HEAL_BELL, - .comboMoves = {COMBO_STARTER_LUCKY_CHANT}, - }, - - [MOVE_RETURN] = - { - .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PRESENT] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FRUSTRATION] = - { - .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SAFEGUARD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PAIN_SPLIT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_SACRED_FIRE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MAGNITUDE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DYNAMIC_PUNCH] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_MEGAHORN] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_BREATH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_BREATH, - .comboMoves = {COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, - }, - - [MOVE_BATON_PASS] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ENCORE] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PURSUIT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_RAPID_SPIN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SWEET_SCENT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SWEET_SCENT, - .comboMoves = {0} - }, - - [MOVE_IRON_TAIL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_METAL_CLAW] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_METAL_SOUND}, - }, - - [MOVE_VITAL_THROW] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_MORNING_SUN] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SYNTHESIS] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MOONLIGHT] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HIDDEN_POWER] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CROSS_CHOP] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_TWISTER] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_RAIN_DANCE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_RAIN_DANCE, - .comboMoves = {0} - }, - - [MOVE_SUNNY_DAY] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SUNNY_DAY, - .comboMoves = {0} - }, - - [MOVE_CRUNCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_MIRROR_COAT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_PSYCH_UP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_EXTREME_SPEED] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ANCIENT_POWER] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SHADOW_BALL] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FUTURE_SIGHT] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_CONFUSION, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, - }, - - [MOVE_ROCK_SMASH] = - { - .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WHIRLPOOL] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_BEAT_UP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FAKE_OUT] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_FAKE_OUT, - .comboMoves = {0} - }, - - [MOVE_UPROAR] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STOCKPILE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_STOCKPILE, - .comboMoves = {0} - }, - - [MOVE_SPIT_UP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STOCKPILE}, - }, - - [MOVE_SWALLOW] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STOCKPILE}, - }, - - [MOVE_HEAT_WAVE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HAIL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_HAIL, - .comboMoves = {0} - }, - - [MOVE_TORMENT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLATTER] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_WILL_O_WISP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MEMENTO] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FACADE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FOCUS_PUNCH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_SMELLING_SALTS] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FOLLOW_ME] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_NATURE_POWER] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CHARGE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CHARGE, - .comboMoves = {0} - }, - - [MOVE_TAUNT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_TAUNT, - .comboMoves = {0} - }, - - [MOVE_HELPING_HAND] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TRICK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ROLE_PLAY] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WISH] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ASSIST] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_INGRAIN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SUPERPOWER] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_MAGIC_COAT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_RECYCLE] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_REVENGE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_REVENGE, - .comboMoves = {COMBO_STARTER_PAYBACK}, - }, - - [MOVE_BRICK_BREAK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_YAWN] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_YAWN, - .comboMoves = {0} - }, - - [MOVE_KNOCK_OFF] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_ENDEAVOR] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_ERUPTION] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_ENDURE, COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SKILL_SWAP] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_IMPRISON] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_REFRESH] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SING, COMBO_STARTER_WATER_SPORT}, - }, - - [MOVE_GRUDGE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_SNATCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SECRET_POWER] = - { - .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DIVE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_DIVE, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF}, - }, - - [MOVE_ARM_THRUST] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_CAMOUFLAGE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TAIL_GLOW] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LUSTER_PURGE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_MIST_BALL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_FEATHER_DANCE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TEETER_DANCE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BLAZE_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MUD_SPORT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_MUD_SPORT, - .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM, COMBO_STARTER_WATER_SPORT}, - }, - - [MOVE_ICE_BALL] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_NEEDLE_ARM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SLACK_OFF] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HYPER_VOICE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POISON_FANG] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CRUSH_CLAW] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_BLAST_BURN] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HYDRO_CANNON] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_METEOR_MASH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ASTONISH] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WEATHER_BALL] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SANDSTORM, COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_AROMATHERAPY] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FAKE_TEARS] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AIR_CUTTER] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_OVERHEAT] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_ODOR_SLEUTH] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ROCK_TOMB] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ROCK_THROW}, - }, - - [MOVE_SILVER_WIND] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_METAL_SOUND] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_METAL_SOUND, - .comboMoves = {0} - }, - - [MOVE_GRASS_WHISTLE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TICKLE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COSMIC_POWER] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WATER_SPOUT] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SIGNAL_BEAM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SHADOW_PUNCH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_EXTRASENSORY] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SKY_UPPERCUT] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_SAND_TOMB] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_SHEER_COLD] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_MUDDY_WATER] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_BULLET_SEED] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_AERIAL_ACE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ICICLE_SPEAR] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_IRON_DEFENSE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BLOCK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HOWL] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_CLAW] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, - }, - - [MOVE_FRENZY_PLANT] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_BULK_UP] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BOUNCE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MUD_SHOT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_POISON_TAIL] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COVET] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_VOLT_TACKLE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MAGICAL_LEAF] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_WATER_SPORT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_WATER_SPORT, - .comboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_CALM_MIND] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CALM_MIND, - .comboMoves = {0} - }, - - [MOVE_LEAF_BLADE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_DANCE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_DANCE, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, - }, - - [MOVE_ROCK_BLAST] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SHOCK_WAVE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_WATER_PULSE] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DOOM_DESIRE] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PSYCHO_BOOST] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_ROOST] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_BRAVE_BIRD}, - }, - - [MOVE_GRAVITY] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MIRACLE_EYE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WAKE_UP_SLAP] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HAMMER_ARM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_GYRO_BALL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEALING_WISH] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BRINE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_NATURAL_GIFT] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FEINT] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PLUCK] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TAILWIND] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ACUPRESSURE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_METAL_BURST] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_METAL_SOUND}, - }, - - [MOVE_U_TURN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CLOSE_COMBAT] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_PAYBACK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_PAYBACK, - .comboMoves = {COMBO_STARTER_REVENGE}, - }, - - [MOVE_ASSURANCE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_PAYBACK, COMBO_STARTER_REVENGE}, - }, - - [MOVE_EMBARGO] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLING] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PSYCHO_SHIFT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TRUMP_CARD] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEAL_BLOCK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WRING_OUT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POWER_TRICK] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GASTRO_ACID] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LUCKY_CHANT] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_LUCKY_CHANT, - .comboMoves = {COMBO_STARTER_HEAL_BELL}, - }, - - [MOVE_ME_FIRST] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COPYCAT] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POWER_SWAP] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GUARD_SWAP] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PUNISHMENT] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LAST_RESORT] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WORRY_SEED] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_WORRY_SEED, - .comboMoves = {COMBO_STARTER_LEECH_SEED}, - }, - - [MOVE_SUCKER_PUNCH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TOXIC_SPIKES] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEART_SWAP] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AQUA_RING] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MAGNET_RISE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLARE_BLITZ] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_FORCE_PALM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AURA_SPHERE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ROCK_POLISH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POISON_JAB] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DARK_PULSE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_NIGHT_SLASH] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AQUA_TAIL] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SEED_BOMB] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AIR_SLASH] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_X_SCISSOR] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_BUG_BUZZ] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_PULSE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_RUSH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_RUSH, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_TAIL}, - }, - - [MOVE_POWER_GEM] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAIN_PUNCH] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_VACUUM_WAVE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FOCUS_BLAST] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_ENERGY_BALL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_BRAVE_BIRD] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_BRAVE_BIRD, - .comboMoves = {0} - }, - - [MOVE_EARTH_POWER] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SWITCHEROO] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GIGA_IMPACT] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_NASTY_PLOT] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BULLET_PUNCH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AVALANCHE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ICE_SHARD] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SHADOW_CLAW] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_THUNDER_FANG] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_THUNDER_FANG, - .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_FANG, COMBO_STARTER_ICE_FANG}, - }, - - [MOVE_ICE_FANG] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_ICE_FANG, - .comboMoves = {COMBO_STARTER_FIRE_FANG, COMBO_STARTER_THUNDER_FANG}, - }, - - [MOVE_FIRE_FANG] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_FIRE_FANG, - .comboMoves = {COMBO_STARTER_ICE_FANG, COMBO_STARTER_THUNDER_FANG}, - }, - - [MOVE_SHADOW_SNEAK] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MUD_BOMB] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PSYCHO_CUT] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ZEN_HEADBUTT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MIRROR_SHOT] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLASH_CANNON] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ROCK_CLIMB] = - { - .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DEFOG] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TRICK_ROOM] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRACO_METEOR] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DISCHARGE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_LAVA_PLUME] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_LEAF_STORM] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POWER_WHIP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_ROCK_WRECKER] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CROSS_POISON] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GUNK_SHOT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_IRON_HEAD] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MAGNET_BOMB] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STONE_EDGE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CAPTIVATE] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_STEALTH_ROCK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GRASS_KNOT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CHATTER] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_JUDGMENT] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BUG_BITE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CHARGE_BEAM] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_WOOD_HAMMER] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AQUA_JET] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_ATTACK_ORDER] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_ATTACK_ORDER, - .comboMoves = {COMBO_STARTER_DEFEND_ORDER, COMBO_STARTER_HEAL_ORDER}, - }, - - [MOVE_DEFEND_ORDER] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_DEFEND_ORDER, - .comboMoves = {COMBO_STARTER_ATTACK_ORDER, COMBO_STARTER_HEAL_ORDER}, - }, - - [MOVE_HEAL_ORDER] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_HEAL_ORDER, - .comboMoves = {COMBO_STARTER_ATTACK_ORDER, COMBO_STARTER_DEFEND_ORDER}, - }, - - [MOVE_HEAD_SMASH] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DOUBLE_HIT] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ROAR_OF_TIME] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPACIAL_REND] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LUNAR_DANCE] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CRUSH_GRIP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MAGMA_STORM] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_DARK_VOID] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SEED_FLARE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_OMINOUS_WIND] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SHADOW_FORCE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HONE_CLAWS] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WIDE_GUARD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GUARD_SPLIT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POWER_SPLIT] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WONDER_ROOM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PSYSHOCK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_VENOSHOCK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TOXIC}, - }, - - [MOVE_AUTOTOMIZE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_RAGE_POWDER] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TELEKINESIS] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MAGIC_ROOM] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SMACK_DOWN] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STORM_THROW] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLAME_BURST] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SLUDGE_WAVE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_QUIVER_DANCE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEAVY_SLAM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SYNCHRONOISE] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ELECTRO_BALL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SOAK] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLAME_CHARGE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COIL] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LOW_SWEEP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ACID_SPRAY] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FOUL_PLAY] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SIMPLE_BEAM] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ENTRAINMENT] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AFTER_YOU] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ROUND] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ECHOED_VOICE] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CHIP_AWAY] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CLEAR_SMOG] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STORED_POWER] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_QUICK_GUARD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ALLY_SWITCH] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SCALD] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SCALD, - .comboMoves = {0} - }, - - [MOVE_SHELL_SMASH] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEAL_PULSE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEX] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TOXIC}, - }, - - [MOVE_SKY_DROP] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SHIFT_GEAR] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CIRCLE_THROW] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_INCINERATE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_QUASH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ACROBATICS] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_REFLECT_TYPE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_RETALIATE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FINAL_GAMBIT] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BESTOW] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_INFERNO] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WATER_PLEDGE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FIRE_PLEDGE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GRASS_PLEDGE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_VOLT_SWITCH] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STRUGGLE_BUG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BULLDOZE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FROST_BREATH] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_TAIL] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_TAIL, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH}, - }, - - [MOVE_WORK_UP] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ELECTROWEB] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_WILD_CHARGE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRILL_RUN] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DUAL_CHOP] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEART_STAMP] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HORN_LEECH] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SACRED_SWORD] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_RAZOR_SHELL] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEAT_CRASH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LEAF_TORNADO] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STEAMROLLER] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COTTON_GUARD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_NIGHT_DAZE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PSYSTRIKE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TAIL_SLAP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HURRICANE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HEAD_CHARGE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GEAR_GRIND] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SEARING_SHOT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TECHNO_BLAST] = - { - .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_RELIC_SONG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SECRET_SWORD] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GLACIATE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BOLT_STRIKE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BLUE_FLARE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FIERY_DANCE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FREEZE_SHOCK] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ICE_BURN] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SNARL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ICICLE_CRASH] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_V_CREATE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FUSION_FLARE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FUSION_BOLT] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLYING_PRESS] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MAT_BLOCK] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BELCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ROTOTILLER] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STICKY_WEB] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FELL_STINGER] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PHANTOM_FORCE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TRICK_OR_TREAT] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_NOBLE_ROAR] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ION_DELUGE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PARABOLIC_CHARGE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FORESTS_CURSE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PETAL_BLIZZARD] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FREEZE_DRY] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DISARMING_VOICE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PARTING_SHOT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TOPSY_TURVY] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAINING_KISS] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CRAFTY_SHIELD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLOWER_SHIELD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GRASSY_TERRAIN] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_GRASSY_TERRAIN, - .comboMoves = {0} - }, - - [MOVE_MISTY_TERRAIN] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_MISTY_TERRAIN, - .comboMoves = {0} - }, - - [MOVE_ELECTRIFY] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PLAY_ROUGH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FAIRY_WIND] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MOONBLAST] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BOOMBURST] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FAIRY_LOCK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_KINGS_SHIELD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PLAY_NICE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CONFIDE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DIAMOND_STORM] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STEAM_ERUPTION] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCALD}, - }, - - [MOVE_HYPERSPACE_HOLE] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_HYPERSPACE_HOLE, - .comboMoves = {COMBO_STARTER_HYPERSPACE_FURY}, - }, - - [MOVE_WATER_SHURIKEN] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MYSTICAL_FIRE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPIKY_SHIELD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AROMATIC_MIST] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_EERIE_IMPULSE] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_VENOM_DRENCH] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TOXIC}, - }, - - [MOVE_POWDER] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GEOMANCY] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MAGNETIC_FLUX] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HAPPY_HOUR] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ELECTRIC_TERRAIN] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_ELECTRIC_TERRAIN, - .comboMoves = {0} - }, - - [MOVE_DAZZLING_GLEAM] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CELEBRATE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HOLD_HANDS] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BABY_DOLL_EYES] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_NUZZLE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HOLD_BACK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_INFESTATION] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POWER_UP_PUNCH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_OBLIVION_WING] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_THOUSAND_ARROWS] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_THOUSAND_ARROWS, - .comboMoves = {COMBO_STARTER_THOUSAND_WAVES}, - }, - - [MOVE_THOUSAND_WAVES] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_THOUSAND_WAVES, - .comboMoves = {COMBO_STARTER_THOUSAND_ARROWS}, - }, - - [MOVE_LANDS_WRATH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LIGHT_OF_RUIN] = {0}, // undefined in urpg - - [MOVE_ORIGIN_PULSE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PRECIPICE_BLADES] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_ASCENT] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HYPERSPACE_FURY] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_HYPERSPACE_FURY, - .comboMoves = {COMBO_STARTER_HYPERSPACE_HOLE}, - }, - - [MOVE_SHORE_UP] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SANDSTORM} - }, - - [MOVE_FIRST_IMPRESSION] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BANEFUL_BUNKER] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPIRIT_SHACKLE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DARKEST_LARIAT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPARKLING_ARIA] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCALD}, - }, - - [MOVE_ICE_HAMMER] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_FLORAL_HEALING] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_HIGH_HORSEPOWER] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STRENGTH_SAP] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SOLAR_BLADE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_LEAFAGE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_SPOTLIGHT] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TOXIC_THREAD] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TOXIC}, - }, - - [MOVE_LASER_FOCUS] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GEAR_UP] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_THROAT_CHOP] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POLLEN_PUFF] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ANCHOR_SHOT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PSYCHIC_TERRAIN] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_PSYCHIC_TERRAIN, - .comboMoves = {0} - }, - - [MOVE_LUNGE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FIRE_LASH] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_POWER_TRIP] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BURN_UP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SPEED_SWAP] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SMART_STRIKE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PURIFY] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_REVELATION_DANCE] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CORE_ENFORCER] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TROP_KICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_INSTRUCT] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BEAK_BLAST] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CLANGING_SCALES] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_HAMMER] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, - }, - - [MOVE_BRUTAL_SWING] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_AURORA_VEIL] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_SHELL_TRAP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLEUR_CANNON] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PSYCHIC_FANGS] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STOMPING_TANTRUM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SHADOW_BONE] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SHADOW_BONE, - .comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH}, - }, - - [MOVE_ACCELEROCK] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LIQUIDATION] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_PRISMATIC_LASER] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SPECTRAL_THIEF] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SUNSTEEL_STRIKE] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MOONGEIST_BEAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TEARFUL_LOOK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ZING_ZAP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_NATURES_MADNESS] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MULTI_ATTACK] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MIND_BLOWN] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PLASMA_FISTS] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PHOTON_GEYSER] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DOUBLE_IRON_BASH] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DYNAMAX_CANNON] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SNIPE_SHOT] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_JAW_LOCK] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STUFF_CHEEKS] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_NO_RETREAT] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TAR_SHOT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MAGIC_POWDER] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_DARTS] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TEATIME] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_OCTOLOCK] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BOLT_BEAK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FISHIOUS_REND] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COURT_CHANGE] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_CLANGOROUS_SOUL] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BODY_PRESS] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DECORATE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRUM_BEATING] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SNAP_TRAP] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_PYRO_BALL] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BEHEMOTH_BLADE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BEHEMOTH_BASH] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_AURA_WHEEL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BREAKING_SWIPE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BRANCH_POKE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_OVERDRIVE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_APPLE_ACID] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_GRAV_APPLE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPIRIT_BREAK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STRANGE_STEAM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LIFE_DEW] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_OBSTRUCT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FALSE_SURRENDER] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_METEOR_ASSAULT] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_ETERNABEAM] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_STEEL_BEAM] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_EXPANDING_FORCE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_PSYCHIC_TERRAIN} - }, - - [MOVE_STEEL_ROLLER] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SCALE_SHOT] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_METEOR_BEAM] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHELL_SIDE_ARM] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_MISTY_EXPLOSION] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MISTY_TERRAIN} - }, - - [MOVE_GRASSY_GLIDE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GRASSY_TERRAIN} - }, - - [MOVE_RISING_VOLTAGE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN} - }, - - [MOVE_TERRAIN_PULSE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN, COMBO_STARTER_MISTY_TERRAIN, COMBO_STARTER_GRASSY_TERRAIN, COMBO_STARTER_PSYCHIC_TERRAIN}, - }, - - [MOVE_SKITTER_SMACK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_BURNING_JEALOUSY] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_LASH_OUT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_POLTERGEIST] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CORROSIVE_GAS] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_COACHING] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FLIP_TURN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_TRIPLE_AXEL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DUAL_WINGBEAT] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SCORCHING_SANDS] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_JUNGLE_HEALING] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WICKED_BLOW] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_SURGING_STRIKES] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_THUNDER_CAGE] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DRAGON_ENERGY] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FREEZING_GLARE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_FIERY_WRATH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_THUNDEROUS_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_GLACIAL_LANCE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ASTRAL_BARRAGE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EERIE_SPELL] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0} - }, - - [MOVE_DIRE_CLAW] = {0}, // TODO - - [MOVE_PSYSHIELD_BASH] = {0}, // TODO - - [MOVE_POWER_SHIFT] = {0}, // TODO - - [MOVE_STONE_AXE] = {0}, // TODO - - [MOVE_SPRINGTIDE_STORM] = {0}, // TODO - - [MOVE_MYSTICAL_POWER] = {0}, // TODO - - [MOVE_RAGING_FURY] = {0}, // TODO - - [MOVE_WAVE_CRASH] = {0}, // TODO - - [MOVE_CHLOROBLAST] = {0}, // TODO - - [MOVE_MOUNTAIN_GALE] = {0}, // TODO - - [MOVE_VICTORY_DANCE] = {0}, // TODO - - [MOVE_HEADLONG_RUSH] = {0}, // TODO - - [MOVE_BARB_BARRAGE] = {0}, // TODO - - [MOVE_ESPER_WING] = {0}, // TODO - - [MOVE_BITTER_MALICE] = {0}, // TODO - - [MOVE_SHELTER] = {0}, // TODO - - [MOVE_TRIPLE_ARROWS] = {0}, // TODO - - [MOVE_INFERNAL_PARADE] = {0}, // TODO - - [MOVE_CEASELESS_EDGE] = {0}, // TODO - - [MOVE_BLEAKWIND_STORM] = {0}, // TODO - - [MOVE_WILDBOLT_STORM] = {0}, // TODO - - [MOVE_SANDSEAR_STORM] = {0}, // TODO - - [MOVE_LUNAR_BLESSING] = {0}, // TODO - - [MOVE_TAKE_HEART] = {0}, // TODO - - [MOVE_TERA_BLAST] = {0}, // TODO - - [MOVE_SILK_TRAP] = {0}, // TODO - - [MOVE_AXE_KICK] = {0}, // TODO - - [MOVE_LAST_RESPECTS] = {0}, // TODO - - [MOVE_LUMINA_CRASH] = {0}, // TODO - - [MOVE_ORDER_UP] = {0}, // TODO - - [MOVE_JET_PUNCH] = {0}, // TODO - - [MOVE_SPICY_EXTRACT] = {0}, // TODO - - [MOVE_SPIN_OUT] = {0}, // TODO - - [MOVE_POPULATION_BOMB] = {0}, // TODO - - [MOVE_ICE_SPINNER] = {0}, // TODO - - [MOVE_GLAIVE_RUSH] = {0}, // TODO - - [MOVE_REVIVAL_BLESSING] = {0}, // TODO - - [MOVE_SALT_CURE] = {0}, // TODO - - [MOVE_TRIPLE_DIVE] = {0}, // TODO - - [MOVE_MORTAL_SPIN] = {0}, // TODO - - [MOVE_DOODLE] = {0}, // TODO - - [MOVE_FILLET_AWAY] = {0}, // TODO - - [MOVE_KOWTOW_CLEAVE] = {0}, // TODO - - [MOVE_FLOWER_TRICK] = {0}, // TODO - - [MOVE_TORCH_SONG] = {0}, // TODO - - [MOVE_AQUA_STEP] = {0}, // TODO - - [MOVE_RAGING_BULL] = {0}, // TODO - - [MOVE_MAKE_IT_RAIN] = {0}, // TODO - - [MOVE_RUINATION] = {0}, // TODO - - [MOVE_COLLISION_COURSE] = {0}, // TODO - - [MOVE_ELECTRO_DRIFT] = {0}, // TODO - - [MOVE_SHED_TAIL] = {0}, // TODO - - [MOVE_CHILLY_RECEPTION] = {0}, // TODO - - [MOVE_TIDY_UP] = {0}, // TODO - - [MOVE_SNOWSCAPE] = {0}, // TODO - - [MOVE_POUNCE] = {0}, // TODO - - [MOVE_TRAILBLAZE] = {0}, // TODO - - [MOVE_CHILLING_WATER] = {0}, // TODO - - [MOVE_HYPER_DRILL] = {0}, // TODO - - [MOVE_TWIN_BEAM] = {0}, // TODO - - [MOVE_RAGE_FIST] = {0}, // TODO - - [MOVE_ARMOR_CANNON] = {0}, // TODO - - [MOVE_BITTER_BLADE] = {0}, // TODO - - [MOVE_DOUBLE_SHOCK] = {0}, // TODO - - [MOVE_GIGATON_HAMMER] = {0}, // TODO - - [MOVE_COMEUPPANCE] = {0}, // TODO - - [MOVE_AQUA_CUTTER] = {0}, // TODO - - [MOVE_BLAZING_TORQUE] = {0}, // TODO - - [MOVE_WICKED_TORQUE] = {0}, // TODO - - [MOVE_NOXIOUS_TORQUE] = {0}, // TODO - - [MOVE_COMBAT_TORQUE] = {0}, // TODO - - [MOVE_MAGICAL_TORQUE] = {0}, // TODO - - [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 - - [MOVE_ELECTRO_SHOT] = {0}, // TODO - - [MOVE_TERA_STARSTORM] = {0}, // TODO - - [MOVE_FICKLE_BEAM] = {0}, // TODO - - [MOVE_BURNING_BULWARK] = {0}, // TODO - - [MOVE_THUNDERCLAP] = {0}, // TODO - - [MOVE_MIGHTY_CLEAVE] = {0}, // TODO - - [MOVE_TACHYON_CUTTER] = {0}, // TODO - - [MOVE_HARD_PRESS] = {0}, // TODO - - [MOVE_DRAGON_CHEER] = {0}, // TODO - - [MOVE_ALLURING_VOICE] = {0}, // TODO - - [MOVE_TEMPER_FLARE] = {0}, // TODO - - [MOVE_SUPERCELL_SLAM] = {0}, // TODO - - [MOVE_PSYCHIC_NOISE] = {0}, // TODO - - [MOVE_UPPER_HAND] = {0}, // TODO - - [MOVE_MALIGNANT_CHAIN] = {0}, // TODO -}; - const struct ContestEffect gContestEffects[] = { [CONTEST_EFFECT_HIGHLY_APPEALING] = diff --git a/src/menu_specialized.c b/src/menu_specialized.c index d2bd5a432e2c..c9b83edb6e4e 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -818,7 +818,7 @@ static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) { s32 x; const u8 *str; - const struct ContestMove *move; + const struct BattleMove *move; MoveRelearnerShowHideHearts(chosenMove); FillWindowPixelBuffer(RELEARNERWIN_DESC_CONTEST, PIXEL_FILL(1)); @@ -840,11 +840,11 @@ static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) return; } - move = &gContestMoves[chosenMove]; + move = &gBattleMoves[chosenMove]; str = gContestMoveTypeTextPointers[move->contestCategory]; AddTextPrinterParameterized(RELEARNERWIN_DESC_CONTEST, FONT_NORMAL, str, 4, 25, TEXT_SKIP_DRAW, NULL); - str = gContestEffectDescriptionPointers[move->effect]; + str = gContestEffectDescriptionPointers[move->contestEffect]; AddTextPrinterParameterized(RELEARNERWIN_DESC_CONTEST, FONT_NARROW, str, 0, 65, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(RELEARNERWIN_DESC_CONTEST, COPYWIN_GFX); diff --git a/src/move_relearner.c b/src/move_relearner.c index ee93fd7f7556..408a4a975e9e 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -928,7 +928,7 @@ void MoveRelearnerShowHideHearts(s32 moveId) } else { - numHearts = (u8)(gContestEffects[gContestMoves[moveId].effect].appeal / 10); + numHearts = (u8)(gContestEffects[gBattleMoves[moveId].contestEffect].appeal / 10); if (numHearts == 0xFF) numHearts = 0; @@ -942,7 +942,7 @@ void MoveRelearnerShowHideHearts(s32 moveId) gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = FALSE; } - numHearts = (u8)(gContestEffects[gContestMoves[moveId].effect].jam / 10); + numHearts = (u8)(gContestEffects[gBattleMoves[moveId].contestEffect].jam / 10); if (numHearts == 0xFF) numHearts = 0; diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index d21a94023e68..14b323d1bb7d 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -5352,7 +5352,7 @@ static void PrintStatsScreen_Moves_Top(u8 taskId) } else { - SetTypeIconPosAndPal(NUMBER_OF_MON_TYPES + gContestMoves[move].contestCategory, moves_x + 146, moves_y + 17, 1); + SetTypeIconPosAndPal(NUMBER_OF_MON_TYPES + gBattleMoves[move].contestCategory, moves_x + 146, moves_y + 17, 1); SetSpriteInvisibility(0, TRUE); } @@ -5413,7 +5413,7 @@ static void PrintStatsScreen_Moves_Description(u8 taskId) } else { - StringCopy(gStringVar4, gContestEffectDescriptionPointers[gContestMoves[move].effect]); + StringCopy(gStringVar4, gContestEffectDescriptionPointers[gBattleMoves[move].contestEffect]); PrintStatsScreenTextSmall(WIN_STATS_MOVES_DESCRIPTION, gStringVar4, moves_x, moves_y); } } @@ -5472,7 +5472,7 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) DestroyCategoryIcon(); gSprites[sPokedexView->categoryIconSpriteId].invisible = TRUE; //Appeal - contest_effectValue = gContestEffects[gContestMoves[move].effect].appeal; + contest_effectValue = gContestEffects[gBattleMoves[move].contestEffect].appeal; if (contest_effectValue != 0xFF) contest_appeal = contest_effectValue / 10; ConvertIntToDecimalStringN(gStringVar1, contest_appeal, STR_CONV_MODE_RIGHT_ALIGN, 1); @@ -5481,7 +5481,7 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) PrintStatsScreenTextSmall(WIN_STATS_MOVES_BOTTOM, gStringVar2, moves_x + 45, moves_y); //Jam - contest_effectValue = gContestEffects[gContestMoves[move].effect].jam; + contest_effectValue = gContestEffects[gBattleMoves[move].contestEffect].jam; if (contest_effectValue != 0xFF) contest_jam = contest_effectValue / 10; ConvertIntToDecimalStringN(gStringVar1, contest_jam, STR_CONV_MODE_RIGHT_ALIGN, 1); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 6b442da64cec..b2caa815c3b3 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2767,7 +2767,7 @@ static void DrawContestMoveHearts(u16 move) if (move != MOVE_NONE) { // Draw appeal hearts - u8 effectValue = gContestEffects[gContestMoves[move].effect].appeal; + u8 effectValue = gContestEffects[gBattleMoves[move].contestEffect].appeal; if (effectValue != 0xFF) effectValue /= 10; @@ -2780,7 +2780,7 @@ static void DrawContestMoveHearts(u16 move) } // Draw jam hearts - effectValue = gContestEffects[gContestMoves[move].effect].jam; + effectValue = gContestEffects[gBattleMoves[move].contestEffect].jam; if (effectValue != 0xFF) effectValue /= 10; @@ -3754,7 +3754,7 @@ static void PrintContestMoveDescription(u8 moveSlot) if (move != MOVE_NONE) { u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_DESCRIPTION); - PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gContestMoves[move].effect], 6, 1, 0, 0); + PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gBattleMoves[move].contestEffect], 6, 1, 0, 0); } } @@ -3779,7 +3779,7 @@ static void PrintMoveDetails(u16 move) } else { - PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gContestMoves[move].effect], 6, 1, 0, 0); + PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gBattleMoves[move].contestEffect], 6, 1, 0, 0); } PutWindowTilemap(windowId); } @@ -3971,7 +3971,7 @@ static void SetContestMoveTypeIcons(void) for (i = 0; i < MAX_MON_MOVES; i++) { if (summary->moves[i] != MOVE_NONE) - SetTypeSpritePosAndPal(NUMBER_OF_MON_TYPES + gContestMoves[summary->moves[i]].contestCategory, 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); + SetTypeSpritePosAndPal(NUMBER_OF_MON_TYPES + gBattleMoves[summary->moves[i]].contestCategory, 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); else SetSpriteInvisibility(i + SPRITE_ARR_ID_TYPE, TRUE); } @@ -3988,7 +3988,7 @@ static void SetNewMoveTypeIcon(void) if (sMonSummaryScreen->currPageIndex == PSS_PAGE_BATTLE_MOVES) SetTypeSpritePosAndPal(gBattleMoves[sMonSummaryScreen->newMove].type, 85, 96, SPRITE_ARR_ID_TYPE + 4); else - SetTypeSpritePosAndPal(NUMBER_OF_MON_TYPES + gContestMoves[sMonSummaryScreen->newMove].contestCategory, 85, 96, SPRITE_ARR_ID_TYPE + 4); + SetTypeSpritePosAndPal(NUMBER_OF_MON_TYPES + gBattleMoves[sMonSummaryScreen->newMove].contestCategory, 85, 96, SPRITE_ARR_ID_TYPE + 4); } } From 0e333e298e66f803296d0da2ee63c83b9eda3aed Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 25 Jan 2024 10:24:25 -0300 Subject: [PATCH 16/30] Removed no longer used Z_MOVE_NAME_LENGTH constant --- include/constants/global.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/constants/global.h b/include/constants/global.h index 9f826329e09e..6a2713c3d629 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -112,7 +112,6 @@ #else #define MOVE_NAME_LENGTH 12 #endif -#define Z_MOVE_NAME_LENGTH 27 #define NUM_QUESTIONNAIRE_WORDS 4 #define QUIZ_QUESTION_LEN 9 #define WONDER_CARD_TEXT_LENGTH 40 From a82c7bcf3ef84627b55041999b63e65b60329504 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 25 Jan 2024 11:16:35 -0300 Subject: [PATCH 17/30] Renamed the struct BattleMove's bigMoveName variable and introduced macros to prettify move names --- include/pokemon.h | 2 +- src/data/battle_moves.h | 2137 ++++++++++++++++++++------------------- src/pokemon.c | 2 +- 3 files changed, 1072 insertions(+), 1069 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index c774f8c2fed2..b9629b172f86 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -447,7 +447,7 @@ struct BattleMove { union { u8 moveName[MOVE_NAME_LENGTH + 1]; - const u8 *bigMoveName; + const u8 *longMoveName; } name; const u8 *description; u16 effect; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 5f3c15be7ebc..2e6b5fac2865 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -6,6 +6,9 @@ #include "constants/hold_effects.h" #include "constants/moves.h" +#define MOVE_NAME(nameOfMove) { .moveName = _(nameOfMove) } +#define LONG_MOVE_NAME(longNameOfMove) { .longMoveName = COMPOUND_STRING(longNameOfMove) } + #if B_BINDING_TURNS >= GEN_5 #define BINDING_TURNS "4 or 5" #else @@ -102,7 +105,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { - .name = { .moveName = _("-") }, + .name = MOVE_NAME("-"), .description = COMPOUND_STRING(""), .effect = EFFECT_HIT, .power = 0, @@ -119,7 +122,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUND] = { - .name = { .moveName = _("Pound") }, + .name = MOVE_NAME("Pound"), .description = COMPOUND_STRING("Pounds the foe with\n" "forelegs or tail."), .effect = EFFECT_HIT, @@ -136,7 +139,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KARATE_CHOP] = { - .name = { .moveName = _("Karate Chop") }, + .name = MOVE_NAME("Karate Chop"), .description = COMPOUND_STRING("A chopping attack with a\n" "high critical-hit ratio."), .effect = EFFECT_HIT, @@ -153,7 +156,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SLAP] = { - .name = { .moveName = _("Double Slap") }, + .name = MOVE_NAME("Double Slap"), .description = COMPOUND_STRING("Repeatedly slaps the foe\n" "2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -169,7 +172,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMET_PUNCH] = { - .name = { .moveName = _("Comet Punch") }, + .name = MOVE_NAME("Comet Punch"), .description = COMPOUND_STRING("Repeatedly punches the foe\n" "2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -186,7 +189,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_PUNCH] = { - .name = { .moveName = _("Mega Punch") }, + .name = MOVE_NAME("Mega Punch"), .description = COMPOUND_STRING("A strong punch thrown with\n" "incredible power."), .effect = EFFECT_HIT, @@ -203,7 +206,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAY_DAY] = { - .name = { .moveName = _("Pay Day") }, + .name = MOVE_NAME("Pay Day"), .description = COMPOUND_STRING("Throws coins at the foe.\n" "Money is recovered after."), .effect = EFFECT_HIT, @@ -221,7 +224,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PUNCH] = { - .name = { .moveName = _("Fire Punch") }, + .name = MOVE_NAME("Fire Punch"), .description = COMPOUND_STRING("A fiery punch that may burn\n" "the foe."), .effect = EFFECT_HIT, @@ -243,7 +246,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_PUNCH] = { - .name = { .moveName = _("Ice Punch") }, + .name = MOVE_NAME("Ice Punch"), .description = COMPOUND_STRING("An icy punch that may\n" #if B_USE_FROSTBITE == TRUE "leave the foe with frostbite."), @@ -270,9 +273,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_PUNCH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Thunder Punch") }, + .name = MOVE_NAME("Thunder Punch"), #else - .name = { .moveName = _("ThunderPunch") }, + .name = MOVE_NAME("ThunderPunch"), #endif .description = COMPOUND_STRING("An electrified punch that\n" "may paralyze the foe."), @@ -295,7 +298,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCRATCH] = { - .name = { .moveName = _("Scratch") }, + .name = MOVE_NAME("Scratch"), .description = COMPOUND_STRING("Scratches the foe with\n" "sharp claws."), .effect = EFFECT_HIT, @@ -311,7 +314,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VISE_GRIP] = { - .name = { .moveName = _("Vise Grip") }, + .name = MOVE_NAME("Vise Grip"), .description = COMPOUND_STRING("Grips the foe with large and\n" "powerful pincers."), .effect = EFFECT_HIT, @@ -327,7 +330,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUILLOTINE] = { - .name = { .moveName = _("Guillotine") }, + .name = MOVE_NAME("Guillotine"), .description = COMPOUND_STRING("A powerful pincer attack\n" "that may cause fainting."), .effect = EFFECT_OHKO, @@ -343,7 +346,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_WIND] = { - .name = { .moveName = _("Razor Wind") }, + .name = MOVE_NAME("Razor Wind"), .description = COMPOUND_STRING("A 2-turn move that strikes\n" "the foe on the 2nd turn."), .effect = EFFECT_TWO_TURNS_ATTACK, @@ -363,7 +366,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWORDS_DANCE] = { - .name = { .moveName = _("Swords Dance") }, + .name = MOVE_NAME("Swords Dance"), .description = COMPOUND_STRING("A fighting dance that\n" "sharply raises Attack."), .effect = EFFECT_ATTACK_UP_2, @@ -381,7 +384,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CUT] = { - .name = { .moveName = _("Cut") }, + .name = MOVE_NAME("Cut"), .description = COMPOUND_STRING("Cuts the foe with sharp\n" "scythes, claws, etc."), .effect = EFFECT_HIT, @@ -398,7 +401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUST] = { - .name = { .moveName = _("Gust") }, + .name = MOVE_NAME("Gust"), .description = COMPOUND_STRING("Strikes the foe with a gust\n" "of wind whipped up by wings."), .effect = EFFECT_GUST, @@ -416,7 +419,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WING_ATTACK] = { - .name = { .moveName = _("Wing Attack") }, + .name = MOVE_NAME("Wing Attack"), .description = COMPOUND_STRING("Strikes the foe with wings\n" "spread wide."), .effect = EFFECT_HIT, @@ -432,7 +435,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLWIND] = { - .name = { .moveName = _("Whirlwind") }, + .name = MOVE_NAME("Whirlwind"), .description = COMPOUND_STRING("Blows away the foe with\n" "wind and ends the battle."), .effect = EFFECT_ROAR, @@ -454,7 +457,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLY] = { - .name = { .moveName = _("Fly") }, + .name = MOVE_NAME("Fly"), .description = COMPOUND_STRING("Flies up on the first turn,\n" "then strikes the next turn."), .effect = EFFECT_SEMI_INVULNERABLE, @@ -475,7 +478,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIND] = { - .name = { .moveName = _("Bind") }, + .name = MOVE_NAME("Bind"), .description = COMPOUND_STRING("Binds and squeezes the foe\n" "for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, @@ -495,7 +498,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLAM] = { - .name = { .moveName = _("Slam") }, + .name = MOVE_NAME("Slam"), .description = COMPOUND_STRING("Slams the foe with a long\n" "tail, vine, etc."), .effect = EFFECT_HIT, @@ -512,7 +515,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VINE_WHIP] = { - .name = { .moveName = _("Vine Whip") }, + .name = MOVE_NAME("Vine Whip"), .description = COMPOUND_STRING("Strikes the foe with\n" "slender, whiplike vines."), #if B_UPDATED_MOVE_DATA >= GEN_6 @@ -534,7 +537,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMP] = { - .name = { .moveName = _("Stomp") }, + .name = MOVE_NAME("Stomp"), .description = COMPOUND_STRING("Stomps the enemy with a big\n" "foot. May cause flinching."), .effect = EFFECT_HIT, @@ -557,7 +560,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_KICK] = { - .name = { .moveName = _("Double Kick") }, + .name = MOVE_NAME("Double Kick"), .description = COMPOUND_STRING("A double-kicking attack\n" "that strikes the foe twice."), .effect = EFFECT_HIT, @@ -574,7 +577,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_KICK] = { - .name = { .moveName = _("Mega Kick") }, + .name = MOVE_NAME("Mega Kick"), .description = COMPOUND_STRING("An extremely powerful kick\n" "with intense force."), .effect = EFFECT_HIT, @@ -590,7 +593,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUMP_KICK] = { - .name = { .moveName = _("Jump Kick") }, + .name = MOVE_NAME("Jump Kick"), .description = COMPOUND_STRING("A strong jumping kick. May\n" "miss and hurt the kicker."), #if B_UPDATED_MOVE_DATA >= GEN_5 @@ -613,7 +616,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLING_KICK] = { - .name = { .moveName = _("Rolling Kick") }, + .name = MOVE_NAME("Rolling Kick"), .description = COMPOUND_STRING("A fast kick delivered from\n" "a rapid spin."), .effect = EFFECT_HIT, @@ -635,7 +638,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_ATTACK] = { - .name = { .moveName = _("Sand Attack") }, + .name = MOVE_NAME("Sand Attack"), .description = COMPOUND_STRING("Reduces the foe's accuracy\n" "by hurling sand in its face."), .effect = EFFECT_ACCURACY_DOWN, @@ -652,7 +655,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADBUTT] = { - .name = { .moveName = _("Headbutt") }, + .name = MOVE_NAME("Headbutt"), .description = COMPOUND_STRING("A ramming attack that may\n" "cause flinching."), .effect = EFFECT_HIT, @@ -673,7 +676,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_ATTACK] = { - .name = { .moveName = _("Horn Attack") }, + .name = MOVE_NAME("Horn Attack"), .description = COMPOUND_STRING("Jabs the foe with sharp\n" "horns."), .effect = EFFECT_HIT, @@ -689,7 +692,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_ATTACK] = { - .name = { .moveName = _("Fury Attack") }, + .name = MOVE_NAME("Fury Attack"), .description = COMPOUND_STRING("Jabs the foe 2 to 5 times\n" "with sharp horns, etc."), .effect = EFFECT_MULTI_HIT, @@ -705,7 +708,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_DRILL] = { - .name = { .moveName = _("Horn Drill") }, + .name = MOVE_NAME("Horn Drill"), .description = COMPOUND_STRING("A one-hit KO attack that\n" "uses a horn like a drill."), .effect = EFFECT_OHKO, @@ -721,7 +724,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACKLE] = { - .name = { .moveName = _("Tackle") }, + .name = MOVE_NAME("Tackle"), .description = COMPOUND_STRING("Charges the foe with a full-\n" "body tackle."), #if B_UPDATED_MOVE_DATA >= GEN_7 @@ -743,7 +746,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_SLAM] = { - .name = { .moveName = _("Body Slam") }, + .name = MOVE_NAME("Body Slam"), .description = COMPOUND_STRING("A full-body slam that may\n" "cause paralysis."), .effect = EFFECT_HIT, @@ -766,7 +769,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRAP] = { - .name = { .moveName = _("Wrap") }, + .name = MOVE_NAME("Wrap"), .description = COMPOUND_STRING("Wraps and squeezes the foe\n" BINDING_TURNS" times with vines, etc."), .effect = EFFECT_HIT, @@ -785,7 +788,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_DOWN] = { - .name = { .moveName = _("Take Down") }, + .name = MOVE_NAME("Take Down"), .description = COMPOUND_STRING("A reckless charge attack\n" "that also hurts the user."), .effect = EFFECT_HIT, @@ -802,7 +805,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THRASH] = { - .name = { .moveName = _("Thrash") }, + .name = MOVE_NAME("Thrash"), .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" "that confuses the user."), .effect = EFFECT_HIT, @@ -823,7 +826,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_EDGE] = { - .name = { .moveName = _("Double-Edge") }, + .name = MOVE_NAME("Double-Edge"), .description = COMPOUND_STRING("A life-risking tackle that\n" "also hurts the user."), .effect = EFFECT_HIT, @@ -840,7 +843,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_WHIP] = { - .name = { .moveName = _("Tail Whip") }, + .name = MOVE_NAME("Tail Whip"), .description = COMPOUND_STRING("Wags the tail to lower the\n" "foe's Defense."), .effect = EFFECT_DEFENSE_DOWN, @@ -857,7 +860,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_STING] = { - .name = { .moveName = _("Poison Sting") }, + .name = MOVE_NAME("Poison Sting"), .description = COMPOUND_STRING("A toxic attack with barbs,\n" "etc., that may poison."), .effect = EFFECT_HIT, @@ -877,7 +880,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWINEEDLE] = { - .name = { .moveName = _("Twineedle") }, + .name = MOVE_NAME("Twineedle"), .description = COMPOUND_STRING("Stingers on the forelegs\n" "jab the foe twice."), .effect = EFFECT_HIT, @@ -899,7 +902,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIN_MISSILE] = { - .name = { .moveName = _("Pin Missile") }, + .name = MOVE_NAME("Pin Missile"), .description = COMPOUND_STRING("Sharp pins are fired to\n" "strike 2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -914,7 +917,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEER] = { - .name = { .moveName = _("Leer") }, + .name = MOVE_NAME("Leer"), .description = COMPOUND_STRING("Frightens the foe with a\n" "leer to lower Defense."), .effect = EFFECT_DEFENSE_DOWN, @@ -931,7 +934,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITE] = { - .name = { .moveName = _("Bite") }, + .name = MOVE_NAME("Bite"), .description = COMPOUND_STRING("Bites with vicious fangs.\n" "May cause flinching."), .effect = EFFECT_HIT, @@ -953,7 +956,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWL] = { - .name = { .moveName = _("Growl") }, + .name = MOVE_NAME("Growl"), .description = COMPOUND_STRING("Growls cutely to reduce the\n" "foe's Attack."), .effect = EFFECT_ATTACK_DOWN, @@ -972,7 +975,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR] = { - .name = { .moveName = _("Roar") }, + .name = MOVE_NAME("Roar"), .description = COMPOUND_STRING("Makes the foe flee to end\n" "the battle."), .effect = EFFECT_ROAR, @@ -994,7 +997,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SING] = { - .name = { .moveName = _("Sing") }, + .name = MOVE_NAME("Sing"), .description = COMPOUND_STRING("A soothing song lulls the\n" "foe into a deep slumber."), .effect = EFFECT_SLEEP, @@ -1013,7 +1016,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERSONIC] = { - .name = { .moveName = _("Supersonic") }, + .name = MOVE_NAME("Supersonic"), .description = COMPOUND_STRING("Emits bizarre sound waves\n" "that may confuse the foe."), .effect = EFFECT_CONFUSE, @@ -1032,7 +1035,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SONIC_BOOM] = { - .name = { .moveName = _("Sonic Boom") }, + .name = MOVE_NAME("Sonic Boom"), .description = COMPOUND_STRING("Launches shock waves that\n" "always inflict 20 HP damage."), .effect = EFFECT_FIXED_DAMAGE_ARG, @@ -1048,7 +1051,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISABLE] = { - .name = { .moveName = _("Disable") }, + .name = MOVE_NAME("Disable"), .description = COMPOUND_STRING("Psychically disables one of\n" "the foe's moves."), #if B_UPDATED_MOVE_DATA >= GEN_5 @@ -1072,7 +1075,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID] = { - .name = { .moveName = _("Acid") }, + .name = MOVE_NAME("Acid"), .description = COMPOUND_STRING("Sprays a hide-melting acid.\n" #if B_UPDATED_MOVE_DATA >= GEN_4 "May lower Sp. Def."), @@ -1096,7 +1099,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBER] = { - .name = { .moveName = _("Ember") }, + .name = MOVE_NAME("Ember"), .description = COMPOUND_STRING("A weak fire attack that may\n" "inflict a burn."), .effect = EFFECT_HIT, @@ -1116,7 +1119,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAMETHROWER] = { - .name = { .moveName = _("Flamethrower") }, + .name = MOVE_NAME("Flamethrower"), .description = COMPOUND_STRING("A powerful fire attack that\n" "may inflict a burn."), .effect = EFFECT_HIT, @@ -1136,7 +1139,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST] = { - .name = { .moveName = _("Mist") }, + .name = MOVE_NAME("Mist"), .description = COMPOUND_STRING("Creates a mist that stops\n" "reduction of abilities."), .effect = EFFECT_MIST, @@ -1155,7 +1158,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_GUN] = { - .name = { .moveName = _("Water Gun") }, + .name = MOVE_NAME("Water Gun"), .description = COMPOUND_STRING("Squirts water to attack\n" "the foe."), .effect = EFFECT_HIT, @@ -1170,7 +1173,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_PUMP] = { - .name = { .moveName = _("Hydro Pump") }, + .name = MOVE_NAME("Hydro Pump"), .description = COMPOUND_STRING("Blasts water at high power\n" "to strike the foe."), .effect = EFFECT_HIT, @@ -1185,7 +1188,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURF] = { - .name = { .moveName = _("Surf") }, + .name = MOVE_NAME("Surf"), .description = COMPOUND_STRING("Creates a huge wave, then\n" "crashes it down on the foe."), .effect = EFFECT_HIT, @@ -1202,7 +1205,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BEAM] = { - .name = { .moveName = _("Ice Beam") }, + .name = MOVE_NAME("Ice Beam"), .description = COMPOUND_STRING("Blasts the foe with an icy\n" #if B_USE_FROSTBITE == TRUE "beam. May cause frostbite."), @@ -1228,7 +1231,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLIZZARD] = { - .name = { .moveName = _("Blizzard") }, + .name = MOVE_NAME("Blizzard"), .description = COMPOUND_STRING("Hits the foe with an icy\n" #if B_USE_FROSTBITE == TRUE "storm. May cause frostbite."), @@ -1253,7 +1256,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBEAM] = { - .name = { .moveName = _("Psybeam") }, + .name = MOVE_NAME("Psybeam"), .description = COMPOUND_STRING("Fires a peculiar ray that\n" "may confuse the foe."), .effect = EFFECT_HIT, @@ -1273,7 +1276,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE_BEAM] = { - .name = { .moveName = _("Bubble Beam") }, + .name = MOVE_NAME("Bubble Beam"), .description = COMPOUND_STRING("Forcefully sprays bubbles\n" "that may lower Speed."), .effect = EFFECT_HIT, @@ -1293,7 +1296,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_BEAM] = { - .name = { .moveName = _("Aurora Beam") }, + .name = MOVE_NAME("Aurora Beam"), .description = COMPOUND_STRING("Fires a rainbow-colored\n" "beam that may lower Attack."), .effect = EFFECT_HIT, @@ -1313,7 +1316,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_BEAM] = { - .name = { .moveName = _("Hyper Beam") }, + .name = MOVE_NAME("Hyper Beam"), .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, @@ -1332,7 +1335,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PECK] = { - .name = { .moveName = _("Peck") }, + .name = MOVE_NAME("Peck"), .description = COMPOUND_STRING("Attacks the foe with a\n" "jabbing beak, etc."), .effect = EFFECT_HIT, @@ -1348,7 +1351,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_PECK] = { - .name = { .moveName = _("Drill Peck") }, + .name = MOVE_NAME("Drill Peck"), .description = COMPOUND_STRING("A corkscrewing attack with\n" "the beak acting as a drill."), .effect = EFFECT_HIT, @@ -1364,7 +1367,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBMISSION] = { - .name = { .moveName = _("Submission") }, + .name = MOVE_NAME("Submission"), .description = COMPOUND_STRING("A reckless body slam that\n" "also hurts the user."), .effect = EFFECT_HIT, @@ -1381,7 +1384,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_KICK] = { - .name = { .moveName = _("Low Kick") }, + .name = MOVE_NAME("Low Kick"), .description = COMPOUND_STRING("A kick that inflicts more\n" "damage on heavier foes."), .effect = EFFECT_LOW_KICK, @@ -1397,7 +1400,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COUNTER] = { - .name = { .moveName = _("Counter") }, + .name = MOVE_NAME("Counter"), .description = COMPOUND_STRING("Retaliates any physical hit\n" "with double the power."), .effect = EFFECT_COUNTER, @@ -1418,7 +1421,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEISMIC_TOSS] = { - .name = { .moveName = _("Seismic Toss") }, + .name = MOVE_NAME("Seismic Toss"), .description = COMPOUND_STRING("Inflicts damage identical\n" "to the user's level."), .effect = EFFECT_LEVEL_DAMAGE, @@ -1435,7 +1438,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH] = { - .name = { .moveName = _("Strength") }, + .name = MOVE_NAME("Strength"), .description = COMPOUND_STRING("Builds enormous power,\n" "then slams the foe."), .effect = EFFECT_HIT, @@ -1451,7 +1454,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ABSORB] = { - .name = { .moveName = _("Absorb") }, + .name = MOVE_NAME("Absorb"), .description = COMPOUND_STRING("An attack that absorbs\n" "half the damage inflicted."), .effect = EFFECT_ABSORB, @@ -1468,7 +1471,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_DRAIN] = { - .name = { .moveName = _("Mega Drain") }, + .name = MOVE_NAME("Mega Drain"), .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = 40, @@ -1484,7 +1487,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_SEED] = { - .name = { .moveName = _("Leech Seed") }, + .name = MOVE_NAME("Leech Seed"), .description = COMPOUND_STRING("Plants a seed on the foe to\n" "steal HP on every turn."), .effect = EFFECT_LEECH_SEED, @@ -1501,7 +1504,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWTH] = { - .name = { .moveName = _("Growth") }, + .name = MOVE_NAME("Growth"), .description = COMPOUND_STRING("Forces the body to grow\n" "and heightens Sp. Atk."), .effect = B_GROWTH_STAT_RAISE >= GEN_5 ? EFFECT_GROWTH : EFFECT_SPECIAL_ATTACK_UP, @@ -1520,7 +1523,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_LEAF] = { - .name = { .moveName = _("Razor Leaf") }, + .name = MOVE_NAME("Razor Leaf"), .description = COMPOUND_STRING("Cuts the enemy with leaves.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -1537,7 +1540,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BEAM] = { - .name = { .moveName = _("Solar Beam") }, + .name = MOVE_NAME("Solar Beam"), .description = COMPOUND_STRING("Absorbs light in one turn,\n" "then attacks next turn."), .effect = EFFECT_SOLAR_BEAM, @@ -1556,9 +1559,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_POWDER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Poison Powder") }, + .name = MOVE_NAME("Poison Powder"), #else - .name = { .moveName = _("PoisonPowder") }, + .name = MOVE_NAME("PoisonPowder"), #endif .description = COMPOUND_STRING("Scatters a toxic powder\n" "that may poison the foe."), @@ -1577,7 +1580,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUN_SPORE] = { - .name = { .moveName = _("Stun Spore") }, + .name = MOVE_NAME("Stun Spore"), .description = COMPOUND_STRING("Scatters a powder that may\n" "paralyze the foe."), .effect = EFFECT_PARALYZE, @@ -1595,7 +1598,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_POWDER] = { - .name = { .moveName = _("Sleep Powder") }, + .name = MOVE_NAME("Sleep Powder"), .description = COMPOUND_STRING("Scatters a powder that may\n" "cause the foe to sleep."), .effect = EFFECT_SLEEP, @@ -1613,7 +1616,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_DANCE] = { - .name = { .moveName = _("Petal Dance") }, + .name = MOVE_NAME("Petal Dance"), .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" "that confuses the user."), #if B_UPDATED_MOVE_DATA >= GEN_5 @@ -1641,7 +1644,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRING_SHOT] = { - .name = { .moveName = _("String Shot") }, + .name = MOVE_NAME("String Shot"), .description = COMPOUND_STRING("Binds the foe with string\n" "to reduce its Speed."), .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_SPEED_DOWN_2 : EFFECT_SPEED_DOWN, @@ -1658,7 +1661,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RAGE] = { - .name = { .moveName = _("Dragon Rage") }, + .name = MOVE_NAME("Dragon Rage"), .description = COMPOUND_STRING("Launches shock waves that\n" "always inflict 40 HP damage."), .effect = EFFECT_FIXED_DAMAGE_ARG, @@ -1675,7 +1678,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_SPIN] = { - .name = { .moveName = _("Fire Spin") }, + .name = MOVE_NAME("Fire Spin"), .description = COMPOUND_STRING("Traps the foe in a ring of\n" "fire for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, @@ -1695,9 +1698,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_SHOCK] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Thunder Shock") }, + .name = MOVE_NAME("Thunder Shock"), #else - .name = { .moveName = _("ThunderShock") }, + .name = MOVE_NAME("ThunderShock"), #endif .description = COMPOUND_STRING("An electrical attack that\n" "may paralyze the foe."), @@ -1718,7 +1721,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERBOLT] = { - .name = { .moveName = _("Thunderbolt") }, + .name = MOVE_NAME("Thunderbolt"), .description = COMPOUND_STRING("A strong electrical attack\n" "that may paralyze the foe."), .effect = EFFECT_HIT, @@ -1738,7 +1741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_WAVE] = { - .name = { .moveName = _("Thunder Wave") }, + .name = MOVE_NAME("Thunder Wave"), .description = COMPOUND_STRING("A weak jolt of electricity\n" "that paralyzes the foe."), .effect = EFFECT_PARALYZE, @@ -1755,7 +1758,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER] = { - .name = { .moveName = _("Thunder") }, + .name = MOVE_NAME("Thunder"), .description = COMPOUND_STRING("A lightning attack that may\n" "cause paralysis."), .effect = EFFECT_THUNDER, @@ -1776,7 +1779,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_THROW] = { - .name = { .moveName = _("Rock Throw") }, + .name = MOVE_NAME("Rock Throw"), .description = COMPOUND_STRING("Throws small rocks to\n" "strike the foe."), .effect = EFFECT_HIT, @@ -1791,7 +1794,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTHQUAKE] = { - .name = { .moveName = _("Earthquake") }, + .name = MOVE_NAME("Earthquake"), .description = COMPOUND_STRING("A powerful quake, but has\n" "no effect on flying foes."), .effect = EFFECT_EARTHQUAKE, @@ -1809,7 +1812,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISSURE] = { - .name = { .moveName = _("Fissure") }, + .name = MOVE_NAME("Fissure"), .description = COMPOUND_STRING("A one-hit KO move that\n" "drops the foe in a fissure."), .effect = EFFECT_OHKO, @@ -1826,7 +1829,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIG] = { - .name = { .moveName = _("Dig") }, + .name = MOVE_NAME("Dig"), .description = COMPOUND_STRING("Digs underground the first\n" "turn and strikes next turn."), .effect = EFFECT_SEMI_INVULNERABLE, @@ -1847,7 +1850,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC] = { - .name = { .moveName = _("Toxic") }, + .name = MOVE_NAME("Toxic"), .description = COMPOUND_STRING("Poisons the foe with an\n" "intensifying toxin."), .effect = EFFECT_TOXIC, @@ -1864,7 +1867,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSION] = { - .name = { .moveName = _("Confusion") }, + .name = MOVE_NAME("Confusion"), .description = COMPOUND_STRING("A psychic attack that may\n" "cause confusion."), .effect = EFFECT_HIT, @@ -1884,7 +1887,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC] = { - .name = { .moveName = _("Psychic") }, + .name = MOVE_NAME("Psychic"), .description = COMPOUND_STRING("A powerful psychic attack\n" "that may lower Sp. Def."), .effect = EFFECT_HIT, @@ -1904,7 +1907,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPNOSIS] = { - .name = { .moveName = _("Hypnosis") }, + .name = MOVE_NAME("Hypnosis"), .description = COMPOUND_STRING("A hypnotizing move that\n" "may induce sleep."), .effect = EFFECT_SLEEP, @@ -1921,7 +1924,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEDITATE] = { - .name = { .moveName = _("Meditate") }, + .name = MOVE_NAME("Meditate"), .description = COMPOUND_STRING("Meditates in a peaceful\n" "fashion to raise Attack."), .effect = EFFECT_ATTACK_UP, @@ -1940,7 +1943,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AGILITY] = { - .name = { .moveName = _("Agility") }, + .name = MOVE_NAME("Agility"), .description = COMPOUND_STRING("Relaxes the body to sharply\n" "boost Speed."), .effect = EFFECT_SPEED_UP_2, @@ -1959,7 +1962,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_ATTACK] = { - .name = { .moveName = _("Quick Attack") }, + .name = MOVE_NAME("Quick Attack"), .description = COMPOUND_STRING("An extremely fast attack\n" "that always strikes first."), .effect = EFFECT_HIT, @@ -1975,7 +1978,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE] = { - .name = { .moveName = _("Rage") }, + .name = MOVE_NAME("Rage"), .description = COMPOUND_STRING("Raises the user's Attack\n" "every time it is hit."), .effect = EFFECT_RAGE, @@ -1991,7 +1994,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEPORT] = { - .name = { .moveName = _("Teleport") }, + .name = MOVE_NAME("Teleport"), .description = COMPOUND_STRING("A psychic move for fleeing\n" "from battle instantly."), .effect = EFFECT_TELEPORT, @@ -2009,7 +2012,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SHADE] = { - .name = { .moveName = _("Night Shade") }, + .name = MOVE_NAME("Night Shade"), .description = COMPOUND_STRING("Inflicts damage identical\n" "to the user's level."), .effect = EFFECT_LEVEL_DAMAGE, @@ -2024,7 +2027,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIMIC] = { - .name = { .moveName = _("Mimic") }, + .name = MOVE_NAME("Mimic"), .description = COMPOUND_STRING("Copies a move used by the\n" "foe during one battle."), .effect = EFFECT_MIMIC, @@ -2048,7 +2051,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCREECH] = { - .name = { .moveName = _("Screech") }, + .name = MOVE_NAME("Screech"), .description = COMPOUND_STRING("Emits a screech to sharply\n" "reduce the foe's Defense."), .effect = EFFECT_DEFENSE_DOWN_2, @@ -2067,7 +2070,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_TEAM] = { - .name = { .moveName = _("Double Team") }, + .name = MOVE_NAME("Double Team"), .description = COMPOUND_STRING("Creates illusory copies to\n" "raise evasiveness."), .effect = EFFECT_EVASION_UP, @@ -2086,7 +2089,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECOVER] = { - .name = { .moveName = _("Recover") }, + .name = MOVE_NAME("Recover"), .description = COMPOUND_STRING("Recovers up to half the\n" "user's maximum HP."), #if B_UPDATED_MOVE_DATA >= GEN_9 @@ -2112,7 +2115,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARDEN] = { - .name = { .moveName = _("Harden") }, + .name = MOVE_NAME("Harden"), .description = COMPOUND_STRING("Stiffens the body's \n" "muscles to raise Defense."), .effect = EFFECT_DEFENSE_UP, @@ -2131,7 +2134,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MINIMIZE] = { - .name = { .moveName = _("Minimize") }, + .name = MOVE_NAME("Minimize"), .description = COMPOUND_STRING("Minimizes the user's size\n" "to raise evasiveness."), .effect = EFFECT_MINIMIZE, @@ -2150,7 +2153,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOKESCREEN] = { - .name = { .moveName = _("Smokescreen") }, + .name = MOVE_NAME("Smokescreen"), .description = COMPOUND_STRING("Lowers the foe's accuracy\n" "using smoke, ink, etc."), .effect = EFFECT_ACCURACY_DOWN, @@ -2167,7 +2170,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSE_RAY] = { - .name = { .moveName = _("Confuse Ray") }, + .name = MOVE_NAME("Confuse Ray"), .description = COMPOUND_STRING("A sinister ray that\n" "confuses the foe."), .effect = EFFECT_CONFUSE, @@ -2184,7 +2187,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WITHDRAW] = { - .name = { .moveName = _("Withdraw") }, + .name = MOVE_NAME("Withdraw"), .description = COMPOUND_STRING("Withdraws the body into its\n" "hard shell to raise Defense."), .effect = EFFECT_DEFENSE_UP, @@ -2203,7 +2206,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFENSE_CURL] = { - .name = { .moveName = _("Defense Curl") }, + .name = MOVE_NAME("Defense Curl"), .description = COMPOUND_STRING("Curls up to conceal weak\n" "spots and raise Defense."), .effect = EFFECT_DEFENSE_CURL, @@ -2222,7 +2225,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRIER] = { - .name = { .moveName = _("Barrier") }, + .name = MOVE_NAME("Barrier"), .description = COMPOUND_STRING("Creates a barrier that\n" "sharply raises Defense."), .effect = EFFECT_DEFENSE_UP_2, @@ -2241,7 +2244,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_SCREEN] = { - .name = { .moveName = _("Light Screen") }, + .name = MOVE_NAME("Light Screen"), .description = COMPOUND_STRING("Creates a wall of light that\n" "lowers Sp. Atk damage."), .effect = EFFECT_LIGHT_SCREEN, @@ -2260,7 +2263,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAZE] = { - .name = { .moveName = _("Haze") }, + .name = MOVE_NAME("Haze"), .description = COMPOUND_STRING("Creates a black haze that\n" "eliminates all stat changes."), .effect = EFFECT_HAZE, @@ -2279,7 +2282,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT] = { - .name = { .moveName = _("Reflect") }, + .name = MOVE_NAME("Reflect"), .description = COMPOUND_STRING("Creates a wall of light that\n" "weakens physical attacks."), .effect = EFFECT_REFLECT, @@ -2298,7 +2301,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_ENERGY] = { - .name = { .moveName = _("Focus Energy") }, + .name = MOVE_NAME("Focus Energy"), .description = COMPOUND_STRING("Focuses power to raise the\n" "critical-hit ratio."), .effect = EFFECT_FOCUS_ENERGY, @@ -2317,7 +2320,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIDE] = { - .name = { .moveName = _("Bide") }, + .name = MOVE_NAME("Bide"), .description = COMPOUND_STRING("Endures attack for 2\n" "turns to retaliate double."), .effect = EFFECT_BIDE, @@ -2336,7 +2339,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METRONOME] = { - .name = { .moveName = _("Metronome") }, + .name = MOVE_NAME("Metronome"), .description = COMPOUND_STRING("Waggles a finger to use any\n" "Pokémon move at random."), .effect = EFFECT_METRONOME, @@ -2360,7 +2363,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_MOVE] = { - .name = { .moveName = _("Mirror Move") }, + .name = MOVE_NAME("Mirror Move"), .description = COMPOUND_STRING("Counters the foe's attack\n" "with the same move."), .effect = EFFECT_MIRROR_MOVE, @@ -2384,9 +2387,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SELF_DESTRUCT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Self-Destruct") }, + .name = MOVE_NAME("Self-Destruct"), #else - .name = { .moveName = _("SelfDestruct") }, + .name = MOVE_NAME("SelfDestruct"), #endif .description = COMPOUND_STRING("Inflicts severe damage but\n" "makes the user faint."), @@ -2403,7 +2406,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EGG_BOMB] = { - .name = { .moveName = _("Egg Bomb") }, + .name = MOVE_NAME("Egg Bomb"), .description = COMPOUND_STRING("An egg is forcibly hurled at\n" "the foe."), .effect = EFFECT_HIT, @@ -2419,7 +2422,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LICK] = { - .name = { .moveName = _("Lick") }, + .name = MOVE_NAME("Lick"), .description = COMPOUND_STRING("Licks with a long tongue to\n" "injure. May also paralyze."), .effect = EFFECT_HIT, @@ -2440,7 +2443,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOG] = { - .name = { .moveName = _("Smog") }, + .name = MOVE_NAME("Smog"), .description = COMPOUND_STRING("An exhaust-gas attack\n" "that may also poison."), .effect = EFFECT_HIT, @@ -2460,7 +2463,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE] = { - .name = { .moveName = _("Sludge") }, + .name = MOVE_NAME("Sludge"), .description = COMPOUND_STRING("Sludge is hurled to inflict\n" "damage. May also poison."), .effect = EFFECT_HIT, @@ -2480,7 +2483,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_CLUB] = { - .name = { .moveName = _("Bone Club") }, + .name = MOVE_NAME("Bone Club"), .description = COMPOUND_STRING("Clubs the foe with a bone.\n" "May cause flinching."), .effect = EFFECT_HIT, @@ -2500,7 +2503,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_BLAST] = { - .name = { .moveName = _("Fire Blast") }, + .name = MOVE_NAME("Fire Blast"), .description = COMPOUND_STRING("Incinerates everything it\n" "strikes. May cause a burn."), .effect = EFFECT_HIT, @@ -2520,7 +2523,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATERFALL] = { - .name = { .moveName = _("Waterfall") }, + .name = MOVE_NAME("Waterfall"), .description = COMPOUND_STRING("Charges the foe with speed\n" "to climb waterfalls."), .effect = EFFECT_HIT, @@ -2543,7 +2546,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLAMP] = { - .name = { .moveName = _("Clamp") }, + .name = MOVE_NAME("Clamp"), .description = COMPOUND_STRING("Traps and squeezes the\n" "foe for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, @@ -2563,7 +2566,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWIFT] = { - .name = { .moveName = _("Swift") }, + .name = MOVE_NAME("Swift"), .description = COMPOUND_STRING("Sprays star-shaped rays\n" "that never miss."), .effect = EFFECT_HIT, @@ -2578,7 +2581,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKULL_BASH] = { - .name = { .moveName = _("Skull Bash") }, + .name = MOVE_NAME("Skull Bash"), .description = COMPOUND_STRING("Tucks in the head, then\n" "attacks on the next turn."), .effect = EFFECT_SKULL_BASH, @@ -2597,7 +2600,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKE_CANNON] = { - .name = { .moveName = _("Spike Cannon") }, + .name = MOVE_NAME("Spike Cannon"), .description = COMPOUND_STRING("Launches sharp spikes that\n" "strike 2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -2612,7 +2615,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONSTRICT] = { - .name = { .moveName = _("Constrict") }, + .name = MOVE_NAME("Constrict"), .description = COMPOUND_STRING("Constricts to inflict pain.\n" "May lower Speed."), .effect = EFFECT_HIT, @@ -2633,7 +2636,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AMNESIA] = { - .name = { .moveName = _("Amnesia") }, + .name = MOVE_NAME("Amnesia"), .description = COMPOUND_STRING("Forgets about something\n" "and sharply raises Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_UP_2, @@ -2652,7 +2655,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINESIS] = { - .name = { .moveName = _("Kinesis") }, + .name = MOVE_NAME("Kinesis"), .description = COMPOUND_STRING("Distracts the foe.\n" "May lower accuracy."), .effect = EFFECT_ACCURACY_DOWN, @@ -2669,7 +2672,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOFT_BOILED] = { - .name = { .moveName = _("Soft-Boiled") }, + .name = MOVE_NAME("Soft-Boiled"), .description = COMPOUND_STRING("Recovers up to half the\n" "user's maximum HP."), .effect = EFFECT_SOFTBOILED, @@ -2690,9 +2693,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_JUMP_KICK] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("High Jump Kick") }, + .name = MOVE_NAME("High Jump Kick"), #else - .name = { .moveName = _("HighJumpKick") }, + .name = MOVE_NAME("HighJumpKick"), #endif .description = COMPOUND_STRING("A jumping knee kick. If it\n" "misses, the user is hurt."), @@ -2716,7 +2719,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLARE] = { - .name = { .moveName = _("Glare") }, + .name = MOVE_NAME("Glare"), .description = COMPOUND_STRING("Intimidates and frightens\n" "the foe into paralysis."), #if B_UPDATED_MOVE_DATA >= GEN_6 @@ -2739,7 +2742,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DREAM_EATER] = { - .name = { .moveName = _("Dream Eater") }, + .name = MOVE_NAME("Dream Eater"), .description = COMPOUND_STRING("Takes one half the damage\n" "inflicted on a sleeping foe."), .effect = EFFECT_DREAM_EATER, @@ -2755,7 +2758,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_GAS] = { - .name = { .moveName = _("Poison Gas") }, + .name = MOVE_NAME("Poison Gas"), .description = COMPOUND_STRING("Envelops the foe in a toxic\n" "gas that may poison."), #if B_UPDATED_MOVE_DATA >= GEN_6 @@ -2778,7 +2781,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRAGE] = { - .name = { .moveName = _("Barrage") }, + .name = MOVE_NAME("Barrage"), .description = COMPOUND_STRING("Hurls round objects at the\n" "foe 2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -2794,7 +2797,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_LIFE] = { - .name = { .moveName = _("Leech Life") }, + .name = MOVE_NAME("Leech Life"), .description = COMPOUND_STRING("An attack that steals half\n" "the damage inflicted."), .effect = EFFECT_ABSORB, @@ -2812,7 +2815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOVELY_KISS] = { - .name = { .moveName = _("Lovely Kiss") }, + .name = MOVE_NAME("Lovely Kiss"), .description = COMPOUND_STRING("Demands a kiss with a scary\n" "face that induces sleep."), .effect = EFFECT_SLEEP, @@ -2829,7 +2832,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_ATTACK] = { - .name = { .moveName = _("Sky Attack") }, + .name = MOVE_NAME("Sky Attack"), .description = COMPOUND_STRING("Searches out weak spots,\n" "then strikes the next turn."), .effect = EFFECT_TWO_TURNS_ATTACK, @@ -2855,7 +2858,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRANSFORM] = { - .name = { .moveName = _("Transform") }, + .name = MOVE_NAME("Transform"), .description = COMPOUND_STRING("Alters the user's cells to\n" "become a copy of the foe."), .effect = EFFECT_TRANSFORM, @@ -2879,7 +2882,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE] = { - .name = { .moveName = _("Bubble") }, + .name = MOVE_NAME("Bubble"), .description = COMPOUND_STRING("An attack using bubbles.\n" "May lower the foe's Speed."), .effect = EFFECT_HIT, @@ -2899,7 +2902,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIZZY_PUNCH] = { - .name = { .moveName = _("Dizzy Punch") }, + .name = MOVE_NAME("Dizzy Punch"), .description = COMPOUND_STRING("A rhythmic punch that may\n" "confuse the foe."), .effect = EFFECT_HIT, @@ -2921,7 +2924,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPORE] = { - .name = { .moveName = _("Spore") }, + .name = MOVE_NAME("Spore"), .description = COMPOUND_STRING("Scatters a cloud of spores\n" "that always induce sleep."), .effect = EFFECT_SLEEP, @@ -2939,7 +2942,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH] = { - .name = { .moveName = _("Flash") }, + .name = MOVE_NAME("Flash"), .description = COMPOUND_STRING("Looses a powerful blast of\n" "light that cuts accuracy."), .effect = EFFECT_ACCURACY_DOWN, @@ -2956,7 +2959,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYWAVE] = { - .name = { .moveName = _("Psywave") }, + .name = MOVE_NAME("Psywave"), .description = COMPOUND_STRING("Attacks with a psychic\n" "wave of varying intensity."), .effect = EFFECT_PSYWAVE, @@ -2971,7 +2974,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLASH] = { - .name = { .moveName = _("Splash") }, + .name = MOVE_NAME("Splash"), .description = COMPOUND_STRING("It's just a splash...\n" "Has no effect whatsoever."), .effect = EFFECT_DO_NOTHING, @@ -2990,7 +2993,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_ARMOR] = { - .name = { .moveName = _("Acid Armor") }, + .name = MOVE_NAME("Acid Armor"), .description = COMPOUND_STRING("Liquifies the user's body\n" "to sharply raise Defense."), .effect = EFFECT_DEFENSE_UP_2, @@ -3009,7 +3012,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRABHAMMER] = { - .name = { .moveName = _("Crabhammer") }, + .name = MOVE_NAME("Crabhammer"), .description = COMPOUND_STRING("Hammers with a pincer. Has a\n" "high critical-hit ratio."), .effect = EFFECT_HIT, @@ -3026,7 +3029,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPLOSION] = { - .name = { .moveName = _("Explosion") }, + .name = MOVE_NAME("Explosion"), .description = COMPOUND_STRING("Inflicts severe damage but\n" "makes the user faint."), .effect = EFFECT_EXPLOSION, @@ -3042,7 +3045,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_SWIPES] = { - .name = { .moveName = _("Fury Swipes") }, + .name = MOVE_NAME("Fury Swipes"), .description = COMPOUND_STRING("Rakes the foe with sharp\n" "claws, etc., 2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -3058,7 +3061,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONEMERANG] = { - .name = { .moveName = _("Bonemerang") }, + .name = MOVE_NAME("Bonemerang"), .description = COMPOUND_STRING("Throws a bone boomerang\n" "that strikes twice."), .effect = EFFECT_HIT, @@ -3074,7 +3077,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REST] = { - .name = { .moveName = _("Rest") }, + .name = MOVE_NAME("Rest"), .description = COMPOUND_STRING("The user sleeps for 2 turns,\n" "restoring HP and status."), .effect = EFFECT_REST, @@ -3094,7 +3097,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SLIDE] = { - .name = { .moveName = _("Rock Slide") }, + .name = MOVE_NAME("Rock Slide"), .description = COMPOUND_STRING("Large boulders are hurled.\n" "May cause flinching."), .effect = EFFECT_HIT, @@ -3114,7 +3117,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_FANG] = { - .name = { .moveName = _("Hyper Fang") }, + .name = MOVE_NAME("Hyper Fang"), .description = COMPOUND_STRING("Attacks with sharp fangs.\n" "May cause flinching."), .effect = EFFECT_HIT, @@ -3136,7 +3139,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHARPEN] = { - .name = { .moveName = _("Sharpen") }, + .name = MOVE_NAME("Sharpen"), .description = COMPOUND_STRING("Reduces the polygon count\n" "and raises Attack."), .effect = EFFECT_ATTACK_UP, @@ -3155,7 +3158,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION] = { - .name = { .moveName = _("Conversion") }, + .name = MOVE_NAME("Conversion"), .description = COMPOUND_STRING("Changes the user's type\n" "into a known move's type."), .effect = EFFECT_CONVERSION, @@ -3174,7 +3177,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRI_ATTACK] = { - .name = { .moveName = _("Tri Attack") }, + .name = MOVE_NAME("Tri Attack"), .description = COMPOUND_STRING("Fires three types of beams\n" "at the same time."), .effect = EFFECT_HIT, @@ -3194,7 +3197,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPER_FANG] = { - .name = { .moveName = _("Super Fang") }, + .name = MOVE_NAME("Super Fang"), .description = COMPOUND_STRING("Attacks with sharp fangs\n" "and cuts half the foe's HP."), .effect = EFFECT_SUPER_FANG, @@ -3211,7 +3214,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLASH] = { - .name = { .moveName = _("Slash") }, + .name = MOVE_NAME("Slash"), .description = COMPOUND_STRING("Slashes with claws, etc. Has\n" "a high critical-hit ratio."), .effect = EFFECT_HIT, @@ -3229,7 +3232,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBSTITUTE] = { - .name = { .moveName = _("Substitute") }, + .name = MOVE_NAME("Substitute"), .description = COMPOUND_STRING("Creates a decoy using 1/4\n" "of the user's maximum HP."), .effect = EFFECT_SUBSTITUTE, @@ -3249,7 +3252,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE] = { - .name = { .moveName = _("Struggle") }, + .name = MOVE_NAME("Struggle"), .description = COMPOUND_STRING("Used only if all PP are gone.\n" "Also hurts the user a little."), #if B_UPDATED_MOVE_DATA >= GEN_4 @@ -3285,7 +3288,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKETCH] = { - .name = { .moveName = _("Sketch") }, + .name = MOVE_NAME("Sketch"), .description = COMPOUND_STRING("Copies the foe's last move\n" "permanently."), .effect = EFFECT_SKETCH, @@ -3312,7 +3315,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_KICK] = { - .name = { .moveName = _("Triple Kick") }, + .name = MOVE_NAME("Triple Kick"), .description = COMPOUND_STRING("Kicks the foe 3 times in a\n" "row with rising intensity."), .effect = EFFECT_TRIPLE_KICK, @@ -3329,7 +3332,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THIEF] = { - .name = { .moveName = _("Thief") }, + .name = MOVE_NAME("Thief"), .description = COMPOUND_STRING("While attacking, it may\n" "steal the foe's held item."), .effect = EFFECT_HIT, @@ -3353,7 +3356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIDER_WEB] = { - .name = { .moveName = _("Spider Web") }, + .name = MOVE_NAME("Spider Web"), .description = COMPOUND_STRING("Ensnares the foe to stop it\n" "from fleeing or switching."), .effect = EFFECT_MEAN_LOOK, @@ -3371,7 +3374,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_READER] = { - .name = { .moveName = _("Mind Reader") }, + .name = MOVE_NAME("Mind Reader"), .description = COMPOUND_STRING("Senses the foe's action to\n" "ensure the next move's hit."), .effect = EFFECT_LOCK_ON, @@ -3387,7 +3390,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHTMARE] = { - .name = { .moveName = _("Nightmare") }, + .name = MOVE_NAME("Nightmare"), .description = COMPOUND_STRING("Inflicts 1/4 damage on a\n" "sleeping foe every turn."), .effect = EFFECT_NIGHTMARE, @@ -3404,7 +3407,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_WHEEL] = { - .name = { .moveName = _("Flame Wheel") }, + .name = MOVE_NAME("Flame Wheel"), .description = COMPOUND_STRING("A fiery charge attack that\n" "may inflict a burn."), .effect = EFFECT_HIT, @@ -3426,7 +3429,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNORE] = { - .name = { .moveName = _("Snore") }, + .name = MOVE_NAME("Snore"), .description = COMPOUND_STRING("A loud attack that can be\n" "used only while asleep."), .effect = EFFECT_SNORE, @@ -3449,7 +3452,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CURSE] = { - .name = { .moveName = _("Curse") }, + .name = MOVE_NAME("Curse"), .description = COMPOUND_STRING("A move that functions\n" "differently for GHOSTS."), .effect = EFFECT_CURSE, @@ -3468,7 +3471,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAIL] = { - .name = { .moveName = _("Flail") }, + .name = MOVE_NAME("Flail"), .description = COMPOUND_STRING("Inflicts more damage when\n" "the user's HP is down."), .effect = EFFECT_FLAIL, @@ -3484,7 +3487,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION_2] = { - .name = { .moveName = _("Conversion 2") }, + .name = MOVE_NAME("Conversion 2"), .description = COMPOUND_STRING("Makes the user resistant\n" "to the last attack's type."), .effect = EFFECT_CONVERSION_2, @@ -3503,7 +3506,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AEROBLAST] = { - .name = { .moveName = _("Aeroblast") }, + .name = MOVE_NAME("Aeroblast"), .description = COMPOUND_STRING("Launches a vacuumed blast.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -3520,7 +3523,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_SPORE] = { - .name = { .moveName = _("Cotton Spore") }, + .name = MOVE_NAME("Cotton Spore"), .description = COMPOUND_STRING("Spores cling to the foe,\n" "sharply reducing Speed."), .effect = EFFECT_SPEED_DOWN_2, @@ -3538,7 +3541,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVERSAL] = { - .name = { .moveName = _("Reversal") }, + .name = MOVE_NAME("Reversal"), .description = COMPOUND_STRING("Inflicts more damage when\n" "the user's HP is down."), .effect = EFFECT_FLAIL, @@ -3554,7 +3557,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPITE] = { - .name = { .moveName = _("Spite") }, + .name = MOVE_NAME("Spite"), .description = COMPOUND_STRING("Spitefully cuts the PP\n" "of the foe's last move."), .effect = EFFECT_SPITE, @@ -3572,7 +3575,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER_SNOW] = { - .name = { .moveName = _("Powder Snow") }, + .name = MOVE_NAME("Powder Snow"), .description = COMPOUND_STRING("Blasts the foe with a snowy\n" "gust. May cause freezing."), .effect = EFFECT_HIT, @@ -3592,7 +3595,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PROTECT] = { - .name = { .moveName = _("Protect") }, + .name = MOVE_NAME("Protect"), .description = COMPOUND_STRING("Evades attack, but may fail\n" "if used in succession."), .effect = EFFECT_PROTECT, @@ -3612,7 +3615,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MACH_PUNCH] = { - .name = { .moveName = _("Mach Punch") }, + .name = MOVE_NAME("Mach Punch"), .description = COMPOUND_STRING("A punch is thrown at wicked\n" "speed to strike first."), .effect = EFFECT_HIT, @@ -3629,7 +3632,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCARY_FACE] = { - .name = { .moveName = _("Scary Face") }, + .name = MOVE_NAME("Scary Face"), .description = COMPOUND_STRING("Frightens with a scary face\n" "to sharply reduce Speed."), .effect = EFFECT_SPEED_DOWN_2, @@ -3646,7 +3649,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT_ATTACK] = { - .name = { .moveName = _("Feint Attack") }, + .name = MOVE_NAME("Feint Attack"), .description = sFeintDescription, .effect = EFFECT_HIT, .power = 60, @@ -3661,7 +3664,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_KISS] = { - .name = { .moveName = _("Sweet Kiss") }, + .name = MOVE_NAME("Sweet Kiss"), .description = COMPOUND_STRING("Demands a kiss with a cute\n" "look. May cause confusion."), .effect = EFFECT_CONFUSE, @@ -3678,7 +3681,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELLY_DRUM] = { - .name = { .moveName = _("Belly Drum") }, + .name = MOVE_NAME("Belly Drum"), .description = COMPOUND_STRING("Maximizes Attack while\n" "sacrificing HP."), .effect = EFFECT_BELLY_DRUM, @@ -3697,7 +3700,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_BOMB] = { - .name = { .moveName = _("Sludge Bomb") }, + .name = MOVE_NAME("Sludge Bomb"), .description = COMPOUND_STRING("Sludge is hurled to inflict\n" "damage. May also poison."), .effect = EFFECT_HIT, @@ -3718,7 +3721,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SLAP] = { - .name = { .moveName = _("Mud-Slap") }, + .name = MOVE_NAME("Mud-Slap"), .description = COMPOUND_STRING("Hurls mud in the foe's face\n" "to reduce its accuracy."), .effect = EFFECT_HIT, @@ -3738,7 +3741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTAZOOKA] = { - .name = { .moveName = _("Octazooka") }, + .name = MOVE_NAME("Octazooka"), .description = COMPOUND_STRING("Fires a lump of ink to\n" "damage and cut accuracy."), .effect = EFFECT_HIT, @@ -3759,7 +3762,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKES] = { - .name = { .moveName = _("Spikes") }, + .name = MOVE_NAME("Spikes"), .description = COMPOUND_STRING("Sets spikes that hurt a \n" "foe switching in."), .effect = EFFECT_SPIKES, @@ -3780,7 +3783,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZAP_CANNON] = { - .name = { .moveName = _("Zap Cannon") }, + .name = MOVE_NAME("Zap Cannon"), .description = COMPOUND_STRING("Powerful and sure to cause\n" "paralysis, but inaccurate."), .effect = EFFECT_HIT, @@ -3801,7 +3804,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESIGHT] = { - .name = { .moveName = _("Foresight") }, + .name = MOVE_NAME("Foresight"), .description = COMPOUND_STRING("Negates the foe's efforts\n" "to heighten evasiveness."), .effect = EFFECT_FORESIGHT, @@ -3819,7 +3822,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DESTINY_BOND] = { - .name = { .moveName = _("Destiny Bond") }, + .name = MOVE_NAME("Destiny Bond"), .description = COMPOUND_STRING("If the user faints, the foe\n" "is also made to faint."), .effect = EFFECT_DESTINY_BOND, @@ -3841,7 +3844,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PERISH_SONG] = { - .name = { .moveName = _("Perish Song") }, + .name = MOVE_NAME("Perish Song"), .description = COMPOUND_STRING("Any Pokémon hearing this\n" "song faints in 3 turns."), .effect = EFFECT_PERISH_SONG, @@ -3861,7 +3864,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICY_WIND] = { - .name = { .moveName = _("Icy Wind") }, + .name = MOVE_NAME("Icy Wind"), .description = COMPOUND_STRING("A chilling attack that\n" "lowers the foe's Speed."), .effect = EFFECT_HIT, @@ -3882,7 +3885,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DETECT] = { - .name = { .moveName = _("Detect") }, + .name = MOVE_NAME("Detect"), .description = COMPOUND_STRING("Evades attack, but may fail\n" "if used in succession."), .effect = EFFECT_PROTECT, @@ -3904,7 +3907,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_RUSH] = { - .name = { .moveName = _("Bone Rush") }, + .name = MOVE_NAME("Bone Rush"), .description = COMPOUND_STRING("Strikes the foe with a bone\n" "in hand 2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -3919,7 +3922,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOCK_ON] = { - .name = { .moveName = _("Lock-On") }, + .name = MOVE_NAME("Lock-On"), .description = COMPOUND_STRING("Locks on to the foe to\n" "ensure the next move hits."), .effect = EFFECT_LOCK_ON, @@ -3935,7 +3938,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OUTRAGE] = { - .name = { .moveName = _("Outrage") }, + .name = MOVE_NAME("Outrage"), .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" "that confuses the user."), .effect = EFFECT_HIT, @@ -3956,7 +3959,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSTORM] = { - .name = { .moveName = _("Sandstorm") }, + .name = MOVE_NAME("Sandstorm"), .description = COMPOUND_STRING("Causes a sandstorm that\n" "rages for several turns."), .effect = EFFECT_SANDSTORM, @@ -3975,7 +3978,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_DRAIN] = { - .name = { .moveName = _("Giga Drain") }, + .name = MOVE_NAME("Giga Drain"), .description = COMPOUND_STRING("An attack that steals half\n" "the damage inflicted."), .effect = EFFECT_ABSORB, @@ -3992,7 +3995,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDURE] = { - .name = { .moveName = _("Endure") }, + .name = MOVE_NAME("Endure"), .description = COMPOUND_STRING("Endures any attack for\n" "1 turn, leaving at least 1HP."), .effect = EFFECT_ENDURE, @@ -4014,7 +4017,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARM] = { - .name = { .moveName = _("Charm") }, + .name = MOVE_NAME("Charm"), .description = COMPOUND_STRING("Charms the foe and sharply\n" "reduces its Attack."), .effect = EFFECT_ATTACK_DOWN_2, @@ -4031,7 +4034,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLOUT] = { - .name = { .moveName = _("Rollout") }, + .name = MOVE_NAME("Rollout"), .description = COMPOUND_STRING("An attack lasting 5 turns\n" "with rising intensity."), .effect = EFFECT_ROLLOUT, @@ -4049,7 +4052,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SWIPE] = { - .name = { .moveName = _("False Swipe") }, + .name = MOVE_NAME("False Swipe"), .description = sFalseSwipeDescription, .effect = EFFECT_FALSE_SWIPE, .power = 40, @@ -4064,7 +4067,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWAGGER] = { - .name = { .moveName = _("Swagger") }, + .name = MOVE_NAME("Swagger"), .description = COMPOUND_STRING("Confuses the foe, but also\n" "sharply raises Attack."), .effect = EFFECT_SWAGGER, @@ -4081,7 +4084,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MILK_DRINK] = { - .name = { .moveName = _("Milk Drink") }, + .name = MOVE_NAME("Milk Drink"), .description = COMPOUND_STRING("Recovers up to half the\n" "user's maximum HP."), .effect = EFFECT_SOFTBOILED, @@ -4101,7 +4104,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARK] = { - .name = { .moveName = _("Spark") }, + .name = MOVE_NAME("Spark"), .description = COMPOUND_STRING("An electrified tackle that\n" "may paralyze the foe."), .effect = EFFECT_HIT, @@ -4122,7 +4125,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_CUTTER] = { - .name = { .moveName = _("Fury Cutter") }, + .name = MOVE_NAME("Fury Cutter"), .description = COMPOUND_STRING("An attack that intensifies\n" "on each successive hit."), #if B_UPDATED_MOVE_DATA >= GEN_6 @@ -4145,7 +4148,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_WING] = { - .name = { .moveName = _("Steel Wing") }, + .name = MOVE_NAME("Steel Wing"), .description = COMPOUND_STRING("Strikes the foe with hard\n" "wings spread wide."), .effect = EFFECT_HIT, @@ -4167,7 +4170,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEAN_LOOK] = { - .name = { .moveName = _("Mean Look") }, + .name = MOVE_NAME("Mean Look"), .description = COMPOUND_STRING("Fixes the foe with a mean\n" "look that prevents escape."), .effect = EFFECT_MEAN_LOOK, @@ -4185,7 +4188,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTRACT] = { - .name = { .moveName = _("Attract") }, + .name = MOVE_NAME("Attract"), .description = COMPOUND_STRING("Makes the opposite gender\n" "less likely to attack."), .effect = EFFECT_ATTRACT, @@ -4203,7 +4206,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_TALK] = { - .name = { .moveName = _("Sleep Talk") }, + .name = MOVE_NAME("Sleep Talk"), .description = COMPOUND_STRING("Uses an available move\n" "randomly while asleep."), .effect = EFFECT_SLEEP_TALK, @@ -4228,7 +4231,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BELL] = { - .name = { .moveName = _("Heal Bell") }, + .name = MOVE_NAME("Heal Bell"), .description = COMPOUND_STRING("Chimes soothingly to heal\n" "all status abnormalities."), .effect = EFFECT_HEAL_BELL, @@ -4249,7 +4252,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETURN] = { - .name = { .moveName = _("Return") }, + .name = MOVE_NAME("Return"), .description = COMPOUND_STRING("An attack that increases\n" "in power with friendship."), .effect = EFFECT_RETURN, @@ -4265,7 +4268,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRESENT] = { - .name = { .moveName = _("Present") }, + .name = MOVE_NAME("Present"), .description = COMPOUND_STRING("A gift in the form of a\n" "bomb. May restore HP."), .effect = EFFECT_PRESENT, @@ -4281,7 +4284,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRUSTRATION] = { - .name = { .moveName = _("Frustration") }, + .name = MOVE_NAME("Frustration"), .description = COMPOUND_STRING("An attack that is stronger\n" "if the Trainer is disliked."), .effect = EFFECT_FRUSTRATION, @@ -4297,7 +4300,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAFEGUARD] = { - .name = { .moveName = _("Safeguard") }, + .name = MOVE_NAME("Safeguard"), .description = COMPOUND_STRING("A mystical force prevents\n" "all status problems."), .effect = EFFECT_SAFEGUARD, @@ -4316,7 +4319,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAIN_SPLIT] = { - .name = { .moveName = _("Pain Split") }, + .name = MOVE_NAME("Pain Split"), .description = COMPOUND_STRING("Adds the user and foe's HP,\n" "then shares them equally."), .effect = EFFECT_PAIN_SPLIT, @@ -4332,7 +4335,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_FIRE] = { - .name = { .moveName = _("Sacred Fire") }, + .name = MOVE_NAME("Sacred Fire"), .description = COMPOUND_STRING("A mystical fire attack that\n" "may inflict a burn."), .effect = EFFECT_HIT, @@ -4353,7 +4356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNITUDE] = { - .name = { .moveName = _("Magnitude") }, + .name = MOVE_NAME("Magnitude"), .description = COMPOUND_STRING("A ground-shaking attack\n" "of random intensity."), .effect = EFFECT_MAGNITUDE, @@ -4371,9 +4374,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMIC_PUNCH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Dynamic Punch") }, + .name = MOVE_NAME("Dynamic Punch"), #else - .name = { .moveName = _("DynamicPunch") }, + .name = MOVE_NAME("DynamicPunch"), #endif .description = COMPOUND_STRING("Powerful and sure to cause\n" "confusion, but inaccurate."), @@ -4396,7 +4399,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEGAHORN] = { - .name = { .moveName = _("Megahorn") }, + .name = MOVE_NAME("Megahorn"), .description = COMPOUND_STRING("A brutal ramming attack\n" "using out-thrust horns."), .effect = EFFECT_HIT, @@ -4413,9 +4416,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_BREATH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Dragon Breath") }, + .name = MOVE_NAME("Dragon Breath"), #else - .name = { .moveName = _("DragonBreath") }, + .name = MOVE_NAME("DragonBreath"), #endif .description = COMPOUND_STRING("Strikes the foe with an\n" "incredible blast of breath."), @@ -4437,7 +4440,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BATON_PASS] = { - .name = { .moveName = _("Baton Pass") }, + .name = MOVE_NAME("Baton Pass"), .description = COMPOUND_STRING("Switches out the user while\n" "keeping effects in play."), .effect = EFFECT_BATON_PASS, @@ -4455,7 +4458,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENCORE] = { - .name = { .moveName = _("Encore") }, + .name = MOVE_NAME("Encore"), .description = COMPOUND_STRING("Makes the foe repeat its\n" "last move over 2 to 6 turns."), .effect = EFFECT_ENCORE, @@ -4474,7 +4477,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURSUIT] = { - .name = { .moveName = _("Pursuit") }, + .name = MOVE_NAME("Pursuit"), .description = COMPOUND_STRING("Inflicts bad damage if used\n" "on a foe switching out."), .effect = EFFECT_PURSUIT, @@ -4491,7 +4494,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAPID_SPIN] = { - .name = { .moveName = _("Rapid Spin") }, + .name = MOVE_NAME("Rapid Spin"), .description = COMPOUND_STRING("Spins the body at high\n" "speed to strike the foe."), .effect = EFFECT_HIT, @@ -4519,7 +4522,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_SCENT] = { - .name = { .moveName = _("Sweet Scent") }, + .name = MOVE_NAME("Sweet Scent"), .description = COMPOUND_STRING("Allures the foe to reduce\n" "evasiveness."), .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_EVASION_DOWN_2 : EFFECT_EVASION_DOWN, @@ -4536,7 +4539,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_TAIL] = { - .name = { .moveName = _("Iron Tail") }, + .name = MOVE_NAME("Iron Tail"), .description = COMPOUND_STRING("Attacks with a rock-hard\n" "tail. May lower Defense."), .effect = EFFECT_HIT, @@ -4557,7 +4560,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_CLAW] = { - .name = { .moveName = _("Metal Claw") }, + .name = MOVE_NAME("Metal Claw"), .description = COMPOUND_STRING("A claw attack that may\n" "raise the user's Attack."), .effect = EFFECT_HIT, @@ -4579,7 +4582,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VITAL_THROW] = { - .name = { .moveName = _("Vital Throw") }, + .name = MOVE_NAME("Vital Throw"), .description = COMPOUND_STRING("Makes the user's move last,\n" "but it never misses."), .effect = EFFECT_HIT, @@ -4595,7 +4598,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORNING_SUN] = { - .name = { .moveName = _("Morning Sun") }, + .name = MOVE_NAME("Morning Sun"), .description = COMPOUND_STRING("Restores HP. The amount\n" "varies with the weather."), .effect = EFFECT_MORNING_SUN, @@ -4615,7 +4618,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNTHESIS] = { - .name = { .moveName = _("Synthesis") }, + .name = MOVE_NAME("Synthesis"), .description = COMPOUND_STRING("Restores HP. The amount\n" "varies with the weather."), .effect = EFFECT_SYNTHESIS, @@ -4635,7 +4638,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONLIGHT] = { - .name = { .moveName = _("Moonlight") }, + .name = MOVE_NAME("Moonlight"), .description = COMPOUND_STRING("Restores HP. The amount\n" "varies with the weather."), .effect = EFFECT_MOONLIGHT, @@ -4655,7 +4658,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIDDEN_POWER] = { - .name = { .moveName = _("Hidden Power") }, + .name = MOVE_NAME("Hidden Power"), .description = COMPOUND_STRING("The effectiveness varies\n" "with the user."), .power = B_HIDDEN_POWER_DMG >= GEN_6 ? 60 : 1, @@ -4670,7 +4673,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_CHOP] = { - .name = { .moveName = _("Cross Chop") }, + .name = MOVE_NAME("Cross Chop"), .description = COMPOUND_STRING("A double-chopping attack.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -4687,7 +4690,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWISTER] = { - .name = { .moveName = _("Twister") }, + .name = MOVE_NAME("Twister"), .description = COMPOUND_STRING("Whips up a vicious twister\n" "to tear at the foe."), .effect = EFFECT_HIT, @@ -4709,7 +4712,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAIN_DANCE] = { - .name = { .moveName = _("Rain Dance") }, + .name = MOVE_NAME("Rain Dance"), .description = COMPOUND_STRING("Boosts the power of Water-\n" "type moves for 5 turns."), .effect = EFFECT_RAIN_DANCE, @@ -4727,7 +4730,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNNY_DAY] = { - .name = { .moveName = _("Sunny Day") }, + .name = MOVE_NAME("Sunny Day"), .description = COMPOUND_STRING("Boosts the power of Fire-\n" "type moves for 5 turns."), .effect = EFFECT_SUNNY_DAY, @@ -4745,7 +4748,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUNCH] = { - .name = { .moveName = _("Crunch") }, + .name = MOVE_NAME("Crunch"), .description = COMPOUND_STRING("Crunches with sharp fangs.\n" #if B_UPDATED_MOVE_DATA >= GEN_4 "May lower Defense."), @@ -4775,7 +4778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_COAT] = { - .name = { .moveName = _("Mirror Coat") }, + .name = MOVE_NAME("Mirror Coat"), .description = COMPOUND_STRING("Counters the foe's special\n" "attack at double the power."), .effect = EFFECT_MIRROR_COAT, @@ -4794,7 +4797,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCH_UP] = { - .name = { .moveName = _("Psych Up") }, + .name = MOVE_NAME("Psych Up"), .description = COMPOUND_STRING("Copies the foe's effect(s)\n" "and gives to the user."), .effect = EFFECT_PSYCH_UP, @@ -4815,9 +4818,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_SPEED] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Extreme Speed") }, + .name = MOVE_NAME("Extreme Speed"), #else - .name = { .moveName = _("ExtremeSpeed") }, + .name = MOVE_NAME("ExtremeSpeed"), #endif .description = COMPOUND_STRING("An extremely fast and\n" "powerful attack."), @@ -4835,9 +4838,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCIENT_POWER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Ancient Power") }, + .name = MOVE_NAME("Ancient Power"), #else - .name = { .moveName = _("AncientPower") }, + .name = MOVE_NAME("AncientPower"), #endif .description = COMPOUND_STRING("An attack that may raise\n" "all stats."), @@ -4860,7 +4863,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BALL] = { - .name = { .moveName = _("Shadow Ball") }, + .name = MOVE_NAME("Shadow Ball"), .description = COMPOUND_STRING("Hurls a black blob that may\n" "lower the foe's Sp. Def."), .effect = EFFECT_HIT, @@ -4881,7 +4884,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUTURE_SIGHT] = { - .name = { .moveName = _("Future Sight") }, + .name = MOVE_NAME("Future Sight"), .description = COMPOUND_STRING("Heightens inner power to\n" "strike 2 turns later."), #if B_UPDATED_MOVE_DATA >= GEN_6 @@ -4904,7 +4907,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SMASH] = { - .name = { .moveName = _("Rock Smash") }, + .name = MOVE_NAME("Rock Smash"), .description = COMPOUND_STRING("A rock-crushing attack\n" "that may lower Defense."), .effect = EFFECT_HIT, @@ -4925,7 +4928,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLPOOL] = { - .name = { .moveName = _("Whirlpool") }, + .name = MOVE_NAME("Whirlpool"), .description = COMPOUND_STRING("Traps and hurts the foe in\n" "a whirlpool for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, @@ -4944,7 +4947,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAT_UP] = { - .name = { .moveName = _("Beat Up") }, + .name = MOVE_NAME("Beat Up"), .description = COMPOUND_STRING("Summons party Pokémon to\n" "join in the attack."), .effect = EFFECT_BEAT_UP, @@ -4959,7 +4962,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_OUT] = { - .name = { .moveName = _("Fake Out") }, + .name = MOVE_NAME("Fake Out"), .description = COMPOUND_STRING("A 1st-turn, 1st-strike move\n" "that causes flinching."), .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 3 : 1, @@ -4980,7 +4983,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPROAR] = { - .name = { .moveName = _("Uproar") }, + .name = MOVE_NAME("Uproar"), .description = COMPOUND_STRING( #if B_UPROAR_TURNS >= GEN_5 "Causes an uproar for 2 to 5\n" @@ -5008,7 +5011,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOCKPILE] = { - .name = { .moveName = _("Stockpile") }, + .name = MOVE_NAME("Stockpile"), .description = COMPOUND_STRING("Charges up power for up to\n" "3 turns."), .effect = EFFECT_STOCKPILE, @@ -5027,7 +5030,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIT_UP] = { - .name = { .moveName = _("Spit Up") }, + .name = MOVE_NAME("Spit Up"), .description = COMPOUND_STRING("Releases stockpiled power\n" "(the more the better)."), .effect = EFFECT_SPIT_UP, @@ -5043,7 +5046,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWALLOW] = { - .name = { .moveName = _("Swallow") }, + .name = MOVE_NAME("Swallow"), .description = COMPOUND_STRING("Absorbs stockpiled power\n" "and restores HP."), .effect = EFFECT_SWALLOW, @@ -5063,7 +5066,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_WAVE] = { - .name = { .moveName = _("Heat Wave") }, + .name = MOVE_NAME("Heat Wave"), .description = COMPOUND_STRING("Exhales a hot breath on the\n" "foe. May inflict a burn."), .effect = EFFECT_HIT, @@ -5084,7 +5087,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAIL] = { - .name = { .moveName = _("Hail") }, + .name = MOVE_NAME("Hail"), .description = COMPOUND_STRING("Summons a hailstorm that\n" "strikes every turn."), .effect = EFFECT_HAIL, @@ -5102,7 +5105,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORMENT] = { - .name = { .moveName = _("Torment") }, + .name = MOVE_NAME("Torment"), .description = COMPOUND_STRING("Torments the foe and stops\n" "successive use of a move."), .effect = EFFECT_TORMENT, @@ -5119,7 +5122,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLATTER] = { - .name = { .moveName = _("Flatter") }, + .name = MOVE_NAME("Flatter"), .description = COMPOUND_STRING("Confuses the foe, but\n" "raises its Sp. Atk."), .effect = EFFECT_FLATTER, @@ -5136,7 +5139,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILL_O_WISP] = { - .name = { .moveName = _("Will-o-Wisp") }, + .name = MOVE_NAME("Will-o-Wisp"), .description = COMPOUND_STRING("Inflicts a burn on the foe\n" "with intense fire."), .effect = EFFECT_WILL_O_WISP, @@ -5153,7 +5156,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MEMENTO] = { - .name = { .moveName = _("Memento") }, + .name = MOVE_NAME("Memento"), .description = COMPOUND_STRING("The user faints and lowers\n" "the foe's abilities."), .effect = EFFECT_MEMENTO, @@ -5169,7 +5172,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FACADE] = { - .name = { .moveName = _("Facade") }, + .name = MOVE_NAME("Facade"), .description = COMPOUND_STRING("Boosts Attack when burned,\n" "paralyzed, or poisoned."), .effect = EFFECT_FACADE, @@ -5185,7 +5188,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_PUNCH] = { - .name = { .moveName = _("Focus Punch") }, + .name = MOVE_NAME("Focus Punch"), .description = COMPOUND_STRING("A powerful loyalty attack.\n" "The user flinches if hit."), .effect = EFFECT_FOCUS_PUNCH, @@ -5210,9 +5213,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMELLING_SALTS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Smelling Salts") }, + .name = MOVE_NAME("Smelling Salts"), #else - .name = { .moveName = _("SmellngSalts") }, + .name = MOVE_NAME("SmellngSalts"), #endif .description = COMPOUND_STRING("Powerful against paralyzed\n" "foes, but also heals them."), @@ -5233,7 +5236,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOLLOW_ME] = { - .name = { .moveName = _("Follow Me") }, + .name = MOVE_NAME("Follow Me"), .description = COMPOUND_STRING("Draws attention to make\n" "foes attack only the user."), .effect = EFFECT_FOLLOW_ME, @@ -5254,7 +5257,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURE_POWER] = { - .name = { .moveName = _("Nature Power") }, + .name = MOVE_NAME("Nature Power"), .description = COMPOUND_STRING("The type of attack varies\n" "depending on the location."), .effect = EFFECT_NATURE_POWER, @@ -5276,7 +5279,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE] = { - .name = { .moveName = _("Charge") }, + .name = MOVE_NAME("Charge"), .description = COMPOUND_STRING("Charges power to boost the\n" "electric move used next."), .effect = EFFECT_CHARGE, @@ -5295,7 +5298,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAUNT] = { - .name = { .moveName = _("Taunt") }, + .name = MOVE_NAME("Taunt"), .description = COMPOUND_STRING("Taunts the foe into only\n" "using attack moves."), .effect = EFFECT_TAUNT, @@ -5313,7 +5316,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HELPING_HAND] = { - .name = { .moveName = _("Helping Hand") }, + .name = MOVE_NAME("Helping Hand"), .description = COMPOUND_STRING("Boosts the power of the\n" "recipient's moves."), .effect = EFFECT_HELPING_HAND, @@ -5335,7 +5338,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK] = { - .name = { .moveName = _("Trick") }, + .name = MOVE_NAME("Trick"), .description = COMPOUND_STRING("Tricks the foe into trading\n" "held items."), .effect = EFFECT_TRICK, @@ -5354,7 +5357,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROLE_PLAY] = { - .name = { .moveName = _("Role Play") }, + .name = MOVE_NAME("Role Play"), .description = COMPOUND_STRING("Mimics the target and\n" "copies its special ability."), .effect = EFFECT_ROLE_PLAY, @@ -5373,7 +5376,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WISH] = { - .name = { .moveName = _("Wish") }, + .name = MOVE_NAME("Wish"), .description = COMPOUND_STRING("A wish that restores HP.\n" "It takes time to work."), .effect = EFFECT_WISH, @@ -5393,7 +5396,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSIST] = { - .name = { .moveName = _("Assist") }, + .name = MOVE_NAME("Assist"), .description = COMPOUND_STRING("Attacks randomly with one\n" "of the partner's moves."), .effect = EFFECT_ASSIST, @@ -5417,7 +5420,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INGRAIN] = { - .name = { .moveName = _("Ingrain") }, + .name = MOVE_NAME("Ingrain"), .description = COMPOUND_STRING("Lays roots that restore HP.\n" "The user can't switch out."), .effect = EFFECT_INGRAIN, @@ -5437,7 +5440,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERPOWER] = { - .name = { .moveName = _("Superpower") }, + .name = MOVE_NAME("Superpower"), .description = COMPOUND_STRING("Boosts strength sharply,\n" "but lowers abilities."), .effect = EFFECT_HIT, @@ -5457,7 +5460,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_COAT] = { - .name = { .moveName = _("Magic Coat") }, + .name = MOVE_NAME("Magic Coat"), .description = COMPOUND_STRING("Reflects special effects\n" "back to the attacker."), .effect = EFFECT_MAGIC_COAT, @@ -5475,7 +5478,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RECYCLE] = { - .name = { .moveName = _("Recycle") }, + .name = MOVE_NAME("Recycle"), .description = COMPOUND_STRING("Recycles a used item for\n" "one more use."), .effect = EFFECT_RECYCLE, @@ -5494,7 +5497,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVENGE] = { - .name = { .moveName = _("Revenge") }, + .name = MOVE_NAME("Revenge"), .description = sRevengeDescription, .effect = EFFECT_REVENGE, .power = 60, @@ -5509,7 +5512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRICK_BREAK] = { - .name = { .moveName = _("Brick Break") }, + .name = MOVE_NAME("Brick Break"), .description = COMPOUND_STRING("Destroys barriers such as\n" "REFLECT and causes damage."), .effect = EFFECT_BRICK_BREAK, @@ -5525,7 +5528,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_YAWN] = { - .name = { .moveName = _("Yawn") }, + .name = MOVE_NAME("Yawn"), .description = COMPOUND_STRING("Lulls the foe into yawning,\n" "then sleeping next turn."), .effect = EFFECT_YAWN, @@ -5542,7 +5545,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KNOCK_OFF] = { - .name = { .moveName = _("Knock Off") }, + .name = MOVE_NAME("Knock Off"), .description = COMPOUND_STRING("Knocks down the foe's held\n" "item to prevent its use."), .effect = EFFECT_KNOCK_OFF, @@ -5561,7 +5564,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENDEAVOR] = { - .name = { .moveName = _("Endeavor") }, + .name = MOVE_NAME("Endeavor"), .description = COMPOUND_STRING("Gains power if the user's HP\n" "is lower than the foe's HP."), .effect = EFFECT_ENDEAVOR, @@ -5578,7 +5581,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ERUPTION] = { - .name = { .moveName = _("Eruption") }, + .name = MOVE_NAME("Eruption"), .description = COMPOUND_STRING("The higher the user's HP,\n" "the more damage caused."), .effect = EFFECT_ERUPTION, @@ -5593,7 +5596,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKILL_SWAP] = { - .name = { .moveName = _("Skill Swap") }, + .name = MOVE_NAME("Skill Swap"), .description = COMPOUND_STRING("The user swaps special\n" "abilities with the target."), .effect = EFFECT_SKILL_SWAP, @@ -5610,7 +5613,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IMPRISON] = { - .name = { .moveName = _("Imprison") }, + .name = MOVE_NAME("Imprison"), .description = COMPOUND_STRING("Prevents foes from using\n" "moves known by the user."), .effect = EFFECT_IMPRISON, @@ -5631,7 +5634,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFRESH] = { - .name = { .moveName = _("Refresh") }, + .name = MOVE_NAME("Refresh"), .description = COMPOUND_STRING("Heals poisoning, paralysis,\n" "or a burn."), .effect = EFFECT_REFRESH, @@ -5650,7 +5653,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRUDGE] = { - .name = { .moveName = _("Grudge") }, + .name = MOVE_NAME("Grudge"), .description = COMPOUND_STRING("If the user faints, deletes\n" "all PP of foe's last move."), .effect = EFFECT_GRUDGE, @@ -5669,7 +5672,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNATCH] = { - .name = { .moveName = _("Snatch") }, + .name = MOVE_NAME("Snatch"), .description = COMPOUND_STRING("Steals the effects of the\n" "move the target uses next."), .effect = EFFECT_SNATCH, @@ -5690,7 +5693,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_POWER] = { - .name = { .moveName = _("Secret Power") }, + .name = MOVE_NAME("Secret Power"), .description = COMPOUND_STRING("An attack with effects\n" "that vary by location."), .effect = EFFECT_HIT, @@ -5710,7 +5713,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIVE] = { - .name = { .moveName = _("Dive") }, + .name = MOVE_NAME("Dive"), .description = COMPOUND_STRING("Dives underwater the first\n" "turn and strikes next turn."), .effect = EFFECT_SEMI_INVULNERABLE, @@ -5731,7 +5734,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARM_THRUST] = { - .name = { .moveName = _("Arm Thrust") }, + .name = MOVE_NAME("Arm Thrust"), .description = COMPOUND_STRING("Straight-arm punches that\n" "strike the foe 2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -5747,7 +5750,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAMOUFLAGE] = { - .name = { .moveName = _("Camouflage") }, + .name = MOVE_NAME("Camouflage"), .description = COMPOUND_STRING("Alters the Pokémon's type\n" "depending on the location."), .effect = EFFECT_CAMOUFLAGE, @@ -5766,7 +5769,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_GLOW] = { - .name = { .moveName = _("Tail Glow") }, + .name = MOVE_NAME("Tail Glow"), .description = COMPOUND_STRING("Flashes a light that sharply\n" "raises Sp. Atk."), .effect = B_UPDATED_MOVE_DATA >= GEN_5 ? EFFECT_SPECIAL_ATTACK_UP_3 : EFFECT_SPECIAL_ATTACK_UP_2, @@ -5785,7 +5788,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUSTER_PURGE] = { - .name = { .moveName = _("Luster Purge") }, + .name = MOVE_NAME("Luster Purge"), .description = COMPOUND_STRING("Attacks with a burst of\n" "light. May lower Sp. Def."), .effect = EFFECT_HIT, @@ -5805,7 +5808,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST_BALL] = { - .name = { .moveName = _("Mist Ball") }, + .name = MOVE_NAME("Mist Ball"), .description = COMPOUND_STRING("Attacks with a flurry of\n" "down. May lower Sp. Atk."), .effect = EFFECT_HIT, @@ -5827,9 +5830,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEATHER_DANCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Feather Dance") }, + .name = MOVE_NAME("Feather Dance"), #else - .name = { .moveName = _("FeatherDance") }, + .name = MOVE_NAME("FeatherDance"), #endif .description = COMPOUND_STRING("Envelops the foe with down\n" "to sharply reduce Attack."), @@ -5848,7 +5851,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEETER_DANCE] = { - .name = { .moveName = _("Teeter Dance") }, + .name = MOVE_NAME("Teeter Dance"), .description = COMPOUND_STRING("Confuses all Pokémon on\n" "the scene."), .effect = EFFECT_TEETER_DANCE, @@ -5866,7 +5869,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZE_KICK] = { - .name = { .moveName = _("Blaze Kick") }, + .name = MOVE_NAME("Blaze Kick"), .description = COMPOUND_STRING("A kick with a high critical-\n" "hit ratio. May cause a burn."), .effect = EFFECT_HIT, @@ -5888,7 +5891,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SPORT] = { - .name = { .moveName = _("Mud Sport") }, + .name = MOVE_NAME("Mud Sport"), .description = COMPOUND_STRING("Covers the user in mud to\n" "raise electrical resistance."), .effect = EFFECT_MUD_SPORT, @@ -5907,7 +5910,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BALL] = { - .name = { .moveName = _("Ice Ball") }, + .name = MOVE_NAME("Ice Ball"), .description = COMPOUND_STRING("A 5-turn attack that gains\n" "power on successive hits."), .effect = EFFECT_ROLLOUT, @@ -5926,7 +5929,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NEEDLE_ARM] = { - .name = { .moveName = _("Needle Arm") }, + .name = MOVE_NAME("Needle Arm"), .description = COMPOUND_STRING("Attacks with thorny arms.\n" "May cause flinching."), .effect = EFFECT_HIT, @@ -5948,7 +5951,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLACK_OFF] = { - .name = { .moveName = _("Slack Off") }, + .name = MOVE_NAME("Slack Off"), .description = COMPOUND_STRING("Slacks off and restores\n" "half the maximum HP."), .effect = EFFECT_RESTORE_HP, @@ -5968,7 +5971,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_VOICE] = { - .name = { .moveName = _("Hyper Voice") }, + .name = MOVE_NAME("Hyper Voice"), .description = COMPOUND_STRING("A loud attack that uses\n" "sound waves to injure."), .effect = EFFECT_HIT, @@ -5985,7 +5988,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_FANG] = { - .name = { .moveName = _("Poison Fang") }, + .name = MOVE_NAME("Poison Fang"), .description = COMPOUND_STRING("A sharp-fanged attack.\n" "May badly poison the foe."), .effect = EFFECT_HIT, @@ -6007,7 +6010,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_CLAW] = { - .name = { .moveName = _("Crush Claw") }, + .name = MOVE_NAME("Crush Claw"), .description = COMPOUND_STRING("Tears at the foe with sharp\n" "claws. May lower Defense."), .effect = EFFECT_HIT, @@ -6028,7 +6031,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAST_BURN] = { - .name = { .moveName = _("Blast Burn") }, + .name = MOVE_NAME("Blast Burn"), .description = COMPOUND_STRING("Powerful, but leaves the\n" "user immobile the next turn."), .effect = EFFECT_HIT, @@ -6047,7 +6050,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_CANNON] = { - .name = { .moveName = _("Hydro Cannon") }, + .name = MOVE_NAME("Hydro Cannon"), .description = COMPOUND_STRING("Powerful, but leaves the\n" "user immobile the next turn."), .effect = EFFECT_HIT, @@ -6066,7 +6069,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_MASH] = { - .name = { .moveName = _("Meteor Mash") }, + .name = MOVE_NAME("Meteor Mash"), .description = COMPOUND_STRING("Fires a meteor-like punch.\n" "May raise Attack."), .effect = EFFECT_HIT, @@ -6089,7 +6092,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTONISH] = { - .name = { .moveName = _("Astonish") }, + .name = MOVE_NAME("Astonish"), .description = COMPOUND_STRING("An attack that may shock\n" "the foe into flinching."), .effect = EFFECT_HIT, @@ -6111,7 +6114,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WEATHER_BALL] = { - .name = { .moveName = _("Weather Ball") }, + .name = MOVE_NAME("Weather Ball"), .description = COMPOUND_STRING("The move's type and power\n" "change with the weather."), .effect = EFFECT_WEATHER_BALL, @@ -6127,7 +6130,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATHERAPY] = { - .name = { .moveName = _("Aromatherapy") }, + .name = MOVE_NAME("Aromatherapy"), .description = COMPOUND_STRING("Heals all status problems\n" "with a soothing scent."), .effect = EFFECT_HEAL_BELL, @@ -6146,7 +6149,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_TEARS] = { - .name = { .moveName = _("Fake Tears") }, + .name = MOVE_NAME("Fake Tears"), .description = COMPOUND_STRING("Feigns crying to sharply\n" "lower the foe's Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, @@ -6163,7 +6166,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_CUTTER] = { - .name = { .moveName = _("Air Cutter") }, + .name = MOVE_NAME("Air Cutter"), .description = COMPOUND_STRING("Hacks with razorlike wind.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -6181,7 +6184,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERHEAT] = { - .name = { .moveName = _("Overheat") }, + .name = MOVE_NAME("Overheat"), .description = COMPOUND_STRING("Allows a full-power attack,\n" "but sharply lowers Sp. Atk."), .effect = EFFECT_HIT, @@ -6201,7 +6204,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ODOR_SLEUTH] = { - .name = { .moveName = _("Odor Sleuth") }, + .name = MOVE_NAME("Odor Sleuth"), .description = COMPOUND_STRING("Negates the foe's efforts\n" "to heighten evasiveness."), .effect = EFFECT_FORESIGHT, @@ -6219,7 +6222,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_TOMB] = { - .name = { .moveName = _("Rock Tomb") }, + .name = MOVE_NAME("Rock Tomb"), .description = COMPOUND_STRING("Stops the foe from moving\n" "with rocks and cuts Speed."), .effect = EFFECT_HIT, @@ -6239,7 +6242,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILVER_WIND] = { - .name = { .moveName = _("Silver Wind") }, + .name = MOVE_NAME("Silver Wind"), .description = COMPOUND_STRING("A powdery attack that may\n" "raise abilities."), .effect = EFFECT_HIT, @@ -6261,7 +6264,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_SOUND] = { - .name = { .moveName = _("Metal Sound") }, + .name = MOVE_NAME("Metal Sound"), .description = COMPOUND_STRING("Emits a horrible screech\n" "that sharply lowers Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, @@ -6281,9 +6284,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_WHISTLE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Grass Whistle") }, + .name = MOVE_NAME("Grass Whistle"), #else - .name = { .moveName = _("GrassWhistle") }, + .name = MOVE_NAME("GrassWhistle"), #endif .description = COMPOUND_STRING("Lulls the foe into sleep\n" "with a pleasant melody."), @@ -6303,7 +6306,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TICKLE] = { - .name = { .moveName = _("Tickle") }, + .name = MOVE_NAME("Tickle"), .description = COMPOUND_STRING("Makes the foe laugh to\n" "lower Attack and Defense."), .effect = EFFECT_TICKLE, @@ -6320,7 +6323,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COSMIC_POWER] = { - .name = { .moveName = _("Cosmic Power") }, + .name = MOVE_NAME("Cosmic Power"), .description = COMPOUND_STRING("Raises Defense and Sp. Def\n" "with a mystic power."), .effect = EFFECT_COSMIC_POWER, @@ -6339,7 +6342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPOUT] = { - .name = { .moveName = _("Water Spout") }, + .name = MOVE_NAME("Water Spout"), .description = COMPOUND_STRING("Inflicts more damage if the\n" "user's HP is high."), .effect = EFFECT_ERUPTION, @@ -6354,7 +6357,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIGNAL_BEAM] = { - .name = { .moveName = _("Signal Beam") }, + .name = MOVE_NAME("Signal Beam"), .description = COMPOUND_STRING("A strange beam attack that\n" "may confuse the foe."), .effect = EFFECT_HIT, @@ -6374,7 +6377,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_PUNCH] = { - .name = { .moveName = _("Shadow Punch") }, + .name = MOVE_NAME("Shadow Punch"), .description = COMPOUND_STRING("An unavoidable punch that\n" "is thrown from shadows."), .effect = EFFECT_HIT, @@ -6391,7 +6394,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTRASENSORY] = { - .name = { .moveName = _("Extrasensory") }, + .name = MOVE_NAME("Extrasensory"), .description = COMPOUND_STRING("Attacks with a peculiar\n" "power. May cause flinching."), .effect = EFFECT_HIT, @@ -6412,7 +6415,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_UPPERCUT] = { - .name = { .moveName = _("Sky Uppercut") }, + .name = MOVE_NAME("Sky Uppercut"), .description = COMPOUND_STRING("An uppercut thrown as if\n" "leaping into the sky."), .effect = EFFECT_SKY_UPPERCUT, @@ -6430,7 +6433,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_TOMB] = { - .name = { .moveName = _("Sand Tomb") }, + .name = MOVE_NAME("Sand Tomb"), .description = COMPOUND_STRING("Traps and hurts the foe in\n" "quicksand for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, @@ -6448,7 +6451,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHEER_COLD] = { - .name = { .moveName = _("Sheer Cold") }, + .name = MOVE_NAME("Sheer Cold"), .description = COMPOUND_STRING("A chilling attack that\n" "causes fainting if it hits."), .effect = EFFECT_OHKO, @@ -6463,7 +6466,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUDDY_WATER] = { - .name = { .moveName = _("Muddy Water") }, + .name = MOVE_NAME("Muddy Water"), .description = COMPOUND_STRING("Attacks with muddy water.\n" "May lower accuracy."), .effect = EFFECT_HIT, @@ -6484,7 +6487,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_SEED] = { - .name = { .moveName = _("Bullet Seed") }, + .name = MOVE_NAME("Bullet Seed"), .description = COMPOUND_STRING("Shoots 2 to 5 seeds in a row\n" "to strike the foe."), .effect = EFFECT_MULTI_HIT, @@ -6500,7 +6503,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AERIAL_ACE] = { - .name = { .moveName = _("Aerial Ace") }, + .name = MOVE_NAME("Aerial Ace"), .description = COMPOUND_STRING("An extremely speedy and\n" "unavoidable attack."), .effect = EFFECT_HIT, @@ -6517,7 +6520,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_SPEAR] = { - .name = { .moveName = _("Icicle Spear") }, + .name = MOVE_NAME("Icicle Spear"), .description = COMPOUND_STRING("Attacks the foe by firing\n" "2 to 5 icicles in a row."), .effect = EFFECT_MULTI_HIT, @@ -6532,7 +6535,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_DEFENSE] = { - .name = { .moveName = _("Iron Defense") }, + .name = MOVE_NAME("Iron Defense"), .description = COMPOUND_STRING("Hardens the body's surface\n" "to sharply raise Defense."), .effect = EFFECT_DEFENSE_UP_2, @@ -6551,7 +6554,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOCK] = { - .name = { .moveName = _("Block") }, + .name = MOVE_NAME("Block"), .description = COMPOUND_STRING("Blocks the foe's way to\n" "prevent escape."), .effect = EFFECT_MEAN_LOOK, @@ -6569,7 +6572,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOWL] = { - .name = { .moveName = _("Howl") }, + .name = MOVE_NAME("Howl"), .description = COMPOUND_STRING("Howls to raise the spirit\n" "and boosts Attack."), .power = 0, @@ -6589,7 +6592,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CLAW] = { - .name = { .moveName = _("Dragon Claw") }, + .name = MOVE_NAME("Dragon Claw"), .description = COMPOUND_STRING("Slashes the foe with sharp\n" "claws."), .effect = EFFECT_HIT, @@ -6605,7 +6608,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FRENZY_PLANT] = { - .name = { .moveName = _("Frenzy Plant") }, + .name = MOVE_NAME("Frenzy Plant"), .description = COMPOUND_STRING("Powerful, but leaves the\n" "user immobile the next turn."), .effect = EFFECT_HIT, @@ -6625,7 +6628,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULK_UP] = { - .name = { .moveName = _("Bulk Up") }, + .name = MOVE_NAME("Bulk Up"), .description = COMPOUND_STRING("Bulks up the body to boost\n" "both Attack and Defense."), .effect = EFFECT_BULK_UP, @@ -6644,7 +6647,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCE] = { - .name = { .moveName = _("Bounce") }, + .name = MOVE_NAME("Bounce"), .description = COMPOUND_STRING("Bounces up, then down the\n" "next turn. May paralyze."), .effect = EFFECT_SEMI_INVULNERABLE, @@ -6670,7 +6673,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SHOT] = { - .name = { .moveName = _("Mud Shot") }, + .name = MOVE_NAME("Mud Shot"), .description = COMPOUND_STRING("Hurls mud at the foe and\n" "reduces Speed."), .effect = EFFECT_HIT, @@ -6690,7 +6693,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_TAIL] = { - .name = { .moveName = _("Poison Tail") }, + .name = MOVE_NAME("Poison Tail"), .description = COMPOUND_STRING("Has a high critical-hit\n" "ratio. May also poison."), .effect = EFFECT_HIT, @@ -6712,7 +6715,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COVET] = { - .name = { .moveName = _("Covet") }, + .name = MOVE_NAME("Covet"), .description = COMPOUND_STRING("Cutely begs to obtain an\n" "item held by the foe."), .effect = EFFECT_HIT, @@ -6735,7 +6738,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_TACKLE] = { - .name = { .moveName = _("Volt Tackle") }, + .name = MOVE_NAME("Volt Tackle"), .description = COMPOUND_STRING("A life-risking tackle that\n" "slightly hurts the user."), .effect = EFFECT_HIT, @@ -6759,7 +6762,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_LEAF] = { - .name = { .moveName = _("Magical Leaf") }, + .name = MOVE_NAME("Magical Leaf"), .description = COMPOUND_STRING("Attacks with a strange leaf\n" "that cannot be evaded."), .effect = EFFECT_HIT, @@ -6774,7 +6777,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPORT] = { - .name = { .moveName = _("Water Sport") }, + .name = MOVE_NAME("Water Sport"), .description = COMPOUND_STRING("The user becomes soaked to\n" "raise resistance to fire."), .effect = EFFECT_WATER_SPORT, @@ -6793,7 +6796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CALM_MIND] = { - .name = { .moveName = _("Calm Mind") }, + .name = MOVE_NAME("Calm Mind"), .description = COMPOUND_STRING("Raises Sp. Atk and Sp. Def\n" "by focusing the mind."), .effect = EFFECT_CALM_MIND, @@ -6812,7 +6815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_BLADE] = { - .name = { .moveName = _("Leaf Blade") }, + .name = MOVE_NAME("Leaf Blade"), .description = COMPOUND_STRING("Slashes with a sharp leaf.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -6830,7 +6833,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DANCE] = { - .name = { .moveName = _("Dragon Dance") }, + .name = MOVE_NAME("Dragon Dance"), .description = COMPOUND_STRING("A mystical dance that ups\n" "Attack and Speed."), .effect = EFFECT_DRAGON_DANCE, @@ -6850,7 +6853,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_BLAST] = { - .name = { .moveName = _("Rock Blast") }, + .name = MOVE_NAME("Rock Blast"), .description = COMPOUND_STRING("Hurls boulders at the foe\n" "2 to 5 times in a row."), .effect = EFFECT_MULTI_HIT, @@ -6866,7 +6869,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHOCK_WAVE] = { - .name = { .moveName = _("Shock Wave") }, + .name = MOVE_NAME("Shock Wave"), .description = COMPOUND_STRING("A fast and unavoidable\n" "electric attack."), .effect = EFFECT_HIT, @@ -6881,7 +6884,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PULSE] = { - .name = { .moveName = _("Water Pulse") }, + .name = MOVE_NAME("Water Pulse"), .description = COMPOUND_STRING("Attacks with ultrasonic\n" "waves. May confuse the foe."), .effect = EFFECT_HIT, @@ -6902,7 +6905,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOOM_DESIRE] = { - .name = { .moveName = _("Doom Desire") }, + .name = MOVE_NAME("Doom Desire"), .description = COMPOUND_STRING("Summons strong sunlight to\n" "attack 2 turns later."), .effect = EFFECT_FUTURE_SIGHT, @@ -6919,7 +6922,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_BOOST] = { - .name = { .moveName = _("Psycho Boost") }, + .name = MOVE_NAME("Psycho Boost"), .description = COMPOUND_STRING("Allows a full-power attack,\n" "but sharply lowers Sp. Atk."), .effect = EFFECT_HIT, @@ -6938,7 +6941,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROOST] = { - .name = { .moveName = _("Roost") }, + .name = MOVE_NAME("Roost"), .description = COMPOUND_STRING("Restores the user's HP by\n" "half of its max HP."), .effect = EFFECT_ROOST, @@ -6958,7 +6961,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAVITY] = { - .name = { .moveName = _("Gravity") }, + .name = MOVE_NAME("Gravity"), .description = COMPOUND_STRING("Gravity is intensified\n" "negating levitation."), .effect = EFFECT_GRAVITY, @@ -6977,7 +6980,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRACLE_EYE] = { - .name = { .moveName = _("Miracle Eye") }, + .name = MOVE_NAME("Miracle Eye"), .description = COMPOUND_STRING("Negate evasiveness and\n" "Dark-type's immunities."), .effect = EFFECT_MIRACLE_EYE, @@ -6995,7 +6998,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAKE_UP_SLAP] = { - .name = { .moveName = _("Wake-Up Slap") }, + .name = MOVE_NAME("Wake-Up Slap"), .description = COMPOUND_STRING("Powerful against sleeping\n" "foes, but also heals them."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, @@ -7015,7 +7018,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAMMER_ARM] = { - .name = { .moveName = _("Hammer Arm") }, + .name = MOVE_NAME("Hammer Arm"), .description = COMPOUND_STRING("A swinging fist attack\n" "that also lowers Speed."), .effect = EFFECT_HIT, @@ -7036,7 +7039,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GYRO_BALL] = { - .name = { .moveName = _("Gyro Ball") }, + .name = MOVE_NAME("Gyro Ball"), .description = COMPOUND_STRING("A high-speed spin that does\n" "more damage to faster foes."), .effect = EFFECT_GYRO_BALL, @@ -7053,7 +7056,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEALING_WISH] = { - .name = { .moveName = _("Healing Wish") }, + .name = MOVE_NAME("Healing Wish"), .description = sHealingWishDescription, .effect = EFFECT_HEALING_WISH, .power = 0, @@ -7071,7 +7074,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRINE] = { - .name = { .moveName = _("Brine") }, + .name = MOVE_NAME("Brine"), .description = COMPOUND_STRING("Does double damage to foes\n" "with half HP."), .effect = EFFECT_BRINE, @@ -7086,7 +7089,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURAL_GIFT] = { - .name = { .moveName = _("Natural Gift") }, + .name = MOVE_NAME("Natural Gift"), .description = COMPOUND_STRING("The effectiveness varies\n" "with the held Berry."), .effect = EFFECT_NATURAL_GIFT, @@ -7101,7 +7104,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT] = { - .name = { .moveName = _("Feint") }, + .name = MOVE_NAME("Feint"), .description = COMPOUND_STRING("An attack that hits foes\n" "using moves like Protect."), .effect = EFFECT_HIT, @@ -7124,7 +7127,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLUCK] = { - .name = { .moveName = _("Pluck") }, + .name = MOVE_NAME("Pluck"), .description = sPluckDescription, .effect = EFFECT_HIT, .power = 60, @@ -7142,7 +7145,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAILWIND] = { - .name = { .moveName = _("Tailwind") }, + .name = MOVE_NAME("Tailwind"), .description = COMPOUND_STRING("Whips up a turbulent breeze\n" "that raises Speed."), .effect = EFFECT_TAILWIND, @@ -7162,7 +7165,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACUPRESSURE] = { - .name = { .moveName = _("Acupressure") }, + .name = MOVE_NAME("Acupressure"), .description = COMPOUND_STRING("The user sharply raises\n" "one of its stats."), .effect = EFFECT_ACUPRESSURE, @@ -7181,7 +7184,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_BURST] = { - .name = { .moveName = _("Metal Burst") }, + .name = MOVE_NAME("Metal Burst"), .description = COMPOUND_STRING("Retaliates any hit with\n" "greater power."), .effect = EFFECT_METAL_BURST, @@ -7197,7 +7200,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_U_TURN] = { - .name = { .moveName = _("U-turn") }, + .name = MOVE_NAME("U-turn"), .description = sUTurnDescription, .effect = EFFECT_HIT_ESCAPE, .power = 70, @@ -7212,7 +7215,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLOSE_COMBAT] = { - .name = { .moveName = _("Close Combat") }, + .name = MOVE_NAME("Close Combat"), .description = sCloseCombatDescription, .effect = EFFECT_HIT, .power = 120, @@ -7231,7 +7234,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PAYBACK] = { - .name = { .moveName = _("Payback") }, + .name = MOVE_NAME("Payback"), .description = COMPOUND_STRING("An attack that gains power\n" "if the user moves last."), .effect = EFFECT_PAYBACK, @@ -7247,7 +7250,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSURANCE] = { - .name = { .moveName = _("Assurance") }, + .name = MOVE_NAME("Assurance"), .description = COMPOUND_STRING("An attack that gains power\n" "if the foe has been hurt."), .effect = EFFECT_ASSURANCE, @@ -7263,7 +7266,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EMBARGO] = { - .name = { .moveName = _("Embargo") }, + .name = MOVE_NAME("Embargo"), .description = COMPOUND_STRING("Prevents the foe from\n" "using any items."), .effect = EFFECT_EMBARGO, @@ -7280,7 +7283,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLING] = { - .name = { .moveName = _("Fling") }, + .name = MOVE_NAME("Fling"), .description = COMPOUND_STRING("The effectiveness varies\n" "with the held item."), .effect = EFFECT_FLING, @@ -7296,7 +7299,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_SHIFT] = { - .name = { .moveName = _("Psycho Shift") }, + .name = MOVE_NAME("Psycho Shift"), .description = COMPOUND_STRING("Transfers status problems\n" "to the foe."), .effect = EFFECT_PSYCHO_SHIFT, @@ -7312,7 +7315,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRUMP_CARD] = { - .name = { .moveName = _("Trump Card") }, + .name = MOVE_NAME("Trump Card"), .description = COMPOUND_STRING("The less PP the move has\n" "the more damage it does."), .effect = EFFECT_TRUMP_CARD, @@ -7328,7 +7331,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BLOCK] = { - .name = { .moveName = _("Heal Block") }, + .name = MOVE_NAME("Heal Block"), .description = COMPOUND_STRING("Prevents the foe from\n" "recovering any HP."), .effect = EFFECT_HEAL_BLOCK, @@ -7345,7 +7348,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WRING_OUT] = { - .name = { .moveName = _("Wring Out") }, + .name = MOVE_NAME("Wring Out"), .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, @@ -7360,7 +7363,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRICK] = { - .name = { .moveName = _("Power Trick") }, + .name = MOVE_NAME("Power Trick"), .description = COMPOUND_STRING("The user swaps its Attack\n" "and Defense stats."), .effect = EFFECT_POWER_TRICK, @@ -7379,7 +7382,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GASTRO_ACID] = { - .name = { .moveName = _("Gastro Acid") }, + .name = MOVE_NAME("Gastro Acid"), .description = COMPOUND_STRING("Stomach acid suppresses\n" "the foe's ability."), .effect = EFFECT_GASTRO_ACID, @@ -7396,7 +7399,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUCKY_CHANT] = { - .name = { .moveName = _("Lucky Chant") }, + .name = MOVE_NAME("Lucky Chant"), .description = COMPOUND_STRING("Prevents the foe from\n" "landing critical hits."), .effect = EFFECT_LUCKY_CHANT, @@ -7415,7 +7418,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ME_FIRST] = { - .name = { .moveName = _("Me First") }, + .name = MOVE_NAME("Me First"), .description = COMPOUND_STRING("Executes the foe's attack\n" "with greater power."), .effect = EFFECT_ME_FIRST, @@ -7441,7 +7444,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COPYCAT] = { - .name = { .moveName = _("Copycat") }, + .name = MOVE_NAME("Copycat"), .description = COMPOUND_STRING("The user mimics the last\n" "move used by a foe."), .effect = EFFECT_COPYCAT, @@ -7466,7 +7469,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SWAP] = { - .name = { .moveName = _("Power Swap") }, + .name = MOVE_NAME("Power Swap"), .description = COMPOUND_STRING("Swaps changes to Attack\n" "and Sp. Atk with the foe."), .effect = EFFECT_POWER_SWAP, @@ -7483,7 +7486,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SWAP] = { - .name = { .moveName = _("Guard Swap") }, + .name = MOVE_NAME("Guard Swap"), .description = COMPOUND_STRING("Swaps changes to Defense\n" "and Sp. Def with the foe."), .effect = EFFECT_GUARD_SWAP, @@ -7500,7 +7503,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PUNISHMENT] = { - .name = { .moveName = _("Punishment") }, + .name = MOVE_NAME("Punishment"), .description = COMPOUND_STRING("Does more damage if the\n" "foe has powered up."), .effect = EFFECT_PUNISHMENT, @@ -7516,7 +7519,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESORT] = { - .name = { .moveName = _("Last Resort") }, + .name = MOVE_NAME("Last Resort"), .description = COMPOUND_STRING("Can only be used if every\n" "other move has been used."), .effect = EFFECT_LAST_RESORT, @@ -7532,7 +7535,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORRY_SEED] = { - .name = { .moveName = _("Worry Seed") }, + .name = MOVE_NAME("Worry Seed"), .description = COMPOUND_STRING("Plants a seed on the foe\n" "giving it Insomnia."), .effect = EFFECT_WORRY_SEED, @@ -7549,7 +7552,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUCKER_PUNCH] = { - .name = { .moveName = _("Sucker Punch") }, + .name = MOVE_NAME("Sucker Punch"), .description = sSuckerPunchDescription, .effect = EFFECT_SUCKER_PUNCH, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 70 : 80, @@ -7564,7 +7567,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_SPIKES] = { - .name = { .moveName = _("Toxic Spikes") }, + .name = MOVE_NAME("Toxic Spikes"), .description = COMPOUND_STRING("Sets spikes that poison a\n" "foe switching in."), .effect = EFFECT_TOXIC_SPIKES, @@ -7585,7 +7588,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_SWAP] = { - .name = { .moveName = _("Heart Swap") }, + .name = MOVE_NAME("Heart Swap"), .description = COMPOUND_STRING("Swaps any stat changes\n" "with the foe."), .effect = EFFECT_HEART_SWAP, @@ -7602,7 +7605,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_RING] = { - .name = { .moveName = _("Aqua Ring") }, + .name = MOVE_NAME("Aqua Ring"), .description = COMPOUND_STRING("Forms a veil of water\n" "that restores HP."), .effect = EFFECT_AQUA_RING, @@ -7621,7 +7624,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_RISE] = { - .name = { .moveName = _("Magnet Rise") }, + .name = MOVE_NAME("Magnet Rise"), .description = COMPOUND_STRING("The user levitates with\n" "electromagnetism."), .effect = EFFECT_MAGNET_RISE, @@ -7641,7 +7644,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLARE_BLITZ] = { - .name = { .moveName = _("Flare Blitz") }, + .name = MOVE_NAME("Flare Blitz"), .description = COMPOUND_STRING("A charge that may burn the\n" "foe. Also hurts the user."), .effect = EFFECT_HIT, @@ -7665,7 +7668,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORCE_PALM] = { - .name = { .moveName = _("Force Palm") }, + .name = MOVE_NAME("Force Palm"), .description = COMPOUND_STRING("A shock wave attack that\n" "may paralyze the foe."), .effect = EFFECT_HIT, @@ -7686,7 +7689,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_SPHERE] = { - .name = { .moveName = _("Aura Sphere") }, + .name = MOVE_NAME("Aura Sphere"), .description = COMPOUND_STRING("Attacks with an aura blast\n" "that cannot be evaded."), .effect = EFFECT_HIT, @@ -7703,7 +7706,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_POLISH] = { - .name = { .moveName = _("Rock Polish") }, + .name = MOVE_NAME("Rock Polish"), .description = COMPOUND_STRING("Polishes the body to\n" "sharply raise Speed."), .effect = EFFECT_SPEED_UP_2, @@ -7722,7 +7725,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_JAB] = { - .name = { .moveName = _("Poison Jab") }, + .name = MOVE_NAME("Poison Jab"), .description = COMPOUND_STRING("A stabbing attack that\n" "may poison the foe."), .effect = EFFECT_HIT, @@ -7743,7 +7746,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_PULSE] = { - .name = { .moveName = _("Dark Pulse") }, + .name = MOVE_NAME("Dark Pulse"), .description = COMPOUND_STRING("Attacks with a horrible\n" "aura. May cause flinching."), .effect = EFFECT_HIT, @@ -7764,7 +7767,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SLASH] = { - .name = { .moveName = _("Night Slash") }, + .name = MOVE_NAME("Night Slash"), .description = COMPOUND_STRING("Hits as soon as possible.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -7782,7 +7785,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_TAIL] = { - .name = { .moveName = _("Aqua Tail") }, + .name = MOVE_NAME("Aqua Tail"), .description = COMPOUND_STRING("The user swings its tail\n" "like a wave to attack."), .effect = EFFECT_HIT, @@ -7798,7 +7801,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_BOMB] = { - .name = { .moveName = _("Seed Bomb") }, + .name = MOVE_NAME("Seed Bomb"), .description = COMPOUND_STRING("A barrage of hard seeds\n" "is fired at the foe."), .effect = EFFECT_HIT, @@ -7814,7 +7817,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_SLASH] = { - .name = { .moveName = _("Air Slash") }, + .name = MOVE_NAME("Air Slash"), .description = COMPOUND_STRING("Attacks with a blade of\n" "air. May cause flinching."), .effect = EFFECT_HIT, @@ -7835,7 +7838,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_X_SCISSOR] = { - .name = { .moveName = _("X-Scissor") }, + .name = MOVE_NAME("X-Scissor"), .description = COMPOUND_STRING("Slashes the foe with crossed\n" "scythes, claws, etc."), .effect = EFFECT_HIT, @@ -7852,7 +7855,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BUZZ] = { - .name = { .moveName = _("Bug Buzz") }, + .name = MOVE_NAME("Bug Buzz"), .description = COMPOUND_STRING("A damaging sound wave that\n" "may lower Sp. Def."), .effect = EFFECT_HIT, @@ -7874,7 +7877,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_PULSE] = { - .name = { .moveName = _("Dragon Pulse") }, + .name = MOVE_NAME("Dragon Pulse"), .description = COMPOUND_STRING("Generates a shock wave to\n" "damage the foe."), .effect = EFFECT_HIT, @@ -7890,7 +7893,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RUSH] = { - .name = { .moveName = _("Dragon Rush") }, + .name = MOVE_NAME("Dragon Rush"), .description = COMPOUND_STRING("Tackles the foe with menace.\n" "May cause flinching."), .effect = EFFECT_HIT, @@ -7912,7 +7915,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_GEM] = { - .name = { .moveName = _("Power Gem") }, + .name = MOVE_NAME("Power Gem"), .description = COMPOUND_STRING("Attacks with rays of light\n" "that sparkle like diamonds."), .effect = EFFECT_HIT, @@ -7927,7 +7930,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAIN_PUNCH] = { - .name = { .moveName = _("Drain Punch") }, + .name = MOVE_NAME("Drain Punch"), .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, @@ -7944,7 +7947,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VACUUM_WAVE] = { - .name = { .moveName = _("Vacuum Wave") }, + .name = MOVE_NAME("Vacuum Wave"), .description = COMPOUND_STRING("Whirls its fists to send\n" "a wave that strikes first."), .effect = EFFECT_HIT, @@ -7959,7 +7962,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_BLAST] = { - .name = { .moveName = _("Focus Blast") }, + .name = MOVE_NAME("Focus Blast"), .description = COMPOUND_STRING("Attacks at full power.\n" "May lower Sp. Def."), .effect = EFFECT_HIT, @@ -7980,7 +7983,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENERGY_BALL] = { - .name = { .moveName = _("Energy Ball") }, + .name = MOVE_NAME("Energy Ball"), .description = COMPOUND_STRING("Draws power from nature to\n" "attack. May lower Sp. Def."), .effect = EFFECT_HIT, @@ -8001,7 +8004,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRAVE_BIRD] = { - .name = { .moveName = _("Brave Bird") }, + .name = MOVE_NAME("Brave Bird"), .description = COMPOUND_STRING("A low altitude charge that\n" "also hurts the user."), .effect = EFFECT_HIT, @@ -8018,7 +8021,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EARTH_POWER] = { - .name = { .moveName = _("Earth Power") }, + .name = MOVE_NAME("Earth Power"), .description = COMPOUND_STRING("Makes the ground erupt with\n" "power. May lower Sp. Def."), .effect = EFFECT_HIT, @@ -8039,7 +8042,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWITCHEROO] = { - .name = { .moveName = _("Switcheroo") }, + .name = MOVE_NAME("Switcheroo"), .description = COMPOUND_STRING("Swaps items with the foe\n" "faster than the eye can see."), .effect = EFFECT_TRICK, @@ -8058,7 +8061,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_IMPACT] = { - .name = { .moveName = _("Giga Impact") }, + .name = MOVE_NAME("Giga Impact"), .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, @@ -8077,7 +8080,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NASTY_PLOT] = { - .name = { .moveName = _("Nasty Plot") }, + .name = MOVE_NAME("Nasty Plot"), .description = COMPOUND_STRING("Thinks bad thoughts to\n" "sharply boost Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_UP_2, @@ -8096,7 +8099,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_PUNCH] = { - .name = { .moveName = _("Bullet Punch") }, + .name = MOVE_NAME("Bullet Punch"), .description = COMPOUND_STRING("Punches as fast as a bul-\n" "let. It always hits first."), .effect = EFFECT_HIT, @@ -8113,7 +8116,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AVALANCHE] = { - .name = { .moveName = _("Avalanche") }, + .name = MOVE_NAME("Avalanche"), .description = sRevengeDescription, .effect = EFFECT_REVENGE, .power = 60, @@ -8128,7 +8131,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SHARD] = { - .name = { .moveName = _("Ice Shard") }, + .name = MOVE_NAME("Ice Shard"), .description = COMPOUND_STRING("Hurls a chunk of ice that\n" "always strike first."), .effect = EFFECT_HIT, @@ -8143,7 +8146,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_CLAW] = { - .name = { .moveName = _("Shadow Claw") }, + .name = MOVE_NAME("Shadow Claw"), .description = COMPOUND_STRING("Strikes with a shadow claw.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -8160,7 +8163,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_FANG] = { - .name = { .moveName = _("Thunder Fang") }, + .name = MOVE_NAME("Thunder Fang"), .description = COMPOUND_STRING("May cause flinching or\n" "leave the foe paralyzed."), .effect = EFFECT_HIT, @@ -8187,7 +8190,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_FANG] = { - .name = { .moveName = _("Ice Fang") }, + .name = MOVE_NAME("Ice Fang"), .description = COMPOUND_STRING("May cause flinching or\n" "leave the foe frozen."), .effect = EFFECT_HIT, @@ -8213,7 +8216,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_FANG] = { - .name = { .moveName = _("Fire Fang") }, + .name = MOVE_NAME("Fire Fang"), .description = COMPOUND_STRING("May cause flinching or\n" "leave the foe with a burn."), .effect = EFFECT_HIT, @@ -8240,7 +8243,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_SNEAK] = { - .name = { .moveName = _("Shadow Sneak") }, + .name = MOVE_NAME("Shadow Sneak"), .description = COMPOUND_STRING("Extends the user's shadow\n" "to strike first."), .effect = EFFECT_HIT, @@ -8256,7 +8259,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_BOMB] = { - .name = { .moveName = _("Mud Bomb") }, + .name = MOVE_NAME("Mud Bomb"), .description = COMPOUND_STRING("Throws a blob of mud to\n" "damage and cut accuracy."), .effect = EFFECT_HIT, @@ -8277,7 +8280,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_CUT] = { - .name = { .moveName = _("Psycho Cut") }, + .name = MOVE_NAME("Psycho Cut"), .description = COMPOUND_STRING("Tears with psychic blades.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -8294,7 +8297,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZEN_HEADBUTT] = { - .name = { .moveName = _("Zen Headbutt") }, + .name = MOVE_NAME("Zen Headbutt"), .description = COMPOUND_STRING("Hits with a strong head-\n" "butt. May cause flinching."), .effect = EFFECT_HIT, @@ -8315,7 +8318,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_SHOT] = { - .name = { .moveName = _("Mirror Shot") }, + .name = MOVE_NAME("Mirror Shot"), .description = COMPOUND_STRING("Emits a flash of energy to\n" "damage and cut accuracy."), .effect = EFFECT_HIT, @@ -8335,7 +8338,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH_CANNON] = { - .name = { .moveName = _("Flash Cannon") }, + .name = MOVE_NAME("Flash Cannon"), .description = COMPOUND_STRING("Releases a blast of light\n" "that may lower Sp. Def."), .effect = EFFECT_HIT, @@ -8355,7 +8358,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_CLIMB] = { - .name = { .moveName = _("Rock Climb") }, + .name = MOVE_NAME("Rock Climb"), .description = COMPOUND_STRING("A charging attack that may\n" "confuse the foe."), .effect = EFFECT_HIT, @@ -8376,7 +8379,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFOG] = { - .name = { .moveName = _("Defog") }, + .name = MOVE_NAME("Defog"), .description = COMPOUND_STRING("Removes obstacles and\n" "lowers evasion."), .effect = EFFECT_DEFOG, @@ -8394,7 +8397,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_ROOM] = { - .name = { .moveName = _("Trick Room") }, + .name = MOVE_NAME("Trick Room"), .description = COMPOUND_STRING("Slower Pokémon get to move\n" "first for 5 turns."), .effect = EFFECT_TRICK_ROOM, @@ -8411,7 +8414,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRACO_METEOR] = { - .name = { .moveName = _("Draco Meteor") }, + .name = MOVE_NAME("Draco Meteor"), .description = COMPOUND_STRING("Casts comets onto the foe.\n" "Harshly lowers the Sp. Atk."), .effect = EFFECT_HIT, @@ -8430,7 +8433,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISCHARGE] = { - .name = { .moveName = _("Discharge") }, + .name = MOVE_NAME("Discharge"), .description = COMPOUND_STRING("Zaps the foes with electri-\n" "city. May paralyze them."), .effect = EFFECT_HIT, @@ -8450,7 +8453,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAVA_PLUME] = { - .name = { .moveName = _("Lava Plume") }, + .name = MOVE_NAME("Lava Plume"), .description = sLavaPlumeDescription, .effect = EFFECT_HIT, .power = 80, @@ -8469,7 +8472,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_STORM] = { - .name = { .moveName = _("Leaf Storm") }, + .name = MOVE_NAME("Leaf Storm"), .description = COMPOUND_STRING("Whips up a storm of leaves.\n" "Harshly lowers the Sp. Atk."), .effect = EFFECT_HIT, @@ -8488,7 +8491,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_WHIP] = { - .name = { .moveName = _("Power Whip") }, + .name = MOVE_NAME("Power Whip"), .description = COMPOUND_STRING("Violently lashes the foe\n" "with vines or tentacles."), .effect = EFFECT_HIT, @@ -8504,7 +8507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_WRECKER] = { - .name = { .moveName = _("Rock Wrecker") }, + .name = MOVE_NAME("Rock Wrecker"), .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, @@ -8523,7 +8526,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_POISON] = { - .name = { .moveName = _("Cross Poison") }, + .name = MOVE_NAME("Cross Poison"), .description = COMPOUND_STRING("A slash that may poison a\n" "foe and do critical damage."), .effect = EFFECT_HIT, @@ -8546,7 +8549,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUNK_SHOT] = { - .name = { .moveName = _("Gunk Shot") }, + .name = MOVE_NAME("Gunk Shot"), .description = COMPOUND_STRING("Shoots filthy garbage at\n" "the foe. May also poison."), .effect = EFFECT_HIT, @@ -8566,7 +8569,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_HEAD] = { - .name = { .moveName = _("Iron Head") }, + .name = MOVE_NAME("Iron Head"), .description = COMPOUND_STRING("Slams the foe with a hard\n" "head. May cause flinching."), .effect = EFFECT_HIT, @@ -8587,7 +8590,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_BOMB] = { - .name = { .moveName = _("Magnet Bomb") }, + .name = MOVE_NAME("Magnet Bomb"), .description = COMPOUND_STRING("Launches a magnet that\n" "strikes without fail."), .effect = EFFECT_HIT, @@ -8603,7 +8606,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_EDGE] = { - .name = { .moveName = _("Stone Edge") }, + .name = MOVE_NAME("Stone Edge"), .description = COMPOUND_STRING("Stabs the foe with stones.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -8619,7 +8622,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CAPTIVATE] = { - .name = { .moveName = _("Captivate") }, + .name = MOVE_NAME("Captivate"), .description = COMPOUND_STRING("Makes the opposite gender\n" "sharply reduce its Sp. Atk."), .effect = EFFECT_CAPTIVATE, @@ -8636,7 +8639,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEALTH_ROCK] = { - .name = { .moveName = _("Stealth Rock") }, + .name = MOVE_NAME("Stealth Rock"), .description = COMPOUND_STRING("Sets floating stones that\n" "hurt a foe switching in."), .effect = EFFECT_STEALTH_ROCK, @@ -8656,7 +8659,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_KNOT] = { - .name = { .moveName = _("Grass Knot") }, + .name = MOVE_NAME("Grass Knot"), .description = COMPOUND_STRING("A snare attack that does\n" "more damage to heavier foes."), .effect = EFFECT_LOW_KICK, @@ -8673,7 +8676,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHATTER] = { - .name = { .moveName = _("Chatter") }, + .name = MOVE_NAME("Chatter"), .description = COMPOUND_STRING("Attacks with a sound wave\n" "that causes confusion."), .effect = EFFECT_HIT, @@ -8708,7 +8711,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUDGMENT] = { - .name = { .moveName = _("Judgment") }, + .name = MOVE_NAME("Judgment"), .description = COMPOUND_STRING("The type varies with the\n" "kind of Plate held."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, @@ -8724,7 +8727,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BITE] = { - .name = { .moveName = _("Bug Bite") }, + .name = MOVE_NAME("Bug Bite"), .description = sPluckDescription, .effect = EFFECT_HIT, .power = 60, @@ -8742,7 +8745,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE_BEAM] = { - .name = { .moveName = _("Charge Beam") }, + .name = MOVE_NAME("Charge Beam"), .description = COMPOUND_STRING("Fires a beam of electricity.\n" "May raise Sp. Atk."), .effect = EFFECT_HIT, @@ -8763,7 +8766,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WOOD_HAMMER] = { - .name = { .moveName = _("Wood Hammer") }, + .name = MOVE_NAME("Wood Hammer"), .description = COMPOUND_STRING("Slams the body into a foe.\n" "The user gets hurt too."), .effect = EFFECT_HIT, @@ -8780,7 +8783,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_JET] = { - .name = { .moveName = _("Aqua Jet") }, + .name = MOVE_NAME("Aqua Jet"), .description = COMPOUND_STRING("Strikes first by dashing\n" "at the foe at a high speed."), .effect = EFFECT_HIT, @@ -8796,7 +8799,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ATTACK_ORDER] = { - .name = { .moveName = _("Attack Order") }, + .name = MOVE_NAME("Attack Order"), .description = COMPOUND_STRING("Underlings pummel the foe.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -8812,7 +8815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DEFEND_ORDER] = { - .name = { .moveName = _("Defend Order") }, + .name = MOVE_NAME("Defend Order"), .description = COMPOUND_STRING("Raises Defense and Sp. Def\n" "with a living shield."), .effect = EFFECT_COSMIC_POWER, @@ -8831,7 +8834,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_ORDER] = { - .name = { .moveName = _("Heal Order") }, + .name = MOVE_NAME("Heal Order"), .description = COMPOUND_STRING("The user's underlings show\n" "up to heal half its max HP."), .effect = EFFECT_RESTORE_HP, @@ -8851,7 +8854,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_SMASH] = { - .name = { .moveName = _("Head Smash") }, + .name = MOVE_NAME("Head Smash"), .description = COMPOUND_STRING("A life-risking headbutt that\n" "seriously hurts the user."), .effect = EFFECT_HIT, @@ -8868,7 +8871,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_HIT] = { - .name = { .moveName = _("Double Hit") }, + .name = MOVE_NAME("Double Hit"), .description = COMPOUND_STRING("Slams the foe with a tail\n" "etc. Strikes twice."), .effect = EFFECT_HIT, @@ -8885,7 +8888,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR_OF_TIME] = { - .name = { .moveName = _("Roar of Time") }, + .name = MOVE_NAME("Roar of Time"), .description = COMPOUND_STRING("Powerful, but leaves the\n" "user immobile the next turn."), .effect = EFFECT_HIT, @@ -8904,7 +8907,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPACIAL_REND] = { - .name = { .moveName = _("Spacial Rend") }, + .name = MOVE_NAME("Spacial Rend"), .description = COMPOUND_STRING("Tears the foe, and space.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -8920,7 +8923,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_DANCE] = { - .name = { .moveName = _("Lunar Dance") }, + .name = MOVE_NAME("Lunar Dance"), .description = sHealingWishDescription, .effect = EFFECT_HEALING_WISH, .power = 0, @@ -8939,7 +8942,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_GRIP] = { - .name = { .moveName = _("Crush Grip") }, + .name = MOVE_NAME("Crush Grip"), .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, @@ -8954,7 +8957,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGMA_STORM] = { - .name = { .moveName = _("Magma Storm") }, + .name = MOVE_NAME("Magma Storm"), .description = COMPOUND_STRING("Traps the foe in a vortex\n" "of fire for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, @@ -8972,7 +8975,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_VOID] = { - .name = { .moveName = _("Dark Void") }, + .name = MOVE_NAME("Dark Void"), .description = COMPOUND_STRING("Drags the foe into total\n" "darkness, inducing Sleep."), .effect = EFFECT_DARK_VOID, @@ -8990,7 +8993,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_FLARE] = { - .name = { .moveName = _("Seed Flare") }, + .name = MOVE_NAME("Seed Flare"), .description = COMPOUND_STRING("Generates a shock wave that\n" "sharply reduces Sp. Def."), .effect = EFFECT_HIT, @@ -9010,7 +9013,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OMINOUS_WIND] = { - .name = { .moveName = _("Ominous Wind") }, + .name = MOVE_NAME("Ominous Wind"), .description = COMPOUND_STRING("A repulsive attack that may\n" "raise all stats."), .effect = EFFECT_HIT, @@ -9032,7 +9035,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_FORCE] = { - .name = { .moveName = _("Shadow Force") }, + .name = MOVE_NAME("Shadow Force"), .description = sShadowForceDescription, .effect = EFFECT_SEMI_INVULNERABLE, .power = 120, @@ -9056,7 +9059,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HONE_CLAWS] = { - .name = { .moveName = _("Hone Claws") }, + .name = MOVE_NAME("Hone Claws"), .description = COMPOUND_STRING("Sharpens its claws to raise\n" "Attack and Accuracy."), .effect = EFFECT_ATTACK_ACCURACY_UP, @@ -9075,7 +9078,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WIDE_GUARD] = { - .name = { .moveName = _("Wide Guard") }, + .name = MOVE_NAME("Wide Guard"), .description = COMPOUND_STRING("Evades wide-ranging attacks\n" "for one turn."), .effect = EFFECT_PROTECT, @@ -9097,7 +9100,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SPLIT] = { - .name = { .moveName = _("Guard Split") }, + .name = MOVE_NAME("Guard Split"), .description = COMPOUND_STRING("Averages changes to Defense\n" "and Sp. Def with the foe."), .effect = EFFECT_GUARD_SPLIT, @@ -9114,7 +9117,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SPLIT] = { - .name = { .moveName = _("Power Split") }, + .name = MOVE_NAME("Power Split"), .description = COMPOUND_STRING("Averages changes to Attack\n" "and Sp. Atk with the foe."), .effect = EFFECT_POWER_SPLIT, @@ -9131,7 +9134,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WONDER_ROOM] = { - .name = { .moveName = _("Wonder Room") }, + .name = MOVE_NAME("Wonder Room"), .description = COMPOUND_STRING("Defense and Sp. Def stats\n" "are swapped for 5 turns."), .effect = EFFECT_WONDER_ROOM, @@ -9148,7 +9151,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHOCK] = { - .name = { .moveName = _("Psyshock") }, + .name = MOVE_NAME("Psyshock"), .description = sPsyshockDescription, .effect = EFFECT_PSYSHOCK, .power = 80, @@ -9162,7 +9165,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOSHOCK] = { - .name = { .moveName = _("Venoshock") }, + .name = MOVE_NAME("Venoshock"), .description = COMPOUND_STRING("Does double damage if the\n" "foe is poisoned."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, @@ -9178,7 +9181,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AUTOTOMIZE] = { - .name = { .moveName = _("Autotomize") }, + .name = MOVE_NAME("Autotomize"), .description = COMPOUND_STRING("Sheds additional weight to\n" "sharply boost Speed."), .effect = EFFECT_AUTOTOMIZE, @@ -9197,7 +9200,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_POWDER] = { - .name = { .moveName = _("Rage Powder") }, + .name = MOVE_NAME("Rage Powder"), .description = COMPOUND_STRING("Scatters powder to make\n" "foes attack only the user."), .effect = EFFECT_FOLLOW_ME, @@ -9219,7 +9222,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TELEKINESIS] = { - .name = { .moveName = _("Telekinesis") }, + .name = MOVE_NAME("Telekinesis"), .description = COMPOUND_STRING("Makes the foe float. It is\n" "easier to hit for 3 turns."), .effect = EFFECT_TELEKINESIS, @@ -9237,7 +9240,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_ROOM] = { - .name = { .moveName = _("Magic Room") }, + .name = MOVE_NAME("Magic Room"), .description = COMPOUND_STRING("Hold items lose their\n" "effects for 5 turns."), .effect = EFFECT_MAGIC_ROOM, @@ -9254,7 +9257,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMACK_DOWN] = { - .name = { .moveName = _("Smack Down") }, + .name = MOVE_NAME("Smack Down"), .description = COMPOUND_STRING("Throws a rock to knock the\n" "foe down to the ground."), .effect = EFFECT_HIT, @@ -9274,7 +9277,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORM_THROW] = { - .name = { .moveName = _("Storm Throw") }, + .name = MOVE_NAME("Storm Throw"), .description = sStormThrowDescription, .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, @@ -9290,7 +9293,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_BURST] = { - .name = { .moveName = _("Flame Burst") }, + .name = MOVE_NAME("Flame Burst"), .description = COMPOUND_STRING("A bursting flame that does\n" "damage to all foes."), .effect = EFFECT_HIT, @@ -9309,7 +9312,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_WAVE] = { - .name = { .moveName = _("Sludge Wave") }, + .name = MOVE_NAME("Sludge Wave"), .description = COMPOUND_STRING("Swamps the foe with a wave\n" "of sludge. May also poison."), .effect = EFFECT_HIT, @@ -9329,7 +9332,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUIVER_DANCE] = { - .name = { .moveName = _("Quiver Dance") }, + .name = MOVE_NAME("Quiver Dance"), .description = COMPOUND_STRING("Dances to raise Sp. Atk\n" "Sp. Def and Speed."), .effect = EFFECT_QUIVER_DANCE, @@ -9349,7 +9352,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAVY_SLAM] = { - .name = { .moveName = _("Heavy Slam") }, + .name = MOVE_NAME("Heavy Slam"), .description = sHeavySlamDescription, .effect = EFFECT_HEAT_CRASH, .power = 1, @@ -9366,7 +9369,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNCHRONOISE] = { - .name = { .moveName = _("Synchronoise") }, + .name = MOVE_NAME("Synchronoise"), .description = COMPOUND_STRING("An odd shock wave that only\n" "damages same-type foes."), .effect = EFFECT_SYNCHRONOISE, @@ -9381,7 +9384,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_BALL] = { - .name = { .moveName = _("Electro Ball") }, + .name = MOVE_NAME("Electro Ball"), .description = COMPOUND_STRING("Hurls an orb that does more\n" "damage to slower foes."), .effect = EFFECT_ELECTRO_BALL, @@ -9397,7 +9400,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOAK] = { - .name = { .moveName = _("Soak") }, + .name = MOVE_NAME("Soak"), .description = COMPOUND_STRING("Sprays water at the foe\n" "making it Water-type."), .effect = EFFECT_SOAK, @@ -9414,7 +9417,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_CHARGE] = { - .name = { .moveName = _("Flame Charge") }, + .name = MOVE_NAME("Flame Charge"), .description = COMPOUND_STRING("Attacks in a cloak of\n" "flames. Raises Speed."), .effect = EFFECT_HIT, @@ -9436,7 +9439,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COIL] = { - .name = { .moveName = _("Coil") }, + .name = MOVE_NAME("Coil"), .description = COMPOUND_STRING("Coils up to raise Attack\n" "Defense and Accuracy."), .effect = EFFECT_COIL, @@ -9455,7 +9458,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_SWEEP] = { - .name = { .moveName = _("Low Sweep") }, + .name = MOVE_NAME("Low Sweep"), .description = COMPOUND_STRING("Attacks the foe's legs\n" "lowering its Speed."), .effect = EFFECT_HIT, @@ -9476,7 +9479,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_SPRAY] = { - .name = { .moveName = _("Acid Spray") }, + .name = MOVE_NAME("Acid Spray"), .description = COMPOUND_STRING("Sprays a hide-melting acid.\n" "Sharply reduces Sp. Def."), .effect = EFFECT_HIT, @@ -9497,7 +9500,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FOUL_PLAY] = { - .name = { .moveName = _("Foul Play") }, + .name = MOVE_NAME("Foul Play"), .description = COMPOUND_STRING("The higher the foe's Attack\n" "the more damage caused."), .effect = EFFECT_FOUL_PLAY, @@ -9513,7 +9516,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIMPLE_BEAM] = { - .name = { .moveName = _("Simple Beam") }, + .name = MOVE_NAME("Simple Beam"), .description = COMPOUND_STRING("A beam that changes the\n" "foe's ability to Simple."), .effect = EFFECT_SIMPLE_BEAM, @@ -9530,7 +9533,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENTRAINMENT] = { - .name = { .moveName = _("Entrainment") }, + .name = MOVE_NAME("Entrainment"), .description = COMPOUND_STRING("Makes the foe mimic the\n" "user, gaining its ability."), .effect = EFFECT_ENTRAINMENT, @@ -9547,7 +9550,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AFTER_YOU] = { - .name = { .moveName = _("After You") }, + .name = MOVE_NAME("After You"), .description = COMPOUND_STRING("Helps out the foe, letting\n" "it move next."), .effect = EFFECT_AFTER_YOU, @@ -9567,7 +9570,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROUND] = { - .name = { .moveName = _("Round") }, + .name = MOVE_NAME("Round"), .description = COMPOUND_STRING("A song that inflicts damage.\n" "Others can join in too."), .effect = EFFECT_ROUND, @@ -9587,7 +9590,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ECHOED_VOICE] = { - .name = { .moveName = _("Echoed Voice") }, + .name = MOVE_NAME("Echoed Voice"), .description = COMPOUND_STRING("Does more damage every turn\n" "it is used."), .effect = EFFECT_ECHOED_VOICE, @@ -9604,7 +9607,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHIP_AWAY] = { - .name = { .moveName = _("Chip Away") }, + .name = MOVE_NAME("Chip Away"), .description = sChipAwayDescription, .effect = EFFECT_HIT, .power = 70, @@ -9620,7 +9623,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLEAR_SMOG] = { - .name = { .moveName = _("Clear Smog") }, + .name = MOVE_NAME("Clear Smog"), .description = COMPOUND_STRING("Attacks with white haze that\n" "eliminates all stat changes."), .effect = EFFECT_HIT, @@ -9638,7 +9641,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORED_POWER] = { - .name = { .moveName = _("Stored Power") }, + .name = MOVE_NAME("Stored Power"), .description = COMPOUND_STRING("The higher the user's stats\n" "the more damage caused."), .effect = EFFECT_STORED_POWER, @@ -9653,7 +9656,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_GUARD] = { - .name = { .moveName = _("Quick Guard") }, + .name = MOVE_NAME("Quick Guard"), .description = COMPOUND_STRING("Evades priority attacks\n" "for one turn."), .effect = EFFECT_PROTECT, @@ -9675,7 +9678,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLY_SWITCH] = { - .name = { .moveName = _("Ally Switch") }, + .name = MOVE_NAME("Ally Switch"), .description = COMPOUND_STRING("The user switches places\n" "with its partner."), .effect = EFFECT_ALLY_SWITCH, @@ -9693,7 +9696,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALD] = { - .name = { .moveName = _("Scald") }, + .name = MOVE_NAME("Scald"), .description = COMPOUND_STRING("Shoots boiling water at the\n" "foe. May inflict a burn."), .effect = EFFECT_HIT, @@ -9714,7 +9717,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SMASH] = { - .name = { .moveName = _("Shell Smash") }, + .name = MOVE_NAME("Shell Smash"), .description = COMPOUND_STRING("Raises offensive stats, but\n" "lowers defensive stats."), .effect = EFFECT_SHELL_SMASH, @@ -9733,7 +9736,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_PULSE] = { - .name = { .moveName = _("Heal Pulse") }, + .name = MOVE_NAME("Heal Pulse"), .description = COMPOUND_STRING("Recovers up to half the\n" "target's maximum HP."), .effect = EFFECT_HEAL_PULSE, @@ -9753,7 +9756,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEX] = { - .name = { .moveName = _("Hex") }, + .name = MOVE_NAME("Hex"), .description = COMPOUND_STRING("Does double damage if the\n" "foe has a status problem."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, @@ -9769,7 +9772,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_DROP] = { - .name = { .moveName = _("Sky Drop") }, + .name = MOVE_NAME("Sky Drop"), .description = COMPOUND_STRING("Takes the foe into the sky\n" "then drops it the next turn."), .effect = EFFECT_SKY_DROP, @@ -9790,7 +9793,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHIFT_GEAR] = { - .name = { .moveName = _("Shift Gear") }, + .name = MOVE_NAME("Shift Gear"), .description = COMPOUND_STRING("Rotates its gears to raise\n" "Attack and Speed."), .effect = EFFECT_SHIFT_GEAR, @@ -9809,7 +9812,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CIRCLE_THROW] = { - .name = { .moveName = _("Circle Throw") }, + .name = MOVE_NAME("Circle Throw"), .description = sCircleThrowDescription, .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, @@ -9826,7 +9829,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INCINERATE] = { - .name = { .moveName = _("Incinerate") }, + .name = MOVE_NAME("Incinerate"), .description = COMPOUND_STRING("Burns up Berries and Gems\n" "preventing their use."), .effect = EFFECT_HIT, @@ -9844,7 +9847,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_QUASH] = { - .name = { .moveName = _("Quash") }, + .name = MOVE_NAME("Quash"), .description = COMPOUND_STRING("Suppresses the foe, making\n" "it move last."), .effect = EFFECT_QUASH, @@ -9861,7 +9864,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACROBATICS] = { - .name = { .moveName = _("Acrobatics") }, + .name = MOVE_NAME("Acrobatics"), .description = COMPOUND_STRING("Does double damage if the\n" "user has no item."), .effect = EFFECT_ACROBATICS, @@ -9877,7 +9880,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT_TYPE] = { - .name = { .moveName = _("Reflect Type") }, + .name = MOVE_NAME("Reflect Type"), .description = COMPOUND_STRING("The user reflects the foe's\n" "type, copying it."), .effect = EFFECT_REFLECT_TYPE, @@ -9895,7 +9898,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RETALIATE] = { - .name = { .moveName = _("Retaliate") }, + .name = MOVE_NAME("Retaliate"), .description = COMPOUND_STRING("An attack that does more\n" "damage if an ally fainted."), .effect = EFFECT_RETALIATE, @@ -9911,7 +9914,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FINAL_GAMBIT] = { - .name = { .moveName = _("Final Gambit") }, + .name = MOVE_NAME("Final Gambit"), .description = COMPOUND_STRING("The user faints to damage\n" "the foe equal to its HP."), .effect = EFFECT_FINAL_GAMBIT, @@ -9928,7 +9931,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BESTOW] = { - .name = { .moveName = _("Bestow") }, + .name = MOVE_NAME("Bestow"), .description = COMPOUND_STRING("The user gives its held\n" "item to the foe."), .effect = EFFECT_BESTOW, @@ -9949,7 +9952,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNO] = { - .name = { .moveName = _("Inferno") }, + .name = MOVE_NAME("Inferno"), .description = COMPOUND_STRING("Powerful and sure to inflict\n" "a burn, but inaccurate."), .effect = EFFECT_HIT, @@ -9969,7 +9972,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PLEDGE] = { - .name = { .moveName = _("Water Pledge") }, + .name = MOVE_NAME("Water Pledge"), .description = COMPOUND_STRING("Attacks with a column of\n" "water. May make a rainbow."), .effect = EFFECT_PLEDGE, @@ -9985,7 +9988,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PLEDGE] = { - .name = { .moveName = _("Fire Pledge") }, + .name = MOVE_NAME("Fire Pledge"), .description = COMPOUND_STRING("Attacks with a column of\n" "fire. May burn the grass."), .effect = EFFECT_PLEDGE, @@ -10001,7 +10004,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_PLEDGE] = { - .name = { .moveName = _("Grass Pledge") }, + .name = MOVE_NAME("Grass Pledge"), .description = COMPOUND_STRING("Attacks with a column of\n" "grass. May create a swamp."), .effect = EFFECT_PLEDGE, @@ -10017,7 +10020,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_SWITCH] = { - .name = { .moveName = _("Volt Switch") }, + .name = MOVE_NAME("Volt Switch"), .description = sUTurnDescription, .effect = EFFECT_HIT_ESCAPE, .power = 70, @@ -10031,7 +10034,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE_BUG] = { - .name = { .moveName = _("Struggle Bug") }, + .name = MOVE_NAME("Struggle Bug"), .description = COMPOUND_STRING("Resisting, the user attacks\n" "the foe. Lowers Sp. Atk."), .effect = EFFECT_HIT, @@ -10051,7 +10054,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLDOZE] = { - .name = { .moveName = _("Bulldoze") }, + .name = MOVE_NAME("Bulldoze"), .description = COMPOUND_STRING("Stomps down on the ground.\n" "Lowers Speed."), .effect = EFFECT_BULLDOZE, @@ -10072,7 +10075,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FROST_BREATH] = { - .name = { .moveName = _("Frost Breath") }, + .name = MOVE_NAME("Frost Breath"), .description = sStormThrowDescription, .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, @@ -10087,7 +10090,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_TAIL] = { - .name = { .moveName = _("Dragon Tail") }, + .name = MOVE_NAME("Dragon Tail"), .description = sCircleThrowDescription, .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, @@ -10104,7 +10107,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WORK_UP] = { - .name = { .moveName = _("Work Up") }, + .name = MOVE_NAME("Work Up"), .description = COMPOUND_STRING("The user is roused.\n" "Ups Attack and Sp. Atk."), .effect = EFFECT_ATTACK_SPATK_UP, @@ -10123,7 +10126,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTROWEB] = { - .name = { .moveName = _("Electroweb") }, + .name = MOVE_NAME("Electroweb"), .description = COMPOUND_STRING("Snares the foe with an\n" "electric net. Lowers Speed."), .effect = EFFECT_HIT, @@ -10143,7 +10146,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILD_CHARGE] = { - .name = { .moveName = _("Wild Charge") }, + .name = MOVE_NAME("Wild Charge"), .description = COMPOUND_STRING("An electrical tackle that\n" "also hurts the user."), .effect = EFFECT_HIT, @@ -10160,7 +10163,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_RUN] = { - .name = { .moveName = _("Drill Run") }, + .name = MOVE_NAME("Drill Run"), .description = COMPOUND_STRING("Spins its body like a drill.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, @@ -10177,7 +10180,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_CHOP] = { - .name = { .moveName = _("Dual Chop") }, + .name = MOVE_NAME("Dual Chop"), .description = COMPOUND_STRING("Attacks with brutal hits\n" "that strike twice."), .effect = EFFECT_HIT, @@ -10194,7 +10197,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_STAMP] = { - .name = { .moveName = _("Heart Stamp") }, + .name = MOVE_NAME("Heart Stamp"), .description = COMPOUND_STRING("A sudden blow after a cute\n" "act. May cause flinching."), .effect = EFFECT_HIT, @@ -10215,7 +10218,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_LEECH] = { - .name = { .moveName = _("Horn Leech") }, + .name = MOVE_NAME("Horn Leech"), .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = 75, @@ -10231,7 +10234,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_SWORD] = { - .name = { .moveName = _("Sacred Sword") }, + .name = MOVE_NAME("Sacred Sword"), .description = sChipAwayDescription, .effect = EFFECT_HIT, .power = 90, @@ -10248,7 +10251,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_SHELL] = { - .name = { .moveName = _("Razor Shell") }, + .name = MOVE_NAME("Razor Shell"), .description = COMPOUND_STRING("Tears at the foe with sharp\n" "shells. May lower Defense."), .effect = EFFECT_HIT, @@ -10270,7 +10273,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_CRASH] = { - .name = { .moveName = _("Heat Crash") }, + .name = MOVE_NAME("Heat Crash"), .description = sHeavySlamDescription, .effect = EFFECT_HEAT_CRASH, .power = 1, @@ -10286,7 +10289,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_TORNADO] = { - .name = { .moveName = _("Leaf Tornado") }, + .name = MOVE_NAME("Leaf Tornado"), .description = COMPOUND_STRING("Circles the foe with leaves\n" "to damage and cut accuracy."), .effect = EFFECT_HIT, @@ -10307,7 +10310,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAMROLLER] = { - .name = { .moveName = _("Steamroller") }, + .name = MOVE_NAME("Steamroller"), .description = COMPOUND_STRING("Crushes the foe with its\n" "body. May cause flinching."), .effect = EFFECT_HIT, @@ -10329,7 +10332,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_GUARD] = { - .name = { .moveName = _("Cotton Guard") }, + .name = MOVE_NAME("Cotton Guard"), .description = COMPOUND_STRING("Wraps its body in cotton.\n" "Drastically raises Defense."), .effect = EFFECT_DEFENSE_UP_3, @@ -10348,7 +10351,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_DAZE] = { - .name = { .moveName = _("Night Daze") }, + .name = MOVE_NAME("Night Daze"), .description = COMPOUND_STRING("Looses a pitch-black shock\n" "wave. May lower accuracy."), .effect = EFFECT_HIT, @@ -10368,7 +10371,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSTRIKE] = { - .name = { .moveName = _("Psystrike") }, + .name = MOVE_NAME("Psystrike"), .description = sPsyshockDescription, .effect = EFFECT_PSYSHOCK, .power = 100, @@ -10382,7 +10385,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_SLAP] = { - .name = { .moveName = _("Tail Slap") }, + .name = MOVE_NAME("Tail Slap"), .description = COMPOUND_STRING("Strikes the foe with its\n" "tail 2 to 5 times."), .effect = EFFECT_MULTI_HIT, @@ -10398,7 +10401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HURRICANE] = { - .name = { .moveName = _("Hurricane") }, + .name = MOVE_NAME("Hurricane"), .description = COMPOUND_STRING("Traps the foe in a fierce\n" "wind. May cause confusion."), .effect = EFFECT_THUNDER, @@ -10420,7 +10423,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_CHARGE] = { - .name = { .moveName = _("Head Charge") }, + .name = MOVE_NAME("Head Charge"), .description = COMPOUND_STRING("A charge using guard hair.\n" "It hurts the user a little."), .effect = EFFECT_HIT, @@ -10437,7 +10440,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_GRIND] = { - .name = { .moveName = _("Gear Grind") }, + .name = MOVE_NAME("Gear Grind"), .description = COMPOUND_STRING("Throws two steel gears\n" "that strike twice."), .effect = EFFECT_HIT, @@ -10454,7 +10457,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SEARING_SHOT] = { - .name = { .moveName = _("Searing Shot") }, + .name = MOVE_NAME("Searing Shot"), .description = sLavaPlumeDescription, .effect = EFFECT_HIT, .power = 100, @@ -10474,7 +10477,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TECHNO_BLAST] = { - .name = { .moveName = _("Techno Blast") }, + .name = MOVE_NAME("Techno Blast"), .description = COMPOUND_STRING("The type varies with the\n" "kind of Drive held."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, @@ -10491,7 +10494,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RELIC_SONG] = { - .name = { .moveName = _("Relic Song") }, + .name = MOVE_NAME("Relic Song"), .description = COMPOUND_STRING("Attacks with an ancient\n" "song. May induce sleep."), .effect = EFFECT_RELIC_SONG, @@ -10515,7 +10518,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_SWORD] = { - .name = { .moveName = _("Secret Sword") }, + .name = MOVE_NAME("Secret Sword"), .description = COMPOUND_STRING("Cuts with a long horn that\n" "does physical damage."), .effect = EFFECT_PSYSHOCK, @@ -10532,7 +10535,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIATE] = { - .name = { .moveName = _("Glaciate") }, + .name = MOVE_NAME("Glaciate"), .description = COMPOUND_STRING("Blows very cold air at the\n" "foe. It lowers their Speed."), .effect = EFFECT_HIT, @@ -10552,7 +10555,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_STRIKE] = { - .name = { .moveName = _("Bolt Strike") }, + .name = MOVE_NAME("Bolt Strike"), .description = COMPOUND_STRING("Strikes with a great amount\n" "of lightning. May paralyze."), .effect = EFFECT_HIT, @@ -10573,7 +10576,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLUE_FLARE] = { - .name = { .moveName = _("Blue Flare") }, + .name = MOVE_NAME("Blue Flare"), .description = COMPOUND_STRING("Engulfs the foe in a blue\n" "flame. May inflict a burn."), .effect = EFFECT_HIT, @@ -10593,7 +10596,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_DANCE] = { - .name = { .moveName = _("Fiery Dance") }, + .name = MOVE_NAME("Fiery Dance"), .description = COMPOUND_STRING("Dances cloaked in flames.\n" "May raise Sp. Atk."), .effect = EFFECT_HIT, @@ -10615,7 +10618,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_SHOCK] = { - .name = { .moveName = _("Freeze Shock") }, + .name = MOVE_NAME("Freeze Shock"), .description = COMPOUND_STRING("A powerful 2-turn move that\n" "may paralyze the foe."), .effect = EFFECT_TWO_TURNS_ATTACK, @@ -10639,7 +10642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BURN] = { - .name = { .moveName = _("Ice Burn") }, + .name = MOVE_NAME("Ice Burn"), .description = COMPOUND_STRING("A powerful 2-turn move that\n" "may inflict a burn."), .effect = EFFECT_TWO_TURNS_ATTACK, @@ -10663,7 +10666,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNARL] = { - .name = { .moveName = _("Snarl") }, + .name = MOVE_NAME("Snarl"), .description = COMPOUND_STRING("Yells and rants at the foe\n" "lowering its Sp. Atk."), .effect = EFFECT_HIT, @@ -10686,7 +10689,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_CRASH] = { - .name = { .moveName = _("Icicle Crash") }, + .name = MOVE_NAME("Icicle Crash"), .description = COMPOUND_STRING("Drops large icicles on the\n" "foe. May cause flinching."), .effect = EFFECT_HIT, @@ -10706,7 +10709,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_V_CREATE] = { - .name = { .moveName = _("V-create") }, + .name = MOVE_NAME("V-create"), .description = COMPOUND_STRING("Very powerful, but lowers\n" "Defense, Sp. Def and Speed."), .effect = EFFECT_HIT, @@ -10727,7 +10730,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_FLARE] = { - .name = { .moveName = _("Fusion Flare") }, + .name = MOVE_NAME("Fusion Flare"), .description = COMPOUND_STRING("Summons a fireball. Works\n" "well with a thunderbolt."), .effect = EFFECT_FUSION_COMBO, @@ -10743,7 +10746,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_BOLT] = { - .name = { .moveName = _("Fusion Bolt") }, + .name = MOVE_NAME("Fusion Bolt"), .description = COMPOUND_STRING("Summons a thunderbolt.\n" "Works well with a fireball."), .effect = EFFECT_FUSION_COMBO, @@ -10758,7 +10761,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLYING_PRESS] = { - .name = { .moveName = _("Flying Press") }, + .name = MOVE_NAME("Flying Press"), .description = COMPOUND_STRING("This attack does Fighting\n" "and Flying-type damage."), .effect = EFFECT_TWO_TYPED_MOVE, @@ -10778,7 +10781,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAT_BLOCK] = { - .name = { .moveName = _("Mat Block") }, + .name = MOVE_NAME("Mat Block"), .description = COMPOUND_STRING("Evades damaging moves\n" "for one turn."), .effect = EFFECT_MAT_BLOCK, @@ -10802,7 +10805,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BELCH] = { - .name = { .moveName = _("Belch") }, + .name = MOVE_NAME("Belch"), .description = COMPOUND_STRING("Lets out a loud belch.\n" "Must eat a Berry to use it."), .effect = EFFECT_BELCH, @@ -10825,7 +10828,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROTOTILLER] = { - .name = { .moveName = _("Rototiller") }, + .name = MOVE_NAME("Rototiller"), .description = COMPOUND_STRING("Ups the Attack and Sp. Atk\n" "of Grass-type Pokémon."), .effect = EFFECT_ROTOTILLER, @@ -10844,7 +10847,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STICKY_WEB] = { - .name = { .moveName = _("Sticky Web") }, + .name = MOVE_NAME("Sticky Web"), .description = COMPOUND_STRING("Weaves a sticky net that\n" "slows foes switching in."), .effect = EFFECT_STICKY_WEB, @@ -10864,7 +10867,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FELL_STINGER] = { - .name = { .moveName = _("Fell Stinger") }, + .name = MOVE_NAME("Fell Stinger"), .description = COMPOUND_STRING("If it knocks out a foe\n" "the Attack stat is raised."), .effect = EFFECT_FELL_STINGER, @@ -10881,9 +10884,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PHANTOM_FORCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Phantom Force") }, + .name = MOVE_NAME("Phantom Force"), #else - .name = { .moveName = _("PhantomForce") }, + .name = MOVE_NAME("PhantomForce"), #endif .description = sShadowForceDescription, .effect = EFFECT_SEMI_INVULNERABLE, @@ -10909,9 +10912,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_OR_TREAT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Trick-Or-Treat") }, + .name = MOVE_NAME("Trick-Or-Treat"), #else - .name = { .moveName = _("TrickOrTreat") }, + .name = MOVE_NAME("TrickOrTreat"), #endif .description = COMPOUND_STRING("Goes trick-or-treating\n" "making the foe Ghost-type."), @@ -10930,7 +10933,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOBLE_ROAR] = { - .name = { .moveName = _("Noble Roar") }, + .name = MOVE_NAME("Noble Roar"), .description = COMPOUND_STRING("Intimidates the foe, to cut\n" "Attack and Sp. Atk."), .effect = EFFECT_NOBLE_ROAR, @@ -10949,7 +10952,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ION_DELUGE] = { - .name = { .moveName = _("Ion Deluge") }, + .name = MOVE_NAME("Ion Deluge"), .description = COMPOUND_STRING("Electrifies Normal-type\n" "moves with charged atoms."), .effect = EFFECT_ION_DELUGE, @@ -10968,9 +10971,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARABOLIC_CHARGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Parabolic Charge") }, + .name = MOVE_NAME("Parabolic Charge"), #else - .name = { .moveName = _("ParabolcChrg") }, + .name = MOVE_NAME("ParabolcChrg"), #endif .description = COMPOUND_STRING("Damages adjacent Pokémon and\n" "heals up by half of it."), @@ -10988,9 +10991,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESTS_CURSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Forest's Curse") }, + .name = MOVE_NAME("Forest's Curse"), #else - .name = { .moveName = _("Forest'sCurs") }, + .name = MOVE_NAME("Forest'sCurs"), #endif .description = COMPOUND_STRING("Puts a curse on the foe\n" "making the foe Grass-type."), @@ -11010,9 +11013,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_BLIZZARD] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Petal Blizzard") }, + .name = MOVE_NAME("Petal Blizzard"), #else - .name = { .moveName = _("PetalBlizzrd") }, + .name = MOVE_NAME("PetalBlizzrd"), #endif .description = COMPOUND_STRING("Stirs up a violent storm\n" "of petals to attack."), @@ -11029,7 +11032,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_DRY] = { - .name = { .moveName = _("Freeze-Dry") }, + .name = MOVE_NAME("Freeze-Dry"), .description = COMPOUND_STRING("Super effective on Water-\n" "types. May cause freezing."), .effect = EFFECT_FREEZE_DRY, @@ -11050,9 +11053,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DISARMING_VOICE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Disarming Voice") }, + .name = MOVE_NAME("Disarming Voice"), #else - .name = { .moveName = _("DisrmngVoice") }, + .name = MOVE_NAME("DisrmngVoice"), #endif .description = COMPOUND_STRING("Lets out a charming cry\n" "that cannot be evaded."), @@ -11070,7 +11073,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARTING_SHOT] = { - .name = { .moveName = _("Parting Shot") }, + .name = MOVE_NAME("Parting Shot"), .description = COMPOUND_STRING("Lowers the foe's Attack and\n" "Sp. Atk, then switches out."), .effect = EFFECT_PARTING_SHOT, @@ -11089,7 +11092,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOPSY_TURVY] = { - .name = { .moveName = _("Topsy-Turvy") }, + .name = MOVE_NAME("Topsy-Turvy"), .description = COMPOUND_STRING("Swaps all stat changes that\n" "affect the target."), .effect = EFFECT_TOPSY_TURVY, @@ -11107,9 +11110,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAINING_KISS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Draining Kiss") }, + .name = MOVE_NAME("Draining Kiss"), #else - .name = { .moveName = _("DrainingKiss") }, + .name = MOVE_NAME("DrainingKiss"), #endif .description = sDrainingKissDescription, .effect = EFFECT_ABSORB, @@ -11128,9 +11131,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRAFTY_SHIELD] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Crafty Shield") }, + .name = MOVE_NAME("Crafty Shield"), #else - .name = { .moveName = _("CraftyShield") }, + .name = MOVE_NAME("CraftyShield"), #endif .description = COMPOUND_STRING("Evades status moves for\n" "one turn."), @@ -11152,9 +11155,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_SHIELD] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Flower Shield") }, + .name = MOVE_NAME("Flower Shield"), #else - .name = { .moveName = _("FlowerShield") }, + .name = MOVE_NAME("FlowerShield"), #endif .description = COMPOUND_STRING("Raises the Defense of\n" "Grass-type Pokémon."), @@ -11174,9 +11177,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_TERRAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Grassy Terrain") }, + .name = MOVE_NAME("Grassy Terrain"), #else - .name = { .moveName = _("GrssyTerrain") }, + .name = MOVE_NAME("GrssyTerrain"), #endif .description = COMPOUND_STRING("The ground turns to grass\n" "for 5 turns. Restores HP."), @@ -11197,9 +11200,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_TERRAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Misty Terrain") }, + .name = MOVE_NAME("Misty Terrain"), #else - .name = { .moveName = _("MistyTerrain") }, + .name = MOVE_NAME("MistyTerrain"), #endif .description = COMPOUND_STRING("Covers the ground with mist\n" "for 5 turns. Blocks status."), @@ -11219,7 +11222,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIFY] = { - .name = { .moveName = _("Electrify") }, + .name = MOVE_NAME("Electrify"), .description = COMPOUND_STRING("Electrifies the foe, making\n" "its next move Electric-type."), .effect = EFFECT_ELECTRIFY, @@ -11235,7 +11238,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_ROUGH] = { - .name = { .moveName = _("Play Rough") }, + .name = MOVE_NAME("Play Rough"), .description = COMPOUND_STRING("Plays rough with the foe.\n" "May lower Attack."), .effect = EFFECT_HIT, @@ -11256,7 +11259,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_WIND] = { - .name = { .moveName = _("Fairy Wind") }, + .name = MOVE_NAME("Fairy Wind"), .description = COMPOUND_STRING("Stirs up a fairy wind to\n" "strike the foe."), .effect = EFFECT_HIT, @@ -11272,7 +11275,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONBLAST] = { - .name = { .moveName = _("Moonblast") }, + .name = MOVE_NAME("Moonblast"), .description = COMPOUND_STRING("Attacks with the power of\n" "the moon. May lower Sp. Atk."), .effect = EFFECT_HIT, @@ -11292,7 +11295,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOOMBURST] = { - .name = { .moveName = _("Boomburst") }, + .name = MOVE_NAME("Boomburst"), .description = COMPOUND_STRING("Attacks everything with a\n" "destructive sound wave."), .effect = EFFECT_HIT, @@ -11309,7 +11312,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_LOCK] = { - .name = { .moveName = _("Fairy Lock") }, + .name = MOVE_NAME("Fairy Lock"), .description = COMPOUND_STRING("Locks down the battlefield\n" "preventing escape next turn."), .effect = EFFECT_FAIRY_LOCK, @@ -11328,9 +11331,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KINGS_SHIELD] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("King's Shield") }, + .name = MOVE_NAME("King's Shield"), #else - .name = { .moveName = _("King'sShield") }, + .name = MOVE_NAME("King'sShield"), #endif .description = COMPOUND_STRING("Evades damage, and sharply\n" "reduces Attack if struck."), @@ -11354,7 +11357,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_NICE] = { - .name = { .moveName = _("Play Nice") }, + .name = MOVE_NAME("Play Nice"), .description = COMPOUND_STRING("Befriend the foe, lowering\n" "its Attack without fail."), .effect = EFFECT_ATTACK_DOWN, @@ -11373,7 +11376,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CONFIDE] = { - .name = { .moveName = _("Confide") }, + .name = MOVE_NAME("Confide"), .description = COMPOUND_STRING("Shares a secret with the\n" "foe, lowering Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_DOWN, @@ -11394,9 +11397,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIAMOND_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Diamond Storm") }, + .name = MOVE_NAME("Diamond Storm"), #else - .name = { .moveName = _("DiamondStorm") }, + .name = MOVE_NAME("DiamondStorm"), #endif .description = COMPOUND_STRING("Whips up a storm of\n" "diamonds. May up Defense."), @@ -11418,9 +11421,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEAM_ERUPTION] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Steam Eruption") }, + .name = MOVE_NAME("Steam Eruption"), #else - .name = { .moveName = _("SteamErption") }, + .name = MOVE_NAME("SteamErption"), #endif .description = COMPOUND_STRING("Immerses the foe in heated\n" "steam. May inflict a burn."), @@ -11444,9 +11447,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_HOLE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Hyprspace Hole") }, + .name = MOVE_NAME("Hyprspace Hole"), #else - .name = { .moveName = _("HyprspceHole") }, + .name = MOVE_NAME("HyprspceHole"), #endif .description = sHyperspaceHoleDescription, .effect = EFFECT_HIT, @@ -11468,9 +11471,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SHURIKEN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Water Shuriken") }, + .name = MOVE_NAME("Water Shuriken"), #else - .name = { .moveName = _("WatrShuriken") }, + .name = MOVE_NAME("WatrShuriken"), #endif .description = COMPOUND_STRING("Throws 2 to 5 stars that\n" "are sure to strike first."), @@ -11487,9 +11490,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_FIRE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Mystical Fire") }, + .name = MOVE_NAME("Mystical Fire"), #else - .name = { .moveName = _("MysticalFire") }, + .name = MOVE_NAME("MysticalFire"), #endif .description = COMPOUND_STRING("Breathes a special, hot\n" "fire. Lowers Sp. Atk."), @@ -11510,7 +11513,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKY_SHIELD] = { - .name = { .moveName = _("Spiky Shield") }, + .name = MOVE_NAME("Spiky Shield"), .description = COMPOUND_STRING("Evades attack, and damages\n" "the foe if struck."), .effect = EFFECT_PROTECT, @@ -11533,9 +11536,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATIC_MIST] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Aromatic Mist") }, + .name = MOVE_NAME("Aromatic Mist"), #else - .name = { .moveName = _("AromaticMist") }, + .name = MOVE_NAME("AromaticMist"), #endif .description = COMPOUND_STRING("Raises the Sp. Def of a\n" "partner Pokémon."), @@ -11556,9 +11559,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_IMPULSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Eerie Impulse") }, + .name = MOVE_NAME("Eerie Impulse"), #else - .name = { .moveName = _("EerieImpulse") }, + .name = MOVE_NAME("EerieImpulse"), #endif .description = COMPOUND_STRING("Exposes the foe to a pulse\n" "that sharply cuts Sp. Atk."), @@ -11576,7 +11579,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VENOM_DRENCH] = { - .name = { .moveName = _("Venom Drench") }, + .name = MOVE_NAME("Venom Drench"), .description = COMPOUND_STRING("Lowers the Attack, Sp. Atk\n" "and Speed of a poisoned foe."), .effect = EFFECT_VENOM_DRENCH, @@ -11593,7 +11596,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER] = { - .name = { .moveName = _("Powder") }, + .name = MOVE_NAME("Powder"), .description = COMPOUND_STRING("Damages the foe if it uses\n" "a Fire-type move."), .effect = EFFECT_POWDER, @@ -11611,7 +11614,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEOMANCY] = { - .name = { .moveName = _("Geomancy") }, + .name = MOVE_NAME("Geomancy"), .description = COMPOUND_STRING("Raises Sp. Atk, Sp. Def and\n" "Speed on the 2nd turn."), .effect = EFFECT_GEOMANCY, @@ -11632,9 +11635,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNETIC_FLUX] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Magnetic Flux") }, + .name = MOVE_NAME("Magnetic Flux"), #else - .name = { .moveName = _("MagneticFlux") }, + .name = MOVE_NAME("MagneticFlux"), #endif .description = COMPOUND_STRING("Boosts the defenses of\n" "those with Plus or Minus."), @@ -11655,7 +11658,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HAPPY_HOUR] = { - .name = { .moveName = _("Happy Hour") }, + .name = MOVE_NAME("Happy Hour"), .description = COMPOUND_STRING("Doubles the amount of\n" "Prize Money received."), .effect = EFFECT_DO_NOTHING, @@ -11674,9 +11677,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIC_TERRAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Electric Terrain") }, + .name = MOVE_NAME("Electric Terrain"), #else - .name = { .moveName = _("ElctrcTrrain") }, + .name = MOVE_NAME("ElctrcTrrain"), #endif .description = COMPOUND_STRING("Electrifies the ground for\n" "5 turns. Prevents sleep."), @@ -11697,9 +11700,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DAZZLING_GLEAM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Dazzling Gleam") }, + .name = MOVE_NAME("Dazzling Gleam"), #else - .name = { .moveName = _("DazzlngGleam") }, + .name = MOVE_NAME("DazzlngGleam"), #endif .description = COMPOUND_STRING("Damages foes by emitting\n" "a bright flash."), @@ -11715,7 +11718,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CELEBRATE] = { - .name = { .moveName = _("Celebrate") }, + .name = MOVE_NAME("Celebrate"), .description = COMPOUND_STRING("Congratulates you on your\n" "special day."), .effect = EFFECT_DO_NOTHING, @@ -11739,7 +11742,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_HANDS] = { - .name = { .moveName = _("Hold Hands") }, + .name = MOVE_NAME("Hold Hands"), .description = COMPOUND_STRING("The user and ally hold hands\n" "making them happy."), .effect = EFFECT_DO_NOTHING, @@ -11764,9 +11767,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BABY_DOLL_EYES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Baby-Doll Eyes") }, + .name = MOVE_NAME("Baby-Doll Eyes"), #else - .name = { .moveName = _("BabyDollEyes") }, + .name = MOVE_NAME("BabyDollEyes"), #endif .description = COMPOUND_STRING("Lowers the foe's Attack\n" "before it can move."), @@ -11784,7 +11787,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NUZZLE] = { - .name = { .moveName = _("Nuzzle") }, + .name = MOVE_NAME("Nuzzle"), .description = COMPOUND_STRING("Rubs its cheecks against\n" "the foe, paralyzing it."), .effect = EFFECT_HIT, @@ -11805,7 +11808,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_BACK] = { - .name = { .moveName = _("Hold Back") }, + .name = MOVE_NAME("Hold Back"), .description = sFalseSwipeDescription, .effect = EFFECT_FALSE_SWIPE, .power = 40, @@ -11820,7 +11823,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFESTATION] = { - .name = { .moveName = _("Infestation") }, + .name = MOVE_NAME("Infestation"), .description = COMPOUND_STRING("The foe is infested and\n" "attacked for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, @@ -11840,9 +11843,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_UP_PUNCH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Power-Up Punch") }, + .name = MOVE_NAME("Power-Up Punch"), #else - .name = { .moveName = _("PowerUpPunch") }, + .name = MOVE_NAME("PowerUpPunch"), #endif .description = COMPOUND_STRING("A hard punch that raises\n" "the user's Attack."), @@ -11867,9 +11870,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBLIVION_WING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Oblivion Wing") }, + .name = MOVE_NAME("Oblivion Wing"), #else - .name = { .moveName = _("OblivionWing") }, + .name = MOVE_NAME("OblivionWing"), #endif .description = sDrainingKissDescription, .effect = EFFECT_ABSORB, @@ -11887,9 +11890,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_ARROWS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Thousand Arrows") }, + .name = MOVE_NAME("Thousand Arrows"), #else - .name = { .moveName = _("ThousndArrws") }, + .name = MOVE_NAME("ThousndArrws"), #endif .description = COMPOUND_STRING("Can hit Flying foes, then\n" "knocks them to the ground."), @@ -11913,9 +11916,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_WAVES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Thousand Waves") }, + .name = MOVE_NAME("Thousand Waves"), #else - .name = { .moveName = _("ThousndWaves") }, + .name = MOVE_NAME("ThousndWaves"), #endif .description = COMPOUND_STRING("Those hit by the wave can\n" "no longer escape."), @@ -11936,7 +11939,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LANDS_WRATH] = { - .name = { .moveName = _("Land's Wrath") }, + .name = MOVE_NAME("Land's Wrath"), .description = COMPOUND_STRING("Gathers the energy of the\n" "land to attack every foe."), .effect = EFFECT_HIT, @@ -11953,9 +11956,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_OF_RUIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Light Of Ruin") }, + .name = MOVE_NAME("Light Of Ruin"), #else - .name = { .moveName = _("LightOfRuin") }, + .name = MOVE_NAME("LightOfRuin"), #endif .description = COMPOUND_STRING("Fires a great beam of light\n" "that also hurts the user."), @@ -11973,7 +11976,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORIGIN_PULSE] = { - .name = { .moveName = _("Origin Pulse") }, + .name = MOVE_NAME("Origin Pulse"), .description = COMPOUND_STRING("Beams of glowing blue light\n" "blast both foes."), .effect = EFFECT_HIT, @@ -11991,9 +11994,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRECIPICE_BLADES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Precipice Blades") }, + .name = MOVE_NAME("Precipice Blades"), #else - .name = { .moveName = _("PrcipceBldes") }, + .name = MOVE_NAME("PrcipceBldes"), #endif .description = COMPOUND_STRING("Fearsome blades of stone\n" "attack both foes."), @@ -12011,9 +12014,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ASCENT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Dragon Ascent") }, + .name = MOVE_NAME("Dragon Ascent"), #else - .name = { .moveName = _("DragonAscent") }, + .name = MOVE_NAME("DragonAscent"), #endif .description = sCloseCombatDescription, .effect = EFFECT_HIT, @@ -12035,9 +12038,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_FURY] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Hyperspace Fury") }, + .name = MOVE_NAME("Hyperspace Fury"), #else - .name = { .moveName = _("HyprspceFury") }, + .name = MOVE_NAME("HyprspceFury"), #endif .description = sHyperspaceHoleDescription, .effect = EFFECT_HYPERSPACE_FURY, @@ -12062,7 +12065,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHORE_UP] = { - .name = { .moveName = _("Shore Up") }, + .name = MOVE_NAME("Shore Up"), .description = COMPOUND_STRING("Restores the user's HP.\n" "More HP in a sandstorm."), .effect = EFFECT_SHORE_UP, @@ -12083,9 +12086,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRST_IMPRESSION] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("First Impression") }, + .name = MOVE_NAME("First Impression"), #else - .name = { .moveName = _("FrstImpressn") }, + .name = MOVE_NAME("FrstImpressn"), #endif .description = COMPOUND_STRING("Hits hard and first.\n" "Only works first turn."), @@ -12103,9 +12106,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BANEFUL_BUNKER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Baneful Bunker") }, + .name = MOVE_NAME("Baneful Bunker"), #else - .name = { .moveName = _("BanefulBunkr") }, + .name = MOVE_NAME("BanefulBunkr"), #endif .description = COMPOUND_STRING("Protects user and poisons\n" "foes on contact."), @@ -12129,9 +12132,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_SHACKLE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Spirit Shackle") }, + .name = MOVE_NAME("Spirit Shackle"), #else - .name = { .moveName = _("SpiritShackl") }, + .name = MOVE_NAME("SpiritShackl"), #endif .description = COMPOUND_STRING("After being hit, foes can\n" "no longer escape."), @@ -12153,9 +12156,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARKEST_LARIAT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Darkest Lariat") }, + .name = MOVE_NAME("Darkest Lariat"), #else - .name = { .moveName = _("DarkstLariat") }, + .name = MOVE_NAME("DarkstLariat"), #endif .description = COMPOUND_STRING("Swings the arms to strike\n" "It ignores stat changes."), @@ -12174,9 +12177,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLING_ARIA] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Sparkling Aria") }, + .name = MOVE_NAME("Sparkling Aria"), #else - .name = { .moveName = _("SparklngAria") }, + .name = MOVE_NAME("SparklngAria"), #endif .description = COMPOUND_STRING("Sings with bubbles. Cures\n" "burns on contact."), @@ -12200,7 +12203,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_HAMMER] = { - .name = { .moveName = _("Ice Hammer") }, + .name = MOVE_NAME("Ice Hammer"), .description = COMPOUND_STRING("Swings the fist to strike.\n" "Lowers the user's Speed."), .effect = EFFECT_HIT, @@ -12222,9 +12225,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLORAL_HEALING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Floral Healng") }, + .name = MOVE_NAME("Floral Healng"), #else - .name = { .moveName = _("FloralHealng") }, + .name = MOVE_NAME("FloralHealng"), #endif .description = COMPOUND_STRING("Restores an ally's HP.\n" "Heals more on grass."), @@ -12246,9 +12249,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_HORSEPOWER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("High Horsepower") }, + .name = MOVE_NAME("High Horsepower"), #else - .name = { .moveName = _("HighHorsepwr") }, + .name = MOVE_NAME("HighHorsepwr"), #endif .description = COMPOUND_STRING("Slams hard into the foe with\n" "its entire body."), @@ -12265,7 +12268,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH_SAP] = { - .name = { .moveName = _("Strength Sap") }, + .name = MOVE_NAME("Strength Sap"), .description = COMPOUND_STRING("Saps the foe's Attack to\n" "heal HP, then drops Attack."), .effect = EFFECT_STRENGTH_SAP, @@ -12283,7 +12286,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BLADE] = { - .name = { .moveName = _("Solar Blade") }, + .name = MOVE_NAME("Solar Blade"), .description = COMPOUND_STRING("Charges first turn, then\n" "chops with a blade of light."), .effect = EFFECT_SOLAR_BEAM, @@ -12303,7 +12306,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAFAGE] = { - .name = { .moveName = _("Leafage") }, + .name = MOVE_NAME("Leafage"), .description = COMPOUND_STRING("Attacks with a flurry of\n" "small leaves."), .effect = EFFECT_HIT, @@ -12318,7 +12321,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPOTLIGHT] = { - .name = { .moveName = _("Spotlight") }, + .name = MOVE_NAME("Spotlight"), .description = COMPOUND_STRING("Makes the foe attack the\n" "spotlighted Pokémon."), .effect = EFFECT_FOLLOW_ME, @@ -12339,7 +12342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_THREAD] = { - .name = { .moveName = _("Toxic Thread") }, + .name = MOVE_NAME("Toxic Thread"), .description = COMPOUND_STRING("Attacks with a thread that\n" "poisons and drops Speed."), .effect = EFFECT_TOXIC_THREAD, @@ -12356,7 +12359,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASER_FOCUS] = { - .name = { .moveName = _("Laser Focus") }, + .name = MOVE_NAME("Laser Focus"), .description = COMPOUND_STRING("Guarantees the next move\n" "will be a critical hit."), .effect = EFFECT_LASER_FOCUS, @@ -12375,7 +12378,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_UP] = { - .name = { .moveName = _("Gear Up") }, + .name = MOVE_NAME("Gear Up"), .description = COMPOUND_STRING("Boosts the attacks of\n" "those with Plus or Minus."), .effect = EFFECT_GEAR_UP, @@ -12395,7 +12398,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THROAT_CHOP] = { - .name = { .moveName = _("Throat Chop") }, + .name = MOVE_NAME("Throat Chop"), .description = COMPOUND_STRING("Chops the throat to disable\n" "sound moves for a while."), .effect = EFFECT_HIT, @@ -12416,7 +12419,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLLEN_PUFF] = { - .name = { .moveName = _("Pollen Puff") }, + .name = MOVE_NAME("Pollen Puff"), .description = COMPOUND_STRING("Explodes on foes, but\n" "restores ally's HP."), .effect = EFFECT_HIT_ENEMY_HEAL_ALLY, @@ -12432,7 +12435,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ANCHOR_SHOT] = { - .name = { .moveName = _("Anchor Shot") }, + .name = MOVE_NAME("Anchor Shot"), .description = COMPOUND_STRING("Strangles the foe with a\n" "chain. The foe can't escape."), .effect = EFFECT_HIT, @@ -12454,9 +12457,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_TERRAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Psychic Terrain") }, + .name = MOVE_NAME("Psychic Terrain"), #else - .name = { .moveName = _("PsychcTrrain") }, + .name = MOVE_NAME("PsychcTrrain"), #endif .description = COMPOUND_STRING("The ground turns weird for\n" "5 turns. Blocks priority."), @@ -12475,7 +12478,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNGE] = { - .name = { .moveName = _("Lunge") }, + .name = MOVE_NAME("Lunge"), .description = COMPOUND_STRING("Lunges at the foe to lower\n" "its Attack stat."), .effect = EFFECT_HIT, @@ -12496,7 +12499,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_LASH] = { - .name = { .moveName = _("Fire Lash") }, + .name = MOVE_NAME("Fire Lash"), .description = COMPOUND_STRING("Whips the foe with fire\n" "lowering its Defense."), .effect = EFFECT_HIT, @@ -12517,7 +12520,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRIP] = { - .name = { .moveName = _("Power Trip") }, + .name = MOVE_NAME("Power Trip"), .description = COMPOUND_STRING("It hits harder the more\n" "stat boosts the user has."), .effect = EFFECT_STORED_POWER, @@ -12533,7 +12536,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURN_UP] = { - .name = { .moveName = _("Burn Up") }, + .name = MOVE_NAME("Burn Up"), .description = COMPOUND_STRING("Burns out the user fully\n" "removing the Fire type."), .effect = EFFECT_FAIL_IF_NOT_ARG_TYPE, @@ -12554,7 +12557,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPEED_SWAP] = { - .name = { .moveName = _("Speed Swap") }, + .name = MOVE_NAME("Speed Swap"), .description = COMPOUND_STRING("Swaps user's Speed with\n" "the target's."), .effect = EFFECT_SPEED_SWAP, @@ -12571,7 +12574,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMART_STRIKE] = { - .name = { .moveName = _("Smart Strike") }, + .name = MOVE_NAME("Smart Strike"), .description = COMPOUND_STRING("Hits with an accurate\n" "horn that never misses."), .effect = EFFECT_HIT, @@ -12587,7 +12590,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PURIFY] = { - .name = { .moveName = _("Purify") }, + .name = MOVE_NAME("Purify"), .description = COMPOUND_STRING("Cures the foe's status\n" "to restore HP."), .effect = EFFECT_PURIFY, @@ -12607,9 +12610,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVELATION_DANCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Revelation Dance") }, + .name = MOVE_NAME("Revelation Dance"), #else - .name = { .moveName = _("RvlationDnce") }, + .name = MOVE_NAME("RvlationDnce"), #endif .description = COMPOUND_STRING("Dances with mystical power.\n" "Matches user's first type."), @@ -12627,9 +12630,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORE_ENFORCER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Core Enforcer") }, + .name = MOVE_NAME("Core Enforcer"), #else - .name = { .moveName = _("CoreEnforcer") }, + .name = MOVE_NAME("CoreEnforcer"), #endif .description = COMPOUND_STRING("Hits with a ray that\n" "nullifies the foe's ability."), @@ -12649,7 +12652,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TROP_KICK] = { - .name = { .moveName = _("Trop Kick") }, + .name = MOVE_NAME("Trop Kick"), .description = COMPOUND_STRING("An intense kick from the\n" "tropics. Lowers Attack."), .effect = EFFECT_HIT, @@ -12670,7 +12673,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INSTRUCT] = { - .name = { .moveName = _("Instruct") }, + .name = MOVE_NAME("Instruct"), .description = COMPOUND_STRING("Orders the target to use\n" "its last move again."), .effect = EFFECT_INSTRUCT, @@ -12690,7 +12693,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAK_BLAST] = { - .name = { .moveName = _("Beak Blast") }, + .name = MOVE_NAME("Beak Blast"), .description = COMPOUND_STRING("Heats up beak to attack.\n" "Burns foe on contact."), .effect = EFFECT_BEAK_BLAST, @@ -12714,9 +12717,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGING_SCALES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Clanging Scales") }, + .name = MOVE_NAME("Clanging Scales"), #else - .name = { .moveName = _("ClngngScales") }, + .name = MOVE_NAME("ClngngScales"), #endif .description = COMPOUND_STRING("Makes a big noise with\n" "its scales. Drops Defense."), @@ -12739,9 +12742,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_HAMMER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Dragon Hammer") }, + .name = MOVE_NAME("Dragon Hammer"), #else - .name = { .moveName = _("DragonHammer") }, + .name = MOVE_NAME("DragonHammer"), #endif .description = COMPOUND_STRING("Swings its whole body\n" "like a hammer to damage."), @@ -12758,7 +12761,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRUTAL_SWING] = { - .name = { .moveName = _("Brutal Swing") }, + .name = MOVE_NAME("Brutal Swing"), .description = COMPOUND_STRING("Violently swings around\n" "to hurt everyone nearby."), .effect = EFFECT_HIT, @@ -12774,7 +12777,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_VEIL] = { - .name = { .moveName = _("Aurora Veil") }, + .name = MOVE_NAME("Aurora Veil"), .description = COMPOUND_STRING("Weakens all attacks, but\n" "only usable with hail."), .effect = EFFECT_AURORA_VEIL, @@ -12793,7 +12796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_TRAP] = { - .name = { .moveName = _("Shell Trap") }, + .name = MOVE_NAME("Shell Trap"), .description = COMPOUND_STRING("Sets a shell trap that\n" "damages on contact."), .effect = EFFECT_SHELL_TRAP, @@ -12815,7 +12818,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLEUR_CANNON] = { - .name = { .moveName = _("Fleur Cannon") }, + .name = MOVE_NAME("Fleur Cannon"), .description = COMPOUND_STRING("A strong ray that harshly\n" "lowers Sp. Attack."), .effect = EFFECT_HIT, @@ -12836,9 +12839,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_FANGS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Psychic Fangs") }, + .name = MOVE_NAME("Psychic Fangs"), #else - .name = { .moveName = _("PsychicFangs") }, + .name = MOVE_NAME("PsychicFangs"), #endif .description = COMPOUND_STRING("Chomps with psychic fangs.\n" "Destroys any barriers."), @@ -12857,9 +12860,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOMPING_TANTRUM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Stomping Tantrum") }, + .name = MOVE_NAME("Stomping Tantrum"), #else - .name = { .moveName = _("StmpngTantrm") }, + .name = MOVE_NAME("StmpngTantrm"), #endif .description = COMPOUND_STRING("Stomps around angrily.\n" "Stronger after a failure."), @@ -12877,7 +12880,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BONE] = { - .name = { .moveName = _("Shadow Bone") }, + .name = MOVE_NAME("Shadow Bone"), .description = COMPOUND_STRING("Strikes with a haunted\n" "bone. Might drop Defense."), .effect = EFFECT_HIT, @@ -12897,7 +12900,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACCELEROCK] = { - .name = { .moveName = _("Accelerock") }, + .name = MOVE_NAME("Accelerock"), .description = COMPOUND_STRING("Hits with a high-speed\n" "rock that always goes first."), .effect = EFFECT_HIT, @@ -12913,7 +12916,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIQUIDATION] = { - .name = { .moveName = _("Liquidation") }, + .name = MOVE_NAME("Liquidation"), .description = COMPOUND_STRING("Slams the foe with water.\n" "Can lower Defense."), .effect = EFFECT_HIT, @@ -12935,9 +12938,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PRISMATIC_LASER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Prismatic Laser") }, + .name = MOVE_NAME("Prismatic Laser"), #else - .name = { .moveName = _("PrsmaticLasr") }, + .name = MOVE_NAME("PrsmaticLasr"), #endif .description = COMPOUND_STRING("A high power laser that\n" "forces recharge next turn."), @@ -12958,9 +12961,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPECTRAL_THIEF] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Spectral Thief") }, + .name = MOVE_NAME("Spectral Thief"), #else - .name = { .moveName = _("SpectrlThief") }, + .name = MOVE_NAME("SpectrlThief"), #endif .description = COMPOUND_STRING("Steals the target's stat\n" "boosts, then attacks."), @@ -12983,9 +12986,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUNSTEEL_STRIKE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Sunsteel Strike") }, + .name = MOVE_NAME("Sunsteel Strike"), #else - .name = { .moveName = _("SnsteelStrke") }, + .name = MOVE_NAME("SnsteelStrke"), #endif .description = COMPOUND_STRING("A sun-fueled strike that\n" "ignores abilities."), @@ -13005,9 +13008,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONGEIST_BEAM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Moongeist Beam") }, + .name = MOVE_NAME("Moongeist Beam"), #else - .name = { .moveName = _("MoongestBeam") }, + .name = MOVE_NAME("MoongestBeam"), #endif .description = COMPOUND_STRING("A moon-powered beam that\n" "ignores abilities."), @@ -13025,7 +13028,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEARFUL_LOOK] = { - .name = { .moveName = _("Tearful Look") }, + .name = MOVE_NAME("Tearful Look"), .description = COMPOUND_STRING("The user tears up, dropping\n" "Attack and Sp. Attack."), .effect = EFFECT_NOBLE_ROAR, @@ -13043,7 +13046,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZING_ZAP] = { - .name = { .moveName = _("Zing Zap") }, + .name = MOVE_NAME("Zing Zap"), .description = COMPOUND_STRING("An electrified impact that\n" "can cause flinching."), .effect = EFFECT_HIT, @@ -13064,9 +13067,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NATURES_MADNESS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Nature's Madness") }, + .name = MOVE_NAME("Nature's Madness"), #else - .name = { .moveName = _("Natur'sMadns") }, + .name = MOVE_NAME("Natur'sMadns"), #endif .description = COMPOUND_STRING("Halves the foe's HP with\n" "the power of nature."), @@ -13083,7 +13086,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MULTI_ATTACK] = { - .name = { .moveName = _("Multi-Attack") }, + .name = MOVE_NAME("Multi-Attack"), .description = COMPOUND_STRING("An attack that changes\n" "with Memories."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, @@ -13100,7 +13103,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_BLOWN] = { - .name = { .moveName = _("Mind Blown") }, + .name = MOVE_NAME("Mind Blown"), .description = COMPOUND_STRING("It explodes the user's head\n" "to damage everything around."), .effect = EFFECT_MIND_BLOWN, @@ -13116,7 +13119,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PLASMA_FISTS] = { - .name = { .moveName = _("Plasma Fists") }, + .name = MOVE_NAME("Plasma Fists"), .description = COMPOUND_STRING("Hits with electrical fists.\n" "Normal moves become Electric."), .effect = EFFECT_PLASMA_FISTS, @@ -13135,9 +13138,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PHOTON_GEYSER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Photon Geyser") }, + .name = MOVE_NAME("Photon Geyser"), #else - .name = { .moveName = _("PhotonGeyser") }, + .name = MOVE_NAME("PhotonGeyser"), #endif .description = COMPOUND_STRING("User's highest attack stat\n" "determines its category."), @@ -13155,7 +13158,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZIPPY_ZAP] = { - .name = { .moveName = _("Zippy Zap") }, + .name = MOVE_NAME("Zippy Zap"), .description = COMPOUND_STRING("Electric bursts always go\n" "first and land a critical hit."), .effect = EFFECT_HIT, @@ -13182,9 +13185,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPLISHY_SPLASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Splishy Splash") }, + .name = MOVE_NAME("Splishy Splash"), #else - .name = { .moveName = _("SplishySplsh") }, + .name = MOVE_NAME("SplishySplsh"), #endif .description = COMPOUND_STRING("A huge electrified wave that\n" "may paralyze the foe."), @@ -13207,7 +13210,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOATY_FALL] = { - .name = { .moveName = _("Floaty Fall") }, + .name = MOVE_NAME("Floaty Fall"), .description = COMPOUND_STRING("Floats in air and dives at\n" "angle. May cause flinching."), .effect = EFFECT_HIT, @@ -13231,7 +13234,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIKA_PAPOW] = { - .name = { .moveName = _("Pika Papow") }, + .name = MOVE_NAME("Pika Papow"), .description = COMPOUND_STRING("Pikachu's love increases its\n" "power. It never misses."), .effect = EFFECT_RETURN, @@ -13249,9 +13252,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCY_BUBBLE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Bouncy Bubble") }, + .name = MOVE_NAME("Bouncy Bubble"), #else - .name = { .moveName = _("BouncyBubble") }, + .name = MOVE_NAME("BouncyBubble"), #endif .description = COMPOUND_STRING("An attack that absorbs\n" #if B_UPDATED_MOVE_DATA >= GEN_8 @@ -13275,7 +13278,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUZZY_BUZZ] = { - .name = { .moveName = _("Buzzy Buzz") }, + .name = MOVE_NAME("Buzzy Buzz"), .description = COMPOUND_STRING("Shoots a jolt of electricity\n" "that always paralyzes."), .effect = EFFECT_HIT, @@ -13296,7 +13299,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIZZLY_SLIDE] = { - .name = { .moveName = _("Sizzly Slide") }, + .name = MOVE_NAME("Sizzly Slide"), .description = COMPOUND_STRING("User cloaked in fire charges.\n" "Leaves the foe with a burn."), .effect = EFFECT_HIT, @@ -13319,7 +13322,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLITZY_GLOW] = { - .name = { .moveName = _("Glitzy Glow") }, + .name = MOVE_NAME("Glitzy Glow"), .description = COMPOUND_STRING("Telekinetic force that sets\n" "wall, lowering Sp. Atk damage."), .effect = EFFECT_GLITZY_GLOW, @@ -13336,7 +13339,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BADDY_BAD] = { - .name = { .moveName = _("Baddy Bad") }, + .name = MOVE_NAME("Baddy Bad"), .description = COMPOUND_STRING("Acting badly, attacks. Sets\n" "wall, lowering Attack damage."), .effect = EFFECT_BADDY_BAD, @@ -13353,7 +13356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAPPY_SEED] = { - .name = { .moveName = _("Sappy Seed") }, + .name = MOVE_NAME("Sappy Seed"), .description = COMPOUND_STRING("Giant stalk scatters seeds\n" "that drain HP every turn."), .effect = EFFECT_SAPPY_SEED, @@ -13371,7 +13374,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZY_FROST] = { - .name = { .moveName = _("Freezy Frost") }, + .name = MOVE_NAME("Freezy Frost"), .description = COMPOUND_STRING("Crystal from cold haze hits.\n" "Eliminates all stat changes."), .effect = EFFECT_FREEZY_FROST, @@ -13389,9 +13392,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLY_SWIRL] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Sparkly Swirl") }, + .name = MOVE_NAME("Sparkly Swirl"), #else - .name = { .moveName = _("SparklySwirl") }, + .name = MOVE_NAME("SparklySwirl"), #endif .description = COMPOUND_STRING("Wrap foe with whirlwind of\n" "scent. Heals party's status."), @@ -13410,9 +13413,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VEEVEE_VOLLEY] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Veevee Volley") }, + .name = MOVE_NAME("Veevee Volley"), #else - .name = { .moveName = _("VeeveeVolley") }, + .name = MOVE_NAME("VeeveeVolley"), #endif .description = COMPOUND_STRING("Eevee's love increases its\n" "power. It never misses."), @@ -13432,9 +13435,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_IRON_BASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Double Iron Bash") }, + .name = MOVE_NAME("Double Iron Bash"), #else - .name = { .moveName = _("DublIronBash") }, + .name = MOVE_NAME("DublIronBash"), #endif .description = COMPOUND_STRING("The user spins and hits with\n" "its arms. May cause flinch."), @@ -13461,9 +13464,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMAX_CANNON] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Dynamax Cannon") }, + .name = MOVE_NAME("Dynamax Cannon"), #else - .name = { .moveName = _("DynamxCannon") }, + .name = MOVE_NAME("DynamxCannon"), #endif .description = COMPOUND_STRING("Fires a strong beam. Deals\n" "2x damage to Dynamaxed foes."), @@ -13488,7 +13491,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNIPE_SHOT] = { - .name = { .moveName = _("Snipe Shot") }, + .name = MOVE_NAME("Snipe Shot"), .description = COMPOUND_STRING("The user ignores effects\n" "that draw in moves."), .effect = EFFECT_SNIPE_SHOT, @@ -13504,7 +13507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JAW_LOCK] = { - .name = { .moveName = _("Jaw Lock") }, + .name = MOVE_NAME("Jaw Lock"), .description = COMPOUND_STRING("Prevents the user and\n" "the target from escaping."), .effect = EFFECT_HIT, @@ -13524,7 +13527,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STUFF_CHEEKS] = { - .name = { .moveName = _("Stuff Cheeks") }, + .name = MOVE_NAME("Stuff Cheeks"), .description = COMPOUND_STRING("Consumes the user's Berry,\n" "then sharply raises Def."), .effect = EFFECT_STUFF_CHEEKS, @@ -13542,7 +13545,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NO_RETREAT] = { - .name = { .moveName = _("No Retreat") }, + .name = MOVE_NAME("No Retreat"), .description = COMPOUND_STRING("Raises all of the user's\n" "stats but prevents escape."), .effect = EFFECT_NO_RETREAT, @@ -13560,7 +13563,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAR_SHOT] = { - .name = { .moveName = _("Tar Shot") }, + .name = MOVE_NAME("Tar Shot"), .description = COMPOUND_STRING("Lowers the foe's Speed and\n" "makes it weak to Fire."), .effect = EFFECT_TAR_SHOT, @@ -13576,7 +13579,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_POWDER] = { - .name = { .moveName = _("Magic Powder") }, + .name = MOVE_NAME("Magic Powder"), .description = COMPOUND_STRING("Magic powder changes the\n" "target into a Psychic-type."), .effect = EFFECT_SOAK, @@ -13594,7 +13597,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DARTS] = { - .name = { .moveName = _("Dragon Darts") }, + .name = MOVE_NAME("Dragon Darts"), .description = COMPOUND_STRING("The user attacks twice. Two\n" "targets are hit once each."), .effect = EFFECT_HIT, // TODO: EFFECT_DRAGON_DARTS @@ -13611,7 +13614,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEATIME] = { - .name = { .moveName = _("Teatime") }, + .name = MOVE_NAME("Teatime"), .description = COMPOUND_STRING("All Pokémon have teatime\n" "and eat their Berries."), .effect = EFFECT_TEATIME, @@ -13629,7 +13632,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OCTOLOCK] = { - .name = { .moveName = _("Octolock") }, + .name = MOVE_NAME("Octolock"), .description = COMPOUND_STRING("Traps the foe to lower Def\n" "and Sp. Def fall each turn."), .effect = EFFECT_OCTOLOCK, @@ -13644,7 +13647,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_BEAK] = { - .name = { .moveName = _("Bolt Beak") }, + .name = MOVE_NAME("Bolt Beak"), .description = COMPOUND_STRING("Double power if the user\n" "moves before the target."), .effect = EFFECT_BOLT_BEAK, @@ -13661,9 +13664,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FISHIOUS_REND] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Fishious Rend") }, + .name = MOVE_NAME("Fishious Rend"), #else - .name = { .moveName = _("FishiousRend") }, + .name = MOVE_NAME("FishiousRend"), #endif .description = COMPOUND_STRING("Double power if the user\n" "moves before the target."), @@ -13681,7 +13684,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COURT_CHANGE] = { - .name = { .moveName = _("Court Change") }, + .name = MOVE_NAME("Court Change"), .description = COMPOUND_STRING("The user swaps effects on\n" "either side of the field."), .effect = EFFECT_COURT_CHANGE, @@ -13698,9 +13701,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGOROUS_SOUL] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Clangorous Soul") }, + .name = MOVE_NAME("Clangorous Soul"), #else - .name = { .moveName = _("ClngrousSoul") }, + .name = MOVE_NAME("ClngrousSoul"), #endif .description = COMPOUND_STRING("The user uses some of its\n" "HP to raise all its stats."), @@ -13722,7 +13725,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_PRESS] = { - .name = { .moveName = _("Body Press") }, + .name = MOVE_NAME("Body Press"), .description = COMPOUND_STRING("Does more damage the\n" "higher the user's Def."), .effect = EFFECT_BODY_PRESS, @@ -13740,7 +13743,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DECORATE] = { - .name = { .moveName = _("Decorate") }, + .name = MOVE_NAME("Decorate"), .description = COMPOUND_STRING("The user sharply raises\n" "the target's Atk and Sp.Atk"), .effect = EFFECT_DECORATE, @@ -13758,7 +13761,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRUM_BEATING] = { - .name = { .moveName = _("Drum Beating") }, + .name = MOVE_NAME("Drum Beating"), .description = COMPOUND_STRING("Plays a drum to attack.\n" "The foe's Speed is lowered."), .effect = EFFECT_HIT, @@ -13779,7 +13782,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNAP_TRAP] = { - .name = { .moveName = _("Snap Trap") }, + .name = MOVE_NAME("Snap Trap"), .description = COMPOUND_STRING("Snares the target in a snap\n" "trap for four to five turns."), .effect = EFFECT_HIT, @@ -13800,7 +13803,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PYRO_BALL] = { - .name = { .moveName = _("Pyro Ball") }, + .name = MOVE_NAME("Pyro Ball"), .description = COMPOUND_STRING("Launches a fiery ball at the\n" "target. It may cause a burn."), .effect = EFFECT_HIT, @@ -13824,9 +13827,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BLADE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Behemoth Blade") }, + .name = MOVE_NAME("Behemoth Blade"), #else - .name = { .moveName = _("BehemthBlade") }, + .name = MOVE_NAME("BehemthBlade"), #endif .description = COMPOUND_STRING("Strikes as a sword. Deals 2x\n" "damage to Dynamaxed foes."), @@ -13849,9 +13852,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Behemoth Bash") }, + .name = MOVE_NAME("Behemoth Bash"), #else - .name = { .moveName = _("BehemothBash") }, + .name = MOVE_NAME("BehemothBash"), #endif .description = COMPOUND_STRING("Attacks as a shield. Deals 2x\n" "damage to Dynamaxed foes."), @@ -13872,7 +13875,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_WHEEL] = { - .name = { .moveName = _("Aura Wheel") }, + .name = MOVE_NAME("Aura Wheel"), .description = COMPOUND_STRING("Raises Speed to attack. The\n" "Type is based on its form."), .effect = EFFECT_AURA_WHEEL, @@ -13895,9 +13898,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BREAKING_SWIPE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Breaking Swipe") }, + .name = MOVE_NAME("Breaking Swipe"), #else - .name = { .moveName = _("BreakngSwipe") }, + .name = MOVE_NAME("BreakngSwipe"), #endif .description = COMPOUND_STRING("Swings its tail to attack.\n" "Lowers the Atk of those hit."), @@ -13920,7 +13923,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BRANCH_POKE] = { - .name = { .moveName = _("Branch Poke") }, + .name = MOVE_NAME("Branch Poke"), .description = COMPOUND_STRING("The user pokes the target\n" "with a pointed branch."), .effect = EFFECT_HIT, @@ -13937,7 +13940,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OVERDRIVE] = { - .name = { .moveName = _("Overdrive") }, + .name = MOVE_NAME("Overdrive"), .description = COMPOUND_STRING("The user twangs its guitar,\n" "causing strong vibrations."), .effect = EFFECT_HIT, @@ -13955,7 +13958,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_APPLE_ACID] = { - .name = { .moveName = _("Apple Acid") }, + .name = MOVE_NAME("Apple Acid"), .description = COMPOUND_STRING("Attacks with tart apple acid\n" "to lower the foe's Sp. Def."), .effect = EFFECT_HIT, @@ -13976,7 +13979,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRAV_APPLE] = { - .name = { .moveName = _("Grav Apple") }, + .name = MOVE_NAME("Grav Apple"), .description = COMPOUND_STRING("Drops an apple from above.\n" "Lowers the foe's Defense."), .effect = EFFECT_GRAV_APPLE, @@ -13997,7 +14000,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_BREAK] = { - .name = { .moveName = _("Spirit Break") }, + .name = MOVE_NAME("Spirit Break"), .description = COMPOUND_STRING("Attacks with spirit-breaking\n" "force. Lowers Sp. Atk."), .effect = EFFECT_HIT, @@ -14020,9 +14023,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRANGE_STEAM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Strange Steam") }, + .name = MOVE_NAME("Strange Steam"), #else - .name = { .moveName = _("StrangeSteam") }, + .name = MOVE_NAME("StrangeSteam"), #endif .description = COMPOUND_STRING("Emits a strange steam to\n" "potentially confuse the foe."), @@ -14044,7 +14047,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LIFE_DEW] = { - .name = { .moveName = _("Life Dew") }, + .name = MOVE_NAME("Life Dew"), .description = COMPOUND_STRING("Scatters water to restore\n" "the HP of itself and allies."), .effect = EFFECT_JUNGLE_HEALING, @@ -14065,7 +14068,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OBSTRUCT] = { - .name = { .moveName = _("Obstruct") }, + .name = MOVE_NAME("Obstruct"), .description = COMPOUND_STRING("Protects itself, harshly\n" "lowering Def on contact."), .effect = EFFECT_PROTECT, @@ -14086,9 +14089,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SURRENDER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("False Surrender") }, + .name = MOVE_NAME("False Surrender"), #else - .name = { .moveName = _("FalsSurrendr") }, + .name = MOVE_NAME("FalsSurrendr"), #endif .description = COMPOUND_STRING("Bows to stab the foe\n" "with hair. It never misses."), @@ -14107,9 +14110,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_ASSAULT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Meteor Assault") }, + .name = MOVE_NAME("Meteor Assault"), #else - .name = { .moveName = _("MeteorAssalt") }, + .name = MOVE_NAME("MeteorAssalt"), #endif .description = COMPOUND_STRING("Attacks with a thick leek.\n" "The user must then rest."), @@ -14131,7 +14134,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ETERNABEAM] = { - .name = { .moveName = _("Eternabeam") }, + .name = MOVE_NAME("Eternabeam"), .description = COMPOUND_STRING("Eternatus' strongest move.\n" "The user rests next turn."), .effect = EFFECT_HIT, @@ -14151,7 +14154,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_BEAM] = { - .name = { .moveName = _("Steel Beam") }, + .name = MOVE_NAME("Steel Beam"), .description = COMPOUND_STRING("Fires a beam of steel from\n" "its body. It hurts the user."), .effect = EFFECT_MAX_HP_50_RECOIL, @@ -14168,9 +14171,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXPANDING_FORCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Expanding Force") }, + .name = MOVE_NAME("Expanding Force"), #else - .name = { .moveName = _("ExpandngForc") }, + .name = MOVE_NAME("ExpandngForc"), #endif .description = COMPOUND_STRING("Power goes up and damages\n" "all foes on Psychic Terrain."), @@ -14186,7 +14189,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_ROLLER] = { - .name = { .moveName = _("Steel Roller") }, + .name = MOVE_NAME("Steel Roller"), .description = COMPOUND_STRING("Destroys terrain. Fails if\n" "ground isn't terrain."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, @@ -14204,7 +14207,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCALE_SHOT] = { - .name = { .moveName = _("Scale Shot") }, + .name = MOVE_NAME("Scale Shot"), .description = COMPOUND_STRING("Shoots scales 2 to 5 times.\n" "Ups Speed, lowers defense."), .effect = EFFECT_MULTI_HIT, @@ -14220,7 +14223,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_BEAM] = { - .name = { .moveName = _("Meteor Beam") }, + .name = MOVE_NAME("Meteor Beam"), .description = COMPOUND_STRING("A 2-turn move that raises\n" "Sp. Attack before attacking."), .effect = EFFECT_METEOR_BEAM, @@ -14243,9 +14246,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SIDE_ARM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Shell Side Arm") }, + .name = MOVE_NAME("Shell Side Arm"), #else - .name = { .moveName = _("ShellSideArm") }, + .name = MOVE_NAME("ShellSideArm"), #endif .description = COMPOUND_STRING("Deals better of physical and\n" "special damage. May poison."), @@ -14267,9 +14270,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_EXPLOSION] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Misty Explosion") }, + .name = MOVE_NAME("Misty Explosion"), #else - .name = { .moveName = _("MstyExplsion") }, + .name = MOVE_NAME("MstyExplsion"), #endif .description = COMPOUND_STRING("Hit everything and faint.\n" "Powers up on Misty Terrain."), @@ -14285,7 +14288,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_GLIDE] = { - .name = { .moveName = _("Grassy Glide") }, + .name = MOVE_NAME("Grassy Glide"), .description = COMPOUND_STRING("Gliding on ground, hits. Goes\n" "first on Grassy Terrain."), .effect = EFFECT_GRASSY_GLIDE, @@ -14303,9 +14306,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RISING_VOLTAGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Rising Voltage") }, + .name = MOVE_NAME("Rising Voltage"), #else - .name = { .moveName = _("RisngVoltage") }, + .name = MOVE_NAME("RisngVoltage"), #endif .description = COMPOUND_STRING("This move's power doubles\n" "when on Electric Terrain."), @@ -14322,9 +14325,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERRAIN_PULSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Terrain Pulse") }, + .name = MOVE_NAME("Terrain Pulse"), #else - .name = { .moveName = _("TerrainPulse") }, + .name = MOVE_NAME("TerrainPulse"), #endif .description = COMPOUND_STRING("Type and power changes\n" "depending on the terrain."), @@ -14342,9 +14345,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKITTER_SMACK] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Skitter Smack") }, + .name = MOVE_NAME("Skitter Smack"), #else - .name = { .moveName = _("SkitterSmack") }, + .name = MOVE_NAME("SkitterSmack"), #endif .description = COMPOUND_STRING("User skitters behind foe to\n" "attack. Lowers foe's Sp. Atk."), @@ -14367,9 +14370,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_JEALOUSY] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Burning Jealousy") }, + .name = MOVE_NAME("Burning Jealousy"), #else - .name = { .moveName = _("BrningJelosy") }, + .name = MOVE_NAME("BrningJelosy"), #endif .description = COMPOUND_STRING("Foes that have stats upped\n" "during the turn get burned."), @@ -14391,7 +14394,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LASH_OUT] = { - .name = { .moveName = _("Lash Out") }, + .name = MOVE_NAME("Lash Out"), .description = COMPOUND_STRING("If stats lowered during this\n" "turn, power is doubled."), .effect = EFFECT_LASH_OUT, @@ -14407,7 +14410,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POLTERGEIST] = { - .name = { .moveName = _("Poltergeist") }, + .name = MOVE_NAME("Poltergeist"), .description = COMPOUND_STRING("Control foe's item to attack.\n" "Fails if foe has no item."), .effect = EFFECT_POLTERGEIST, @@ -14423,9 +14426,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CORROSIVE_GAS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Corrosive Gas") }, + .name = MOVE_NAME("Corrosive Gas"), #else - .name = { .moveName = _("CorrosiveGas") }, + .name = MOVE_NAME("CorrosiveGas"), #endif .description = COMPOUND_STRING("Highly acidic gas melts items\n" "held by surrounding Pokémon."), @@ -14442,7 +14445,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COACHING] = { - .name = { .moveName = _("Coaching") }, + .name = MOVE_NAME("Coaching"), .description = COMPOUND_STRING("Properly coaches allies to\n" "up their Attack and Defense."), .effect = EFFECT_COACHING, @@ -14460,7 +14463,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLIP_TURN] = { - .name = { .moveName = _("Flip Turn") }, + .name = MOVE_NAME("Flip Turn"), .description = COMPOUND_STRING("Attacks and rushes back to\n" "switch with a party Pokémon."), .effect = EFFECT_HIT_ESCAPE, @@ -14476,7 +14479,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_AXEL] = { - .name = { .moveName = _("Triple Axel") }, + .name = MOVE_NAME("Triple Axel"), .description = COMPOUND_STRING("A 3-kick attack that gets\n" "more powerful with each hit."), .effect = EFFECT_TRIPLE_KICK, @@ -14494,9 +14497,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_WINGBEAT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Dual Wingbeat") }, + .name = MOVE_NAME("Dual Wingbeat"), #else - .name = { .moveName = _("DualWingbeat") }, + .name = MOVE_NAME("DualWingbeat"), #endif .description = COMPOUND_STRING("User slams the target with\n" "wings and hits twice in a row."), @@ -14515,9 +14518,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCORCHING_SANDS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Scorching Sands") }, + .name = MOVE_NAME("Scorching Sands"), #else - .name = { .moveName = _("ScorchngSnds") }, + .name = MOVE_NAME("ScorchngSnds"), #endif .description = COMPOUND_STRING("Throws scorching sand at\n" "the target. May leave a burn."), @@ -14540,9 +14543,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JUNGLE_HEALING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Jungle Healng") }, + .name = MOVE_NAME("Jungle Healng"), #else - .name = { .moveName = _("JungleHealng") }, + .name = MOVE_NAME("JungleHealng"), #endif .description = COMPOUND_STRING("Heals HP and status of\n" "itself and allies in battle."), @@ -14563,7 +14566,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_BLOW] = { - .name = { .moveName = _("Wicked Blow") }, + .name = MOVE_NAME("Wicked Blow"), .description = COMPOUND_STRING("Mastering the Dark style,\n" "strikes with a critical hit."), .effect = EFFECT_HIT, @@ -14583,9 +14586,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURGING_STRIKES] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Surging Strikes") }, + .name = MOVE_NAME("Surging Strikes"), #else - .name = { .moveName = _("SurgngStrkes") }, + .name = MOVE_NAME("SurgngStrkes"), #endif .description = COMPOUND_STRING("Mastering the Water style,\n" "strikes with 3 critical hits."), @@ -14606,7 +14609,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_CAGE] = { - .name = { .moveName = _("Thunder Cage") }, + .name = MOVE_NAME("Thunder Cage"), .description = COMPOUND_STRING("Traps the foe in a cage of\n" "electricity for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, @@ -14626,9 +14629,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ENERGY] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Dragon Energy") }, + .name = MOVE_NAME("Dragon Energy"), #else - .name = { .moveName = _("DragonEnergy") }, + .name = MOVE_NAME("DragonEnergy"), #endif .description = COMPOUND_STRING("The higher the user's HP\n" "the more damage caused."), @@ -14646,9 +14649,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZING_GLARE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Freezing Glare") }, + .name = MOVE_NAME("Freezing Glare"), #else - .name = { .moveName = _("FreezngGlare") }, + .name = MOVE_NAME("FreezngGlare"), #endif .description = COMPOUND_STRING("Shoots psychic power from\n" #if B_USE_FROSTBITE == TRUE @@ -14674,7 +14677,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_WRATH] = { - .name = { .moveName = _("Fiery Wrath") }, + .name = MOVE_NAME("Fiery Wrath"), .description = COMPOUND_STRING("An attack fueled by your\n" "wrath. May cause flinching."), .effect = EFFECT_HIT, @@ -14695,9 +14698,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDEROUS_KICK] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Thunderous Kick") }, + .name = MOVE_NAME("Thunderous Kick"), #else - .name = { .moveName = _("ThnderusKick") }, + .name = MOVE_NAME("ThnderusKick"), #endif .description = COMPOUND_STRING("Uses a lightning-like kick\n" "to hit. Lowers foe's Defense."), @@ -14721,9 +14724,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIAL_LANCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Glacial Lance") }, + .name = MOVE_NAME("Glacial Lance"), #else - .name = { .moveName = _("GlacialLance") }, + .name = MOVE_NAME("GlacialLance"), #endif .description = COMPOUND_STRING("Strikes by hurling a blizzard-\n" "cloaked icicle lance at foes."), @@ -14741,9 +14744,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASTRAL_BARRAGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Astral Barrage") }, + .name = MOVE_NAME("Astral Barrage"), #else - .name = { .moveName = _("AstrlBarrage") }, + .name = MOVE_NAME("AstrlBarrage"), #endif .description = COMPOUND_STRING("Strikes by sending a frightful\n" "amount of ghosts at foes."), @@ -14760,7 +14763,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_SPELL] = { - .name = { .moveName = _("Eerie Spell") }, + .name = MOVE_NAME("Eerie Spell"), .description = COMPOUND_STRING("Attacks with psychic power.\n" "Foe's last move has 3 PP cut."), .effect = EFFECT_EERIE_SPELL, @@ -14778,7 +14781,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIRE_CLAW] = { - .name = { .moveName = _("Dire Claw") }, + .name = MOVE_NAME("Dire Claw"), .description = COMPOUND_STRING("High critical hit chance. May\n" "paralyze, poison or drowse."), .effect = EFFECT_HIT, @@ -14800,9 +14803,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHIELD_BASH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Psyshield Bash") }, + .name = MOVE_NAME("Psyshield Bash"), #else - .name = { .moveName = _("PsyshieldBsh") }, + .name = MOVE_NAME("PsyshieldBsh"), #endif .description = COMPOUND_STRING("Hits a foe with psychic\n" "energy. May raise Defense."), @@ -14825,7 +14828,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SHIFT] = { - .name = { .moveName = _("Power Shift") }, + .name = MOVE_NAME("Power Shift"), .description = COMPOUND_STRING("The user swaps its Attack\n" "and Defense stats."), .effect = EFFECT_POWER_TRICK, @@ -14844,7 +14847,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_AXE] = { - .name = { .moveName = _("Stone Axe") }, + .name = MOVE_NAME("Stone Axe"), .description = COMPOUND_STRING("High critical hit ratio. Sets\n" "Splinters that hurt the foe."), .effect = EFFECT_HIT, @@ -14867,9 +14870,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPRINGTIDE_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Springtide Storm") }, + .name = MOVE_NAME("Springtide Storm"), #else - .name = { .moveName = _("SprngtdeStrm") }, + .name = MOVE_NAME("SprngtdeStrm"), #endif .description = COMPOUND_STRING("Wraps a foe in fierce winds.\n" "Varies with the user's form."), @@ -14893,9 +14896,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_POWER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Mystical Power") }, + .name = MOVE_NAME("Mystical Power"), #else - .name = { .moveName = _("MystcalPower") }, + .name = MOVE_NAME("MystcalPower"), #endif .description = COMPOUND_STRING("A mysterious power strikes,\n" "raising the user's Sp. Atk."), @@ -14917,7 +14920,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_FURY] = { - .name = { .moveName = _("Raging Fury") }, + .name = MOVE_NAME("Raging Fury"), .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" "that confuses the user."), .effect = EFFECT_HIT, @@ -14937,7 +14940,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAVE_CRASH] = { - .name = { .moveName = _("Wave Crash") }, + .name = MOVE_NAME("Wave Crash"), .description = COMPOUND_STRING("A slam shrouded in water.\n" "It also hurts the user."), .effect = EFFECT_HIT, @@ -14955,7 +14958,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHLOROBLAST] = { - .name = { .moveName = _("Chloroblast") }, + .name = MOVE_NAME("Chloroblast"), .description = COMPOUND_STRING("A user-hurting blast of\n" "amassed chlorophyll."), .effect = EFFECT_MAX_HP_50_RECOIL, @@ -14971,9 +14974,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOUNTAIN_GALE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Mountain Gale") }, + .name = MOVE_NAME("Mountain Gale"), #else - .name = { .moveName = _("MountainGale") }, + .name = MOVE_NAME("MountainGale"), #endif .description = COMPOUND_STRING("Giant chunks of ice damage\n" "the foe. It may flinch."), @@ -14995,9 +14998,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VICTORY_DANCE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Victory Dance") }, + .name = MOVE_NAME("Victory Dance"), #else - .name = { .moveName = _("VictoryDance") }, + .name = MOVE_NAME("VictoryDance"), #endif .description = COMPOUND_STRING("Dances to raise Attack,\n" "Defense and Speed."), @@ -15018,9 +15021,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEADLONG_RUSH] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Headlong Rush") }, + .name = MOVE_NAME("Headlong Rush"), #else - .name = { .moveName = _("HeadlongRush") }, + .name = MOVE_NAME("HeadlongRush"), #endif .description = COMPOUND_STRING("Hits with a full-body tackle.\n" "Lowers the users's defenses."), @@ -15042,7 +15045,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARB_BARRAGE] = { - .name = { .moveName = _("Barb Barrage") }, + .name = MOVE_NAME("Barb Barrage"), .description = COMPOUND_STRING("Can poison on impact. Powers\n" "up against poisoned foes."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, @@ -15063,7 +15066,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ESPER_WING] = { - .name = { .moveName = _("Esper Wing") }, + .name = MOVE_NAME("Esper Wing"), .description = COMPOUND_STRING("High critical hit ratio.\n" "Ups the user's Speed."), .effect = EFFECT_HIT, @@ -15086,9 +15089,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_MALICE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Bitter Malice") }, + .name = MOVE_NAME("Bitter Malice"), #else - .name = { .moveName = _("BitterMalice") }, + .name = MOVE_NAME("BitterMalice"), #endif .description = COMPOUND_STRING("A spine-chilling resentment.\n" "May lower the foe's Attack."), @@ -15109,7 +15112,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHELTER] = { - .name = { .moveName = _("Shelter") }, + .name = MOVE_NAME("Shelter"), .description = COMPOUND_STRING("The user hardens their skin,\n" "sharply raising its Defense."), .effect = EFFECT_DEFENSE_UP_2, @@ -15128,9 +15131,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_ARROWS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Triple Arrows") }, + .name = MOVE_NAME("Triple Arrows"), #else - .name = { .moveName = _("TripleArrows") }, + .name = MOVE_NAME("TripleArrows"), #endif .description = COMPOUND_STRING("High critical hit ratio.\n" "May lower Defense or flinch."), @@ -15157,9 +15160,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNAL_PARADE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Infernal Parade") }, + .name = MOVE_NAME("Infernal Parade"), #else - .name = { .moveName = _("InfrnlParade") }, + .name = MOVE_NAME("InfrnlParade"), #endif .description = COMPOUND_STRING("Hurts a foe harder if it has\n" "an ailment. May leave a burn."), @@ -15182,9 +15185,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CEASELESS_EDGE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Ceaseless Edge") }, + .name = MOVE_NAME("Ceaseless Edge"), #else - .name = { .moveName = _("CeaslessEdge") }, + .name = MOVE_NAME("CeaslessEdge"), #endif .description = COMPOUND_STRING("High critical hit ratio. Sets\n" "Splinters that hurt the foe."), @@ -15208,9 +15211,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLEAKWIND_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Bleakwind Storm") }, + .name = MOVE_NAME("Bleakwind Storm"), #else - .name = { .moveName = _("BlekwndStorm") }, + .name = MOVE_NAME("BlekwndStorm"), #endif .description = COMPOUND_STRING("Hits with brutal, cold winds.\n" "May lower the foe's Speed."), @@ -15233,9 +15236,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILDBOLT_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Wildbolt Storm") }, + .name = MOVE_NAME("Wildbolt Storm"), #else - .name = { .moveName = _("WildbltStorm") }, + .name = MOVE_NAME("WildbltStorm"), #endif .description = COMPOUND_STRING("Hits with a brutal tempest.\n" "May inflict paralysis."), @@ -15258,9 +15261,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSEAR_STORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Sandsear Storm") }, + .name = MOVE_NAME("Sandsear Storm"), #else - .name = { .moveName = _("SndsearStorm") }, + .name = MOVE_NAME("SndsearStorm"), #endif .description = COMPOUND_STRING("Hits with brutally hot sand.\n" "May inflict a burn."), @@ -15283,9 +15286,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_BLESSING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Lunar Blessing") }, + .name = MOVE_NAME("Lunar Blessing"), #else - .name = { .moveName = _("LunarBlessng") }, + .name = MOVE_NAME("LunarBlessng"), #endif .description = COMPOUND_STRING("The user heals and cures\n" "itself and its ally."), @@ -15305,7 +15308,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_HEART] = { - .name = { .moveName = _("Take Heart") }, + .name = MOVE_NAME("Take Heart"), .description = COMPOUND_STRING("The user lifts its spirits to\n" "heal and strengthen itself."), .effect = EFFECT_TAKE_HEART, @@ -15323,7 +15326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_BLAST] = { - .name = { .moveName = _("Tera Blast") }, + .name = MOVE_NAME("Tera Blast"), .description = COMPOUND_STRING("If the user's Terastallized,\n" "it hits with its Tera-type."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TERA_BLAST, @@ -15340,7 +15343,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SILK_TRAP] = { - .name = { .moveName = _("Silk Trap") }, + .name = MOVE_NAME("Silk Trap"), .description = COMPOUND_STRING("Protects itself, lowering\n" "Speed on contact."), .effect = EFFECT_PROTECT, @@ -15359,7 +15362,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AXE_KICK] = { - .name = { .moveName = _("Axe Kick") }, + .name = MOVE_NAME("Axe Kick"), .description = COMPOUND_STRING("May miss and hurt the kicker.\n" "May cause confusion."), .effect = EFFECT_RECOIL_IF_MISS, @@ -15381,9 +15384,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESPECTS] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Last Respects") }, + .name = MOVE_NAME("Last Respects"), #else - .name = { .moveName = _("LastRespects") }, + .name = MOVE_NAME("LastRespects"), #endif .description = COMPOUND_STRING("This move deals more damage\n" "for each defeated ally."), @@ -15400,7 +15403,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUMINA_CRASH] = { - .name = { .moveName = _("Lumina Crash") }, + .name = MOVE_NAME("Lumina Crash"), .description = COMPOUND_STRING("A mind-affecting light\n" "harshly lowers Sp. Def."), .effect = EFFECT_HIT, @@ -15420,7 +15423,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ORDER_UP] = { - .name = { .moveName = _("Order Up") }, + .name = MOVE_NAME("Order Up"), .description = COMPOUND_STRING("Boosts a user's stats\n" "depending on Tatsugiri."), .effect = EFFECT_PLACEHOLDER, // EFFECT_ORDER_UP @@ -15438,7 +15441,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_JET_PUNCH] = { - .name = { .moveName = _("Jet Punch") }, + .name = MOVE_NAME("Jet Punch"), .description = COMPOUND_STRING("A punch is thrown at blinding\n" "speed to strike first."), .effect = EFFECT_HIT, @@ -15458,9 +15461,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPICY_EXTRACT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Spicy Extract") }, + .name = MOVE_NAME("Spicy Extract"), #else - .name = { .moveName = _("SpicyExtract") }, + .name = MOVE_NAME("SpicyExtract"), #endif .description = COMPOUND_STRING("Sharply ups target's Attack,\n" "harshly lowers its Defense."), @@ -15478,7 +15481,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIN_OUT] = { - .name = { .moveName = _("Spin Out") }, + .name = MOVE_NAME("Spin Out"), .description = COMPOUND_STRING("Furiously strains its legs.\n" "Harshly lowers user's Speed."), .effect = EFFECT_HIT, @@ -15500,9 +15503,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POPULATION_BOMB] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Population Bomb") }, + .name = MOVE_NAME("Population Bomb"), #else - .name = { .moveName = _("PoplatinBomb") }, + .name = MOVE_NAME("PoplatinBomb"), #endif .description = COMPOUND_STRING("The user's fellows hit one\n" "to ten times in a row."), @@ -15522,7 +15525,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SPINNER] = { - .name = { .moveName = _("Ice Spinner") }, + .name = MOVE_NAME("Ice Spinner"), .description = COMPOUND_STRING("Ice-covered feet hit a foe\n" "and destroy the terrain."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, @@ -15540,7 +15543,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLAIVE_RUSH] = { - .name = { .moveName = _("Glaive Rush") }, + .name = MOVE_NAME("Glaive Rush"), .description = COMPOUND_STRING("Foe attacks next turn can't\n" "miss and do double damage."), .effect = EFFECT_GLAIVE_RUSH, @@ -15558,9 +15561,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REVIVAL_BLESSING] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Revival Blessing") }, + .name = MOVE_NAME("Revival Blessing"), #else - .name = { .moveName = _("RevivlBlesng") }, + .name = MOVE_NAME("RevivlBlesng"), #endif .description = COMPOUND_STRING("Revives a fainted party {PKMN}\n" "and restores half of its HP."), @@ -15581,7 +15584,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SALT_CURE] = { - .name = { .moveName = _("Salt Cure") }, + .name = MOVE_NAME("Salt Cure"), .description = COMPOUND_STRING("Hurts foe every turn. Double\n" "damage to Steel and Water."), .effect = EFFECT_SALT_CURE, @@ -15598,7 +15601,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_DIVE] = { - .name = { .moveName = _("Triple Dive") }, + .name = MOVE_NAME("Triple Dive"), .description = COMPOUND_STRING("Hits target with splashes\n" "of water 3 times in a row."), .effect = EFFECT_HIT, @@ -15615,7 +15618,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MORTAL_SPIN] = { - .name = { .moveName = _("Mortal Spin") }, + .name = MOVE_NAME("Mortal Spin"), .description = COMPOUND_STRING("Erases trap moves and Leech\n" "Seed. Poisons adjecent foes."), .effect = EFFECT_HIT, @@ -15640,7 +15643,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOODLE] = { - .name = { .moveName = _("Doodle") }, + .name = MOVE_NAME("Doodle"), .description = COMPOUND_STRING("Changes user's and ally's\n" "Ability into the target's."), .effect = EFFECT_DOODLE, @@ -15658,7 +15661,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FILLET_AWAY] = { - .name = { .moveName = _("Fillet Away") }, + .name = MOVE_NAME("Fillet Away"), .description = COMPOUND_STRING("Sharply boosts offenses and\n" "Speed by using its own HP."), .effect = EFFECT_FILLET_AWAY, @@ -15679,9 +15682,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_KOWTOW_CLEAVE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Kowtow Cleave") }, + .name = MOVE_NAME("Kowtow Cleave"), #else - .name = { .moveName = _("KowtowCleave") }, + .name = MOVE_NAME("KowtowCleave"), #endif .description = COMPOUND_STRING("User slashes the foe after\n" "kowtowing. It never misses."), @@ -15699,7 +15702,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_TRICK] = { - .name = { .moveName = _("Flower Trick") }, + .name = MOVE_NAME("Flower Trick"), .description = COMPOUND_STRING("Rigged bouquet. Always gets\n" "a critical hit, never missing."), .effect = EFFECT_HIT, @@ -15715,7 +15718,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TORCH_SONG] = { - .name = { .moveName = _("Torch Song") }, + .name = MOVE_NAME("Torch Song"), .description = COMPOUND_STRING("Flames scorch the target.\n" "Boosts the user's Sp. Atk."), .effect = EFFECT_HIT, @@ -15738,7 +15741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_STEP] = { - .name = { .moveName = _("Aqua Step") }, + .name = MOVE_NAME("Aqua Step"), .description = COMPOUND_STRING("Hits with light, fluid dance\n" "steps. Ups the user's Speed."), .effect = EFFECT_HIT, @@ -15761,7 +15764,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_BULL] = { - .name = { .moveName = _("Raging Bull") }, + .name = MOVE_NAME("Raging Bull"), .description = COMPOUND_STRING("Tackle that breaks barriers.\n" "User's form determines type."), .effect = EFFECT_RAGING_BULL, @@ -15778,7 +15781,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAKE_IT_RAIN] = { - .name = { .moveName = _("Make It Rain") }, + .name = MOVE_NAME("Make It Rain"), .description = COMPOUND_STRING("Lowers the user's Sp. Atk.\n" "Money is recovered after."), .effect = EFFECT_HIT, @@ -15801,7 +15804,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RUINATION] = { - .name = { .moveName = _("Ruination") }, + .name = MOVE_NAME("Ruination"), .description = COMPOUND_STRING("Summons a ruinous disaster\n" "and cuts half the foe's HP."), .effect = EFFECT_SUPER_FANG, @@ -15818,9 +15821,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COLLISION_COURSE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Collision Course") }, + .name = MOVE_NAME("Collision Course"), #else - .name = { .moveName = _("ColisinCours") }, + .name = MOVE_NAME("ColisinCours"), #endif .description = COMPOUND_STRING("Prehistoric explosion that's\n" "stronger if supereffective."), @@ -15839,9 +15842,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_DRIFT] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Electro Drift") }, + .name = MOVE_NAME("Electro Drift"), #else - .name = { .moveName = _("ElectroDrift") }, + .name = MOVE_NAME("ElectroDrift"), #endif .description = COMPOUND_STRING("Futuristic electricity. It's\n" "stronger if supereffective."), @@ -15859,7 +15862,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHED_TAIL] = { - .name = { .moveName = _("Shed Tail") }, + .name = MOVE_NAME("Shed Tail"), .description = COMPOUND_STRING("Creates a Substitute for\n" "itself before switching out."), .effect = EFFECT_SHED_TAIL, @@ -15879,9 +15882,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLY_RECEPTION] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Chilly Reception") }, + .name = MOVE_NAME("Chilly Reception"), #else - .name = { .moveName = _("ChilReceptin") }, + .name = MOVE_NAME("ChilReceptin"), #endif .description = COMPOUND_STRING("Bad joke summons snowstorm.\n" "The user also switches out."), @@ -15901,7 +15904,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TIDY_UP] = { - .name = { .moveName = _("Tidy Up") }, + .name = MOVE_NAME("Tidy Up"), .description = COMPOUND_STRING("User tidies up hazards and\n" "raises its Attack and Speed."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TIDY_UP @@ -15919,7 +15922,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNOWSCAPE] = { - .name = { .moveName = _("Snowscape") }, + .name = MOVE_NAME("Snowscape"), .description = COMPOUND_STRING("Summons a snowstorm that\n" "lasts for five turns."), .effect = EFFECT_SNOWSCAPE, @@ -15938,7 +15941,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_POUNCE] = { - .name = { .moveName = _("Pounce") }, + .name = MOVE_NAME("Pounce"), .description = COMPOUND_STRING("The user pounces on the foe,\n" "lowering its Speed."), .effect = EFFECT_HIT, @@ -15960,7 +15963,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRAILBLAZE] = { - .name = { .moveName = _("Trailblaze") }, + .name = MOVE_NAME("Trailblaze"), .description = COMPOUND_STRING("The user attacks suddenly,\n" "raising its Speed."), .effect = EFFECT_HIT, @@ -15983,9 +15986,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLING_WATER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Chilling Water") }, + .name = MOVE_NAME("Chilling Water"), #else - .name = { .moveName = _("ChillingWatr") }, + .name = MOVE_NAME("ChillingWatr"), #endif .description = COMPOUND_STRING("A shower with ice-cold water\n" "lowers the target's Attack."), @@ -16006,7 +16009,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_DRILL] = { - .name = { .moveName = _("Hyper Drill") }, + .name = MOVE_NAME("Hyper Drill"), .description = COMPOUND_STRING("A spinning pointed part\n" "bypasses a foe's Protect."), .effect = EFFECT_HIT, @@ -16024,7 +16027,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TWIN_BEAM] = { - .name = { .moveName = _("Twin Beam") }, + .name = MOVE_NAME("Twin Beam"), .description = COMPOUND_STRING("Mystical eye-beams that hit\n" "the target twice in a row."), .effect = EFFECT_HIT, @@ -16041,7 +16044,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_FIST] = { - .name = { .moveName = _("Rage Fist") }, + .name = MOVE_NAME("Rage Fist"), .description = COMPOUND_STRING("The more the user has been\n" "hit, the stronger the move."), .effect = EFFECT_RAGE_FIST, @@ -16059,7 +16062,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ARMOR_CANNON] = { - .name = { .moveName = _("Armor Cannon") }, + .name = MOVE_NAME("Armor Cannon"), .description = COMPOUND_STRING("A strong attack but lowers\n" "the defensive stats."), .effect = EFFECT_HIT, @@ -16079,7 +16082,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_BLADE] = { - .name = { .moveName = _("Bitter Blade") }, + .name = MOVE_NAME("Bitter Blade"), .description = COMPOUND_STRING("An attack that absorbs\n" "half the damage inflicted."), .effect = EFFECT_ABSORB, @@ -16097,7 +16100,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SHOCK] = { - .name = { .moveName = _("Double Shock") }, + .name = MOVE_NAME("Double Shock"), .description = COMPOUND_STRING("Discharges all electricity,\n" "losing the Electric type."), .effect = EFFECT_FAIL_IF_NOT_ARG_TYPE, @@ -16120,9 +16123,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGATON_HAMMER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Gigaton Hammer") }, + .name = MOVE_NAME("Gigaton Hammer"), #else - .name = { .moveName = _("GigatonHammr") }, + .name = MOVE_NAME("GigatonHammr"), #endif .description = COMPOUND_STRING("Swings a huge hammer. Can't\n" "be used twice in a row."), @@ -16139,7 +16142,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMEUPPANCE] = { - .name = { .moveName = _("Comeuppance") }, + .name = MOVE_NAME("Comeuppance"), .description = COMPOUND_STRING("Retaliates strongly against\n" "who last hurt the user."), .effect = EFFECT_METAL_BURST, @@ -16157,7 +16160,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_CUTTER] = { - .name = { .moveName = _("Aqua Cutter") }, + .name = MOVE_NAME("Aqua Cutter"), .description = COMPOUND_STRING("Pressurized water cut with a\n" "high critical-hit ratio."), .effect = EFFECT_HIT, @@ -16175,9 +16178,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZING_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Blazing Torque") }, + .name = MOVE_NAME("Blazing Torque"), #else - .name = { .moveName = _("BlazngTorque") }, + .name = MOVE_NAME("BlazngTorque"), #endif .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, @@ -16208,9 +16211,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Wicked Torque") }, + .name = MOVE_NAME("Wicked Torque"), #else - .name = { .moveName = _("WickedTorque") }, + .name = MOVE_NAME("WickedTorque"), #endif .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, @@ -16241,9 +16244,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NOXIOUS_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Noxious Torque") }, + .name = MOVE_NAME("Noxious Torque"), #else - .name = { .moveName = _("NoxiusTorque") }, + .name = MOVE_NAME("NoxiusTorque"), #endif .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, @@ -16274,9 +16277,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COMBAT_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Combat Torque") }, + .name = MOVE_NAME("Combat Torque"), #else - .name = { .moveName = _("CombatTorque") }, + .name = MOVE_NAME("CombatTorque"), #endif .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, @@ -16307,9 +16310,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_TORQUE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Magical Torque") }, + .name = MOVE_NAME("Magical Torque"), #else - .name = { .moveName = _("MagiclTorque") }, + .name = MOVE_NAME("MagiclTorque"), #endif .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, @@ -16339,7 +16342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBLADE] = { - .name = { .moveName = _("Psyblade") }, + .name = MOVE_NAME("Psyblade"), .description = COMPOUND_STRING("This move's power increases\n" "when on Electric Terrain."), .effect = EFFECT_PSYBLADE, @@ -16356,7 +16359,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_STEAM] = { - .name = { .moveName = _("Hydro Steam") }, + .name = MOVE_NAME("Hydro Steam"), .description = COMPOUND_STRING("This move's power increases\n" "under harsh sunlight."), .effect = EFFECT_HYDRO_STEAM, @@ -16372,7 +16375,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLOOD_MOON] = { - .name = { .moveName = _("Blood Moon") }, + .name = MOVE_NAME("Blood Moon"), .description = COMPOUND_STRING("Unleashes the blood moon.\n" "Can't be used twice in a row."), .effect = EFFECT_HIT, @@ -16389,9 +16392,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MATCHA_GOTCHA] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Matcha Gotcha") }, + .name = MOVE_NAME("Matcha Gotcha"), #else - .name = { .moveName = _("MatchaGotcha") }, + .name = MOVE_NAME("MatchaGotcha"), #endif .description = COMPOUND_STRING("Absorbs half the damage\n" "inflicted. May cause a burn."), @@ -16414,7 +16417,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYRUP_BOMB] = { - .name = { .moveName = _("Syrup Bomb") }, + .name = MOVE_NAME("Syrup Bomb"), .description = COMPOUND_STRING("Lowers the foe's speed\n" "each turn for 3 turns."), .effect = EFFECT_HIT, @@ -16435,7 +16438,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IVY_CUDGEL] = { - .name = { .moveName = _("Ivy Cudgel") }, + .name = MOVE_NAME("Ivy Cudgel"), .description = COMPOUND_STRING("Type changes with held mask.\n" "High critical-hit ratio."), .effect = EFFECT_IVY_CUDGEL, @@ -16452,7 +16455,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_SHOT] = { - .name = { .moveName = _("Electro Shot") }, + .name = MOVE_NAME("Electro Shot"), .description = COMPOUND_STRING("Absorbs electricity in one turn,\n" "then attacks next turn."), .effect = EFFECT_METEOR_BEAM, @@ -16474,9 +16477,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_STARSTORM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Tera Starstorm") }, + .name = MOVE_NAME("Tera Starstorm"), #else - .name = { .moveName = _("TeraStarstrm") }, + .name = MOVE_NAME("TeraStarstrm"), #endif .description = COMPOUND_STRING("Damages all opponents if user is\n" "Stellar form Terapagos."), @@ -16496,7 +16499,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FICKLE_BEAM] = { - .name = { .moveName = _("Fickle Beam") }, + .name = MOVE_NAME("Fickle Beam"), .description = COMPOUND_STRING("Shoots a beam of light. Sometimes\n" "twice as strong."), .effect = EFFECT_FICKLE_BEAM, @@ -16512,9 +16515,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_BULWARK] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Burning Bulwark") }, + .name = MOVE_NAME("Burning Bulwark"), #else - .name = { .moveName = _("BurnngBulwrk") }, + .name = MOVE_NAME("BurnngBulwrk"), #endif .description = COMPOUND_STRING("Evades attack, and burns\n" "the foe if struck."), @@ -16537,7 +16540,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERCLAP] = { - .name = { .moveName = _("Thunderclap") }, + .name = MOVE_NAME("Thunderclap"), .description = sSuckerPunchDescription, .effect = EFFECT_SUCKER_PUNCH, .power = 70, @@ -16552,9 +16555,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIGHTY_CLEAVE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Mighty Cleave") }, + .name = MOVE_NAME("Mighty Cleave"), #else - .name = { .moveName = _("MightyCleave") }, + .name = MOVE_NAME("MightyCleave"), #endif .description = sFeintDescription, .effect = EFFECT_HIT, @@ -16573,9 +16576,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TACHYON_CUTTER] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Tachyon Cutter") }, + .name = MOVE_NAME("Tachyon Cutter"), #else - .name = { .moveName = _("TachyonCuttr") }, + .name = MOVE_NAME("TachyonCuttr"), #endif .description = COMPOUND_STRING("Launches particle blades at\n" "the target. Strikes twice."), @@ -16593,7 +16596,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HARD_PRESS] = { - .name = { .moveName = _("Hard Press") }, + .name = MOVE_NAME("Hard Press"), .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, @@ -16608,7 +16611,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CHEER] = { - .name = { .moveName = _("Dragon Cheer") }, + .name = MOVE_NAME("Dragon Cheer"), .description = COMPOUND_STRING("Increases allies' critical hit\n" "ratio, especially if Dragons."), .effect = EFFECT_PLACEHOLDER, //EFFECT_DRAGON_CHEER @@ -16625,9 +16628,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLURING_VOICE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Alluring Voice") }, + .name = MOVE_NAME("Alluring Voice"), #else - .name = { .moveName = _("AllurngVoice") }, + .name = MOVE_NAME("AllurngVoice"), #endif .description = COMPOUND_STRING("Confuses the target if their\n" "stats were boosted this turn."), @@ -16651,7 +16654,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TEMPER_FLARE] = { - .name = { .moveName = _("Temper Flare") }, + .name = MOVE_NAME("Temper Flare"), .description = COMPOUND_STRING("A desperation attack. Power\n" "doubles if last move failed."), .effect = EFFECT_STOMPING_TANTRUM, @@ -16668,9 +16671,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERCELL_SLAM] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Supercell Slam") }, + .name = MOVE_NAME("Supercell Slam"), #else - .name = { .moveName = _("SuprcellSlam") }, + .name = MOVE_NAME("SuprcellSlam"), #endif .description = COMPOUND_STRING("An electrified slam. If it\n" "misses, the user is hurt."), @@ -16688,9 +16691,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_NOISE] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Psychic Noise") }, + .name = MOVE_NAME("Psychic Noise"), #else - .name = { .moveName = _("PsychicNoise") }, + .name = MOVE_NAME("PsychicNoise"), #endif .description = COMPOUND_STRING("Unpleasant sound waves that\n" "damage and prevent healing."), @@ -16712,7 +16715,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPPER_HAND] = { - .name = { .moveName = _("Upper Hand") }, + .name = MOVE_NAME("Upper Hand"), .description = COMPOUND_STRING("Makes the target flinch if\n" "readying a priority move."), .effect = EFFECT_PLACEHOLDER, //EFFECT_UPPER_HAND @@ -16729,9 +16732,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MALIGNANT_CHAIN] = { #if B_EXPANDED_MOVE_NAMES == TRUE - .name = { .moveName = _("Malignant Chain") }, + .name = MOVE_NAME("Malignant Chain"), #else - .name = { .moveName = _("MalignntChan") }, + .name = MOVE_NAME("MalignntChan"), #endif .description = COMPOUND_STRING("A corrosive chain attack\n" "that may badly poison."), @@ -16752,7 +16755,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = // Z-Moves [MOVE_BREAKNECK_BLITZ] = { - .name = { .bigMoveName = COMPOUND_STRING("Breakneck Blitz") }, + .name = LONG_MOVE_NAME("Breakneck Blitz"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16765,7 +16768,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ALL_OUT_PUMMELING] = { - .name = { .bigMoveName = COMPOUND_STRING("All Out Pummeling") }, + .name = LONG_MOVE_NAME("All Out Pummeling"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16778,7 +16781,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUPERSONIC_SKYSTRIKE] = { - .name = { .bigMoveName = COMPOUND_STRING("Supersonic Skystrike") }, + .name = LONG_MOVE_NAME("Supersonic Skystrike"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16791,7 +16794,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_ACID_DOWNPOUR] = { - .name = { .bigMoveName = COMPOUND_STRING("Acid Downpour") }, + .name = LONG_MOVE_NAME("Acid Downpour"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16804,7 +16807,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TECTONIC_RAGE] = { - .name = { .bigMoveName = COMPOUND_STRING("Tectonic Rage") }, + .name = LONG_MOVE_NAME("Tectonic Rage"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16818,7 +16821,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CONTINENTAL_CRUSH] = { - .name = { .bigMoveName = COMPOUND_STRING("Continental Crush") }, + .name = LONG_MOVE_NAME("Continental Crush"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16831,7 +16834,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SAVAGE_SPIN_OUT] = { - .name = { .bigMoveName = COMPOUND_STRING("Savage Spin Out") }, + .name = LONG_MOVE_NAME("Savage Spin Out"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16844,7 +16847,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_NEVER_ENDING_NIGHTMARE] = { - .name = { .bigMoveName = COMPOUND_STRING("Never Ending Nightmare") }, + .name = LONG_MOVE_NAME("Never Ending Nightmare"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16857,7 +16860,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CORKSCREW_CRASH] = { - .name = { .bigMoveName = COMPOUND_STRING("Corkscrew Crash") }, + .name = LONG_MOVE_NAME("Corkscrew Crash"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16870,7 +16873,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_INFERNO_OVERDRIVE] = { - .name = { .bigMoveName = COMPOUND_STRING("Inferno Overdrive") }, + .name = LONG_MOVE_NAME("Inferno Overdrive"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16883,7 +16886,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_HYDRO_VORTEX] = { - .name = { .bigMoveName = COMPOUND_STRING("Hydro Vortex") }, + .name = LONG_MOVE_NAME("Hydro Vortex"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16896,7 +16899,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLOOM_DOOM] = { - .name = { .bigMoveName = COMPOUND_STRING("Bloom Doom") }, + .name = LONG_MOVE_NAME("Bloom Doom"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16909,7 +16912,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GIGAVOLT_HAVOC] = { - .name = { .bigMoveName = COMPOUND_STRING("Gigavolt Havoc") }, + .name = LONG_MOVE_NAME("Gigavolt Havoc"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16922,7 +16925,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SHATTERED_PSYCHE] = { - .name = { .bigMoveName = COMPOUND_STRING("Shattered Psyche") }, + .name = LONG_MOVE_NAME("Shattered Psyche"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16935,7 +16938,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUBZERO_SLAMMER] = { - .name = { .bigMoveName = COMPOUND_STRING("Subzero Slammer") }, + .name = LONG_MOVE_NAME("Subzero Slammer"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16948,7 +16951,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_DEVASTATING_DRAKE] = { - .name = { .bigMoveName = COMPOUND_STRING("Devastating Drake") }, + .name = LONG_MOVE_NAME("Devastating Drake"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16961,7 +16964,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLACK_HOLE_ECLIPSE] = { - .name = { .bigMoveName = COMPOUND_STRING("Black Hole Eclipse") }, + .name = LONG_MOVE_NAME("Black Hole Eclipse"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16974,7 +16977,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_TWINKLE_TACKLE] = { - .name = { .bigMoveName = COMPOUND_STRING("Twinkle Tackle") }, + .name = LONG_MOVE_NAME("Twinkle Tackle"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -16987,7 +16990,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CATASTROPIKA] = { - .name = { .bigMoveName = COMPOUND_STRING("Catastropika") }, + .name = LONG_MOVE_NAME("Catastropika"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 210, @@ -17000,7 +17003,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_10000000_VOLT_THUNDERBOLT] = { - .name = { .bigMoveName = COMPOUND_STRING("10000000 Volt Thunderbolt") }, + .name = LONG_MOVE_NAME("10000000 Volt Thunderbolt"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, @@ -17014,7 +17017,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_STOKED_SPARKSURFER] = { - .name = { .bigMoveName = COMPOUND_STRING("Stoked Sparksurfer") }, + .name = LONG_MOVE_NAME("Stoked Sparksurfer"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 175, @@ -17031,7 +17034,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_EXTREME_EVOBOOST] = { - .name = { .bigMoveName = COMPOUND_STRING("Extreme Evoboost") }, + .name = LONG_MOVE_NAME("Extreme Evoboost"), .description = sNullDescription, .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, @@ -17044,7 +17047,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_PULVERIZING_PANCAKE] = { - .name = { .bigMoveName = COMPOUND_STRING("Pulverizing Pancake") }, + .name = LONG_MOVE_NAME("Pulverizing Pancake"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 210, @@ -17057,7 +17060,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GENESIS_SUPERNOVA] = { - .name = { .bigMoveName = COMPOUND_STRING("Genesis Supernova") }, + .name = LONG_MOVE_NAME("Genesis Supernova"), .description = sNullDescription, .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, @@ -17071,7 +17074,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SINISTER_ARROW_RAID] = { - .name = { .bigMoveName = COMPOUND_STRING("Sinister Arrow Raid") }, + .name = LONG_MOVE_NAME("Sinister Arrow Raid"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 180, @@ -17084,7 +17087,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MALICIOUS_MOONSAULT] = { - .name = { .bigMoveName = COMPOUND_STRING("Malicious Moonsault") }, + .name = LONG_MOVE_NAME("Malicious Moonsault"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 180, @@ -17097,7 +17100,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_OCEANIC_OPERETTA] = { - .name = { .bigMoveName = COMPOUND_STRING("Oceaning Operetta") }, + .name = LONG_MOVE_NAME("Oceaning Operetta"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, @@ -17110,7 +17113,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SPLINTERED_STORMSHARDS] = { - .name = { .bigMoveName = COMPOUND_STRING("Splintered Stormshards") }, + .name = LONG_MOVE_NAME("Splintered Stormshards"), .description = sNullDescription, .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, @@ -17124,7 +17127,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LETS_SNUGGLE_FOREVER] = { - .name = { .bigMoveName = COMPOUND_STRING("Let's Snuggle Forever") }, + .name = LONG_MOVE_NAME("Let's Snuggle Forever"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 190, @@ -17137,7 +17140,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_CLANGOROUS_SOULBLAZE] = { - .name = { .bigMoveName = COMPOUND_STRING("Clangorous Soulblaze") }, + .name = LONG_MOVE_NAME("Clangorous Soulblaze"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 185, @@ -17157,7 +17160,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_GUARDIAN_OF_ALOLA] = { - .name = { .bigMoveName = COMPOUND_STRING("Guardian Of Alola") }, + .name = LONG_MOVE_NAME("Guardian Of Alola"), .description = sNullDescription, .effect = EFFECT_SUPER_FANG, .power = 1, @@ -17170,7 +17173,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SEARING_SUNRAZE_SMASH] = { - .name = { .bigMoveName = COMPOUND_STRING("Searing Sunraze Smash") }, + .name = LONG_MOVE_NAME("Searing Sunraze Smash"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, @@ -17183,7 +17186,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { - .name = { .bigMoveName = COMPOUND_STRING("Menacing Moonraze Maelstrom") }, + .name = LONG_MOVE_NAME("Menacing Moonraze Maelstrom"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, @@ -17196,7 +17199,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { - .name = { .bigMoveName = COMPOUND_STRING("Light That Burns The Sky") }, + .name = LONG_MOVE_NAME("Light That Burns The Sky"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, @@ -17209,7 +17212,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { - .name = { .bigMoveName = COMPOUND_STRING("Soul Stealing 7 Star Strike") }, + .name = LONG_MOVE_NAME("Soul Stealing 7 Star Strike"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, @@ -17223,7 +17226,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Guard") }, + .name = LONG_MOVE_NAME("Max Guard"), .description = sNullDescription, .effect = EFFECT_PROTECT, .power = 0, @@ -17238,7 +17241,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Flare") }, + .name = LONG_MOVE_NAME("Max Flare"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17253,7 +17256,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Flutterby") }, + .name = LONG_MOVE_NAME("Max Flutterby"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17268,7 +17271,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Lightning") }, + .name = LONG_MOVE_NAME("Max Lightning"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17283,7 +17286,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Strike") }, + .name = LONG_MOVE_NAME("Max Strike"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17298,7 +17301,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Knuckle") }, + .name = LONG_MOVE_NAME("Max Knuckle"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17313,7 +17316,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Phantasm") }, + .name = LONG_MOVE_NAME("Max Phantasm"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17328,7 +17331,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Hailstorm") }, + .name = LONG_MOVE_NAME("Max Hailstorm"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17343,7 +17346,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Ooze") }, + .name = LONG_MOVE_NAME("Max Ooze"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17358,7 +17361,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Geyser") }, + .name = LONG_MOVE_NAME("Max Geyser"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17373,7 +17376,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Airstream") }, + .name = LONG_MOVE_NAME("Max Airstream"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17388,7 +17391,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Starfall") }, + .name = LONG_MOVE_NAME("Max Starfall"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17403,7 +17406,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Wyrmwind") }, + .name = LONG_MOVE_NAME("Max Wyrmwind"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17418,7 +17421,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Mindstorm") }, + .name = LONG_MOVE_NAME("Max Mindstorm"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17433,7 +17436,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Rockfall") }, + .name = LONG_MOVE_NAME("Max Rockfall"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17448,7 +17451,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Quake") }, + .name = LONG_MOVE_NAME("Max Quake"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17464,7 +17467,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Darkness") }, + .name = LONG_MOVE_NAME("Max Darkness"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -17479,7 +17482,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Overgrowth") }, + .name = LONG_MOVE_NAME("Max Overgrowth"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17494,7 +17497,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { - .name = { .bigMoveName = COMPOUND_STRING("Max Steelspike") }, + .name = LONG_MOVE_NAME("Max Steelspike"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17509,7 +17512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VINE_LASH] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Vine Lash") }, + .name = LONG_MOVE_NAME("G-Max Vine Lash"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17524,7 +17527,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Wildfire") }, + .name = LONG_MOVE_NAME("G-Max Wildfire"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17539,7 +17542,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CANNONADE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Canonade") }, + .name = LONG_MOVE_NAME("G-Max Canonade"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17554,7 +17557,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Befuddle") }, + .name = LONG_MOVE_NAME("G-Max Befuddle"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17569,7 +17572,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Volt Crash") }, + .name = LONG_MOVE_NAME("G-Max Volt Crash"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17584,7 +17587,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Gold Rush") }, + .name = LONG_MOVE_NAME("G-Max Gold Rush"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17599,7 +17602,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Chi Strike") }, + .name = LONG_MOVE_NAME("G-Max Chi Strike"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17614,7 +17617,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Terror") }, + .name = LONG_MOVE_NAME("G-Max Terror"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17629,7 +17632,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Foam Burst") }, + .name = LONG_MOVE_NAME("G-Max Foam Burst"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17644,7 +17647,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Resonance") }, + .name = LONG_MOVE_NAME("G-Max Resonance"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17659,7 +17662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Cuddle") }, + .name = LONG_MOVE_NAME("G-Max Cuddle"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17674,7 +17677,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Replenish") }, + .name = LONG_MOVE_NAME("G-Max Replenish"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17689,7 +17692,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Malodor") }, + .name = LONG_MOVE_NAME("G-Max Malodor"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17704,7 +17707,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Meltdown") }, + .name = LONG_MOVE_NAME("G-Max Meltdown"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17719,7 +17722,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DRUM_SOLO] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Drum Solo") }, + .name = LONG_MOVE_NAME("G-Max Drum Solo"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17735,7 +17738,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FIREBALL] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Fireball") }, + .name = LONG_MOVE_NAME("G-Max Fireball"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17751,7 +17754,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_HYDROSNIPE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Hydrosnipe") }, + .name = LONG_MOVE_NAME("G-Max Hydrosnipe"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17767,7 +17770,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Wind Rage") }, + .name = LONG_MOVE_NAME("G-Max Wind Rage"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17782,7 +17785,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Gravitas") }, + .name = LONG_MOVE_NAME("G-Max Gravitas"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17797,7 +17800,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Stonesurge") }, + .name = LONG_MOVE_NAME("G-Max Stonesurge"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17812,7 +17815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Volcalith") }, + .name = LONG_MOVE_NAME("G-Max Volcalith"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17827,7 +17830,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Tartness") }, + .name = LONG_MOVE_NAME("G-Max Tartness"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17842,7 +17845,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Sweetness") }, + .name = LONG_MOVE_NAME("G-Max Sweetness"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17857,7 +17860,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Sandblast") }, + .name = LONG_MOVE_NAME("G-Max Sandblast"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17872,7 +17875,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Stun Shock") }, + .name = LONG_MOVE_NAME("G-Max Stun Shock"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17887,7 +17890,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Centiferno") }, + .name = LONG_MOVE_NAME("G-Max Centiferno"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17902,7 +17905,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Smite") }, + .name = LONG_MOVE_NAME("G-Max Smite"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17918,7 +17921,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Snooze") }, + .name = LONG_MOVE_NAME("G-Max Snooze"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17933,7 +17936,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Finale") }, + .name = LONG_MOVE_NAME("G-Max Finale"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17948,7 +17951,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Steelsurge") }, + .name = LONG_MOVE_NAME("G-Max Steelsurge"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17963,7 +17966,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Depletion") }, + .name = LONG_MOVE_NAME("G-Max Depletion"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17978,7 +17981,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max One Blow") }, + .name = LONG_MOVE_NAME("G-Max One Blow"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -17993,7 +17996,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RAPID_FLOW] = { - .name = { .bigMoveName = COMPOUND_STRING("G-Max Rapid Flow") }, + .name = LONG_MOVE_NAME("G-Max Rapid Flow"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, diff --git a/src/pokemon.c b/src/pokemon.c index f65c8b61cfdc..27abe325bfb0 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6433,7 +6433,7 @@ u16 GetSpeciesPreEvolution(u16 species) const u8 *GetBattleMoveName(u16 moveId) { if (IsZMove(moveId) || IsMaxMove(moveId)) - return gBattleMoves[moveId].name.bigMoveName; + return gBattleMoves[moveId].name.longMoveName; return gBattleMoves[moveId].name.moveName; } From f9f422d8cbf72187fce836b37142221ecf5b0aa1 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 26 Jan 2024 03:35:22 +0100 Subject: [PATCH 18/30] =?UTF-8?q?Reintroduced=20the=20contest=20parameters?= =?UTF-8?q?=20for=20Pok=C3=A9mon=20moves?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/battle_moves.h | 3700 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 3699 insertions(+), 1 deletion(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 2e6b5fac2865..bdf0428685ab 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -5,6 +5,9 @@ #include "constants/battle_z_move_effects.h" #include "constants/hold_effects.h" #include "constants/moves.h" +#include "constants/contest.h" + +// The Gen. 4+ contest data comes from urpg's contest movedex. #define MOVE_NAME(nameOfMove) { .moveName = _(nameOfMove) } #define LONG_MOVE_NAME(longNameOfMove) { .longMoveName = COMPOUND_STRING(longNameOfMove) } @@ -135,6 +138,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS == GEN_4, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_POUND, + .contestComboMoves = {0} }, [MOVE_KARATE_CHOP] = @@ -152,6 +160,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_DOUBLE_SLAP] = @@ -168,6 +181,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_POUND}, }, [MOVE_COMET_PUNCH] = @@ -185,6 +203,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MEGA_PUNCH] = @@ -202,6 +225,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, }, [MOVE_PAY_DAY] = @@ -220,6 +248,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PAYDAY, }), + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FIRE_PUNCH] = @@ -242,6 +275,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_FIRE_PUNCH, + .contestComboMoves = {COMBO_STARTER_ICE_PUNCH, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH}, }, [MOVE_ICE_PUNCH] = @@ -268,6 +306,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_ICE_PUNCH, + .contestComboMoves = {COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_THUNDER_PUNCH}, }, [MOVE_THUNDER_PUNCH] = @@ -294,6 +337,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_THUNDER_PUNCH, + .contestComboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH}, }, [MOVE_SCRATCH] = @@ -310,6 +358,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_SCRATCH, + .contestComboMoves = {COMBO_STARTER_LEER}, }, [MOVE_VISE_GRIP] = @@ -326,6 +379,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_VICE_GRIP, + .contestComboMoves = {0} }, [MOVE_GUILLOTINE] = @@ -342,6 +400,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_VICE_GRIP}, }, [MOVE_RAZOR_WIND] = @@ -362,6 +425,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .windMove = B_EXTRAPOLATED_MOVE_FLAGS, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SWORDS_DANCE] = @@ -380,6 +448,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_SWORDS_DANCE, + .contestComboMoves = {0} }, [MOVE_CUT] = @@ -397,6 +470,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, }, [MOVE_GUST] = @@ -415,6 +493,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), .damagesAirborneDoubleDamage = TRUE, .windMove = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WING_ATTACK] = @@ -431,6 +514,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WHIRLWIND] = @@ -453,6 +541,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLY] = @@ -474,6 +567,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BIND] = @@ -494,6 +592,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_VICE_GRIP}, }, [MOVE_SLAM] = @@ -511,6 +614,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_POUND}, }, [MOVE_VINE_WHIP] = @@ -533,6 +641,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_STOMP] = @@ -556,6 +669,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_LEER}, }, [MOVE_DOUBLE_KICK] = @@ -573,6 +691,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MEGA_KICK] = @@ -589,6 +712,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, }, [MOVE_JUMP_KICK] = @@ -612,6 +740,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .gravityBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_MIND_READER}, }, [MOVE_ROLLING_KICK] = @@ -634,6 +767,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SAND_ATTACK] = @@ -651,6 +789,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_SAND_ATTACK, + .contestComboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM}, }, [MOVE_HEADBUTT] = @@ -672,6 +815,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_HORN_ATTACK] = @@ -688,6 +836,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_HORN_ATTACK, + .contestComboMoves = {COMBO_STARTER_LEER}, }, [MOVE_FURY_ATTACK] = @@ -704,6 +857,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK}, }, [MOVE_HORN_DRILL] = @@ -720,6 +878,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HORN_ATTACK}, }, [MOVE_TACKLE] = @@ -742,6 +905,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN, COMBO_STARTER_LEER}, }, [MOVE_BODY_SLAM] = @@ -765,6 +933,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WRAP] = @@ -784,6 +957,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TAKE_DOWN] = @@ -801,6 +979,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, }, [MOVE_THRASH] = @@ -822,6 +1005,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THRASH, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAGE}, }, [MOVE_DOUBLE_EDGE] = @@ -839,6 +1027,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, }, [MOVE_TAIL_WHIP] = @@ -856,6 +1049,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARM}, }, [MOVE_POISON_STING] = @@ -876,6 +1074,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TWINEEDLE] = @@ -898,6 +1101,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PIN_MISSILE] = @@ -913,6 +1121,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LEER] = @@ -930,6 +1143,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_LEER, + .contestComboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE}, }, [MOVE_BITE] = @@ -952,6 +1170,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE}, }, [MOVE_GROWL] = @@ -971,6 +1194,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARM}, }, [MOVE_ROAR] = @@ -993,6 +1221,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .soundMove = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SING] = @@ -1012,6 +1245,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_SING, + .contestComboMoves = {0} }, [MOVE_SUPERSONIC] = @@ -1031,6 +1269,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SONIC_BOOM] = @@ -1047,6 +1290,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .argument = 20, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DISABLE] = @@ -1071,6 +1319,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ACID] = @@ -1095,6 +1348,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = B_UPDATED_MOVE_DATA >= GEN_4 ? MOVE_EFFECT_SP_DEF_MINUS_1 : MOVE_EFFECT_DEF_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_EMBER] = @@ -1115,6 +1373,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_FLAMETHROWER] = @@ -1135,6 +1398,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_MIST] = @@ -1154,6 +1422,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WATER_GUN] = @@ -1169,6 +1442,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT}, }, [MOVE_HYDRO_PUMP] = @@ -1184,6 +1462,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_SURF] = @@ -1201,6 +1484,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .damagesUnderwater = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_SURF, + .contestComboMoves = {COMBO_STARTER_DIVE, COMBO_STARTER_RAIN_DANCE}, }, [MOVE_ICE_BEAM] = @@ -1227,6 +1515,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL}, }, [MOVE_BLIZZARD] = @@ -1252,6 +1545,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_POWDER_SNOW}, }, [MOVE_PSYBEAM] = @@ -1272,6 +1570,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND}, }, [MOVE_BUBBLE_BEAM] = @@ -1292,6 +1595,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_AURORA_BEAM] = @@ -1312,6 +1620,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL}, }, [MOVE_HYPER_BEAM] = @@ -1331,6 +1644,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PECK] = @@ -1347,6 +1665,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_PECK, + .contestComboMoves = {0} }, [MOVE_DRILL_PECK] = @@ -1363,6 +1686,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_PECK}, }, [MOVE_SUBMISSION] = @@ -1380,6 +1708,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_MIND_READER}, }, [MOVE_LOW_KICK] = @@ -1396,6 +1729,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COUNTER] = @@ -1417,6 +1755,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_2, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_TAUNT}, }, [MOVE_SEISMIC_TOSS] = @@ -1434,6 +1777,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FAKE_OUT}, }, [MOVE_STRENGTH] = @@ -1450,6 +1798,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ABSORB] = @@ -1467,6 +1820,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_MEGA_DRAIN] = @@ -1483,6 +1841,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_LEECH_SEED] = @@ -1500,6 +1863,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_LEECH_SEED, + .contestComboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_WORRY_SEED}, }, [MOVE_GROWTH] = @@ -1519,6 +1887,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_GROWTH, + .contestComboMoves = {0} }, [MOVE_RAZOR_LEAF] = @@ -1536,6 +1909,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_SOLAR_BEAM] = @@ -1554,6 +1932,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_SUNNY_DAY}, }, [MOVE_POISON_POWDER] = @@ -1576,6 +1959,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SWEET_SCENT}, }, [MOVE_STUN_SPORE] = @@ -1594,6 +1982,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SWEET_SCENT}, }, [MOVE_SLEEP_POWDER] = @@ -1612,6 +2005,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SWEET_SCENT}, }, [MOVE_PETAL_DANCE] = @@ -1640,6 +2038,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THRASH, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_STRING_SHOT] = @@ -1657,6 +2060,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_STRING_SHOT, + .contestComboMoves = {0} }, [MOVE_DRAGON_RAGE] = @@ -1674,6 +2082,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), .argument = 40, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_DRAGON_RAGE, + .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, }, [MOVE_FIRE_SPIN] = @@ -1693,6 +2106,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_THUNDER_SHOCK] = @@ -1717,6 +2135,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE}, }, [MOVE_THUNDERBOLT] = @@ -1737,6 +2160,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE}, }, [MOVE_THUNDER_WAVE] = @@ -1754,6 +2182,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE}, }, [MOVE_THUNDER] = @@ -1775,6 +2208,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_LOCK_ON, COMBO_STARTER_RAIN_DANCE}, }, [MOVE_ROCK_THROW] = @@ -1790,6 +2228,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_ROCK_THROW, + .contestComboMoves = {0} }, [MOVE_EARTHQUAKE] = @@ -1808,6 +2251,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_EARTHQUAKE, + .contestComboMoves = {0} }, [MOVE_FISSURE] = @@ -1825,6 +2273,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_EARTHQUAKE}, }, [MOVE_DIG] = @@ -1846,6 +2299,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .assistBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TOXIC] = @@ -1863,6 +2321,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_TOXIC, + .contestComboMoves = {0} }, [MOVE_CONFUSION] = @@ -1883,6 +2346,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_CONFUSION, + .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, }, [MOVE_PSYCHIC] = @@ -1903,6 +2371,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_PSYCHIC, + .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_CONFUSION, COMBO_STARTER_KINESIS}, }, [MOVE_HYPNOSIS] = @@ -1920,6 +2393,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_HYPNOSIS, + .contestComboMoves = {0} }, [MOVE_MEDITATE] = @@ -1939,6 +2417,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND}, }, [MOVE_AGILITY] = @@ -1958,6 +2441,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_DOUBLE_TEAM}, }, [MOVE_QUICK_ATTACK] = @@ -1974,6 +2462,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_DOUBLE_TEAM}, }, [MOVE_RAGE] = @@ -1990,6 +2483,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_RAGE, + .contestComboMoves = {0} }, [MOVE_TELEPORT] = @@ -2008,6 +2506,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CONFUSION, COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, }, [MOVE_NIGHT_SHADE] = @@ -2023,6 +2526,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MIMIC] = @@ -2047,6 +2555,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SCREECH] = @@ -2066,6 +2579,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DOUBLE_TEAM] = @@ -2085,6 +2603,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_DOUBLE_TEAM, + .contestComboMoves = {0} }, [MOVE_RECOVER] = @@ -2111,6 +2634,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HARDEN] = @@ -2130,6 +2658,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_HARDEN, + .contestComboMoves = {0} }, [MOVE_MINIMIZE] = @@ -2149,6 +2682,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SMOKESCREEN] = @@ -2166,6 +2704,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SMOG}, }, [MOVE_CONFUSE_RAY] = @@ -2183,6 +2726,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WITHDRAW] = @@ -2202,6 +2750,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_DEFENSE_CURL] = @@ -2221,6 +2774,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_DEFENSE_CURL, + .contestComboMoves = {0} }, [MOVE_BARRIER] = @@ -2240,6 +2798,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LIGHT_SCREEN] = @@ -2259,6 +2822,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND}, }, [MOVE_HAZE] = @@ -2278,6 +2846,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL}, }, [MOVE_REFLECT] = @@ -2297,6 +2870,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND}, }, [MOVE_FOCUS_ENERGY] = @@ -2316,6 +2894,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_FOCUS_ENERGY, + .contestComboMoves = {0} }, [MOVE_BIDE] = @@ -2335,6 +2918,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_METRONOME] = @@ -2359,6 +2947,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MIRROR_MOVE] = @@ -2382,6 +2975,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SELF_DESTRUCT] = @@ -2402,6 +3000,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_EGG_BOMB] = @@ -2418,6 +3021,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SOFT_BOILED}, }, [MOVE_LICK] = @@ -2439,6 +3047,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SMOG] = @@ -2459,6 +3072,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 40, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_SMOG, + .contestComboMoves = {0} }, [MOVE_SLUDGE] = @@ -2479,6 +3097,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_SLUDGE, + .contestComboMoves = {COMBO_STARTER_SLUDGE_BOMB}, }, [MOVE_BONE_CLUB] = @@ -2499,6 +3122,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_BONE_CLUB, + .contestComboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH, COMBO_STARTER_SHADOW_BONE}, }, [MOVE_FIRE_BLAST] = @@ -2519,6 +3147,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_WATERFALL] = @@ -2542,6 +3175,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .chance = 20, }), #endif + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_CLAMP] = @@ -2562,6 +3200,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_SWIFT] = @@ -2577,6 +3220,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SKULL_BASH] = @@ -2596,6 +3244,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPIKE_CANNON] = @@ -2611,6 +3264,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CONSTRICT] = @@ -2632,6 +3290,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AMNESIA] = @@ -2651,6 +3314,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_KINESIS] = @@ -2668,6 +3336,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_KINESIS, + .contestComboMoves = {COMBO_STARTER_CONFUSION, COMBO_STARTER_PSYCHIC}, }, [MOVE_SOFT_BOILED] = @@ -2688,6 +3361,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_SOFT_BOILED, + .contestComboMoves = {0} }, [MOVE_HIGH_JUMP_KICK] = @@ -2715,6 +3393,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .gravityBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_MIND_READER}, }, [MOVE_GLARE] = @@ -2738,6 +3421,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_LEER}, }, [MOVE_DREAM_EATER] = @@ -2754,6 +3442,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_HYPNOSIS}, }, [MOVE_POISON_GAS] = @@ -2777,6 +3470,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BARRAGE] = @@ -2793,6 +3491,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LEECH_LIFE] = @@ -2811,6 +3514,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LOVELY_KISS] = @@ -2828,6 +3536,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SKY_ATTACK] = @@ -2854,6 +3567,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .chance = 30, }), #endif + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TRANSFORM] = @@ -2878,6 +3596,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BUBBLE] = @@ -2898,6 +3621,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_DIZZY_PUNCH] = @@ -2920,6 +3648,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPORE] = @@ -2938,6 +3671,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLASH] = @@ -2955,6 +3693,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PSYWAVE] = @@ -2970,6 +3713,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND}, }, [MOVE_SPLASH] = @@ -2989,6 +3737,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .gravityBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ACID_ARMOR] = @@ -3008,6 +3761,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CRABHAMMER] = @@ -3025,6 +3783,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE}, }, [MOVE_EXPLOSION] = @@ -3041,6 +3804,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FURY_SWIPES] = @@ -3057,6 +3825,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SCRATCH}, }, [MOVE_BONEMERANG] = @@ -3073,6 +3846,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .strikeCount = 2, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_BONEMERANG, + .contestComboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH, COMBO_STARTER_SHADOW_BONE}, }, [MOVE_REST] = @@ -3093,6 +3871,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .healingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_REST, + .contestComboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN}, }, [MOVE_ROCK_SLIDE] = @@ -3113,6 +3896,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_ROCK_THROW}, }, [MOVE_HYPER_FANG] = @@ -3135,6 +3923,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SHARPEN] = @@ -3154,6 +3947,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CONVERSION] = @@ -3173,6 +3971,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TRI_ATTACK] = @@ -3193,6 +3996,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_TRI_ATTACK, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_LOCK_ON}, }, [MOVE_SUPER_FANG] = @@ -3210,6 +4018,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SCARY_FACE}, }, [MOVE_SLASH] = @@ -3228,6 +4041,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SCRATCH, COMBO_STARTER_SWORDS_DANCE}, }, [MOVE_SUBSTITUTE] = @@ -3248,6 +4066,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STRUGGLE] = @@ -3311,6 +4134,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .sketchBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TRIPLE_KICK] = @@ -3328,6 +4156,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_THIEF] = @@ -3352,6 +4185,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_STEAL_ITEM, }), + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPIDER_WEB] = @@ -3370,6 +4208,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_STRING_SHOT}, }, [MOVE_MIND_READER] = @@ -3386,6 +4229,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_MIND_READER, + .contestComboMoves = {0} }, [MOVE_NIGHTMARE] = @@ -3403,6 +4251,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS <= GEN_3, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLAME_WHEEL] = @@ -3425,6 +4278,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_SNORE] = @@ -3448,6 +4306,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_REST}, }, [MOVE_CURSE] = @@ -3467,6 +4330,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_CURSE, + .contestComboMoves = {0} }, [MOVE_FLAIL] = @@ -3483,6 +4351,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_ENDURE}, }, [MOVE_CONVERSION_2] = @@ -3502,6 +4375,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AEROBLAST] = @@ -3519,6 +4397,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .windMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COTTON_SPORE] = @@ -3537,6 +4420,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_REVERSAL] = @@ -3553,6 +4441,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_ENDURE}, }, [MOVE_SPITE] = @@ -3571,6 +4464,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CURSE}, }, [MOVE_POWDER_SNOW] = @@ -3591,6 +4489,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_POWDER_SNOW, + .contestComboMoves = {COMBO_STARTER_HAIL}, }, [MOVE_PROTECT] = @@ -3611,6 +4514,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HARDEN}, }, [MOVE_MACH_PUNCH] = @@ -3628,6 +4536,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SCARY_FACE] = @@ -3645,6 +4558,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_SCARY_FACE, + .contestComboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_RAGE}, }, [MOVE_FEINT_ATTACK] = @@ -3660,6 +4578,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND}, }, [MOVE_SWEET_KISS] = @@ -3677,6 +4600,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARM}, }, [MOVE_BELLY_DRUM] = @@ -3696,6 +4624,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_BELLY_DRUM, + .contestComboMoves = {0} }, [MOVE_SLUDGE_BOMB] = @@ -3717,6 +4650,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_SLUDGE_BOMB, + .contestComboMoves = {COMBO_STARTER_SLUDGE}, }, [MOVE_MUD_SLAP] = @@ -3737,6 +4675,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_MUD_SLAP, + .contestComboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_SANDSTORM}, }, [MOVE_OCTAZOOKA] = @@ -3758,6 +4701,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_LOCK_ON, COMBO_STARTER_RAIN_DANCE}, }, [MOVE_SPIKES] = @@ -3779,6 +4727,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .forcePressure = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ZAP_CANNON] = @@ -3800,6 +4753,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_LOCK_ON}, }, [MOVE_FORESIGHT] = @@ -3818,6 +4776,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DESTINY_BOND] = @@ -3840,6 +4803,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE, COMBO_STARTER_MEAN_LOOK}, }, [MOVE_PERISH_SONG] = @@ -3860,6 +4828,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .mirrorMoveBanned = TRUE, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING}, }, [MOVE_ICY_WIND] = @@ -3881,6 +4854,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL}, }, [MOVE_DETECT] = @@ -3903,6 +4881,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_TAUNT}, }, [MOVE_BONE_RUSH] = @@ -3918,6 +4901,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_BONE_RUSH, + .contestComboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_SHADOW_BONE}, }, [MOVE_LOCK_ON] = @@ -3934,6 +4922,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_LOCK_ON, + .contestComboMoves = {0} }, [MOVE_OUTRAGE] = @@ -3955,6 +4948,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THRASH, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SANDSTORM] = @@ -3974,6 +4972,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .windMove = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_SANDSTORM, + .contestComboMoves = {0} }, [MOVE_GIGA_DRAIN] = @@ -3991,6 +4994,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_ENDURE] = @@ -4013,6 +5021,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_ENDURE, + .contestComboMoves = {0} }, [MOVE_CHARM] = @@ -4030,6 +5043,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_CHARM, + .contestComboMoves = {0} }, [MOVE_ROLLOUT] = @@ -4048,6 +5066,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .instructBanned = TRUE, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN}, }, [MOVE_FALSE_SWIPE] = @@ -4063,6 +5086,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, }, [MOVE_SWAGGER] = @@ -4080,6 +5108,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MILK_DRINK] = @@ -4100,6 +5133,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPARK] = @@ -4121,6 +5159,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE}, }, [MOVE_FURY_CUTTER] = @@ -4144,6 +5187,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, }, [MOVE_STEEL_WING] = @@ -4166,6 +5214,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MEAN_LOOK] = @@ -4184,6 +5237,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_MEAN_LOOK, + .contestComboMoves = {COMBO_STARTER_CURSE}, }, [MOVE_ATTRACT] = @@ -4202,6 +5260,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SLEEP_TALK] = @@ -4227,6 +5290,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mimicBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_REST}, }, [MOVE_HEAL_BELL] = @@ -4248,6 +5316,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .soundMove = B_UPDATED_MOVE_FLAGS != GEN_5, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_HEAL_BELL, + .contestComboMoves = {COMBO_STARTER_LUCKY_CHANT}, }, [MOVE_RETURN] = @@ -4264,6 +5337,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PRESENT] = @@ -4280,6 +5358,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FRUSTRATION] = @@ -4296,6 +5379,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SAFEGUARD] = @@ -4315,6 +5403,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PAIN_SPLIT] = @@ -4331,6 +5424,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_ENDURE}, }, [MOVE_SACRED_FIRE] = @@ -4352,6 +5450,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_MAGNITUDE] = @@ -4369,6 +5472,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DYNAMIC_PUNCH] = @@ -4395,6 +5503,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, }, [MOVE_MEGAHORN] = @@ -4411,6 +5524,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_BREATH] = @@ -4436,6 +5554,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_DRAGON_BREATH, + .contestComboMoves = {COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, }, [MOVE_BATON_PASS] = @@ -4454,6 +5577,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ENCORE] = @@ -4473,6 +5601,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .encoreBanned = TRUE, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PURSUIT] = @@ -4490,6 +5623,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_RAPID_SPIN] = @@ -4518,6 +5656,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = } #endif ), + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SWEET_SCENT] = @@ -4535,6 +5678,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_SWEET_SCENT, + .contestComboMoves = {0} }, [MOVE_IRON_TAIL] = @@ -4556,6 +5704,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_METAL_CLAW] = @@ -4578,6 +5731,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_METAL_SOUND}, }, [MOVE_VITAL_THROW] = @@ -4594,6 +5752,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = -1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FAKE_OUT}, }, [MOVE_MORNING_SUN] = @@ -4614,6 +5777,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_SYNTHESIS] = @@ -4634,6 +5802,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_MOONLIGHT] = @@ -4654,6 +5827,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_HIDDEN_POWER] = @@ -4669,6 +5847,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CROSS_CHOP] = @@ -4686,6 +5869,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_TWISTER] = @@ -4708,6 +5896,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_RAIN_DANCE] = @@ -4726,6 +5919,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_RAIN_DANCE, + .contestComboMoves = {0} }, [MOVE_SUNNY_DAY] = @@ -4744,6 +5942,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_SUNNY_DAY, + .contestComboMoves = {0} }, [MOVE_CRUNCH] = @@ -4774,6 +5977,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #endif .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SCARY_FACE}, }, [MOVE_MIRROR_COAT] = @@ -4793,6 +6001,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .meFirstBanned = TRUE, .metronomeBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_TAUNT}, }, [MOVE_PSYCH_UP] = @@ -4813,6 +6026,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS < GEN_5, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_EXTREME_SPEED] = @@ -4833,6 +6051,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 2 : 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ANCIENT_POWER] = @@ -4859,6 +6082,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SHADOW_BALL] = @@ -4880,6 +6108,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FUTURE_SIGHT] = @@ -4903,6 +6136,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_CONFUSION, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, }, [MOVE_ROCK_SMASH] = @@ -4924,6 +6162,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WHIRLPOOL] = @@ -4943,6 +6186,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_BEAT_UP] = @@ -4958,6 +6206,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FAKE_OUT] = @@ -4979,6 +6232,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_FAKE_OUT, + .contestComboMoves = {0} }, [MOVE_UPROAR] = @@ -5007,6 +6265,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_UPROAR, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STOCKPILE] = @@ -5026,6 +6289,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_STOCKPILE, + .contestComboMoves = {0} }, [MOVE_SPIT_UP] = @@ -5042,6 +6310,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_STOCKPILE}, }, [MOVE_SWALLOW] = @@ -5062,6 +6335,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_STOCKPILE}, }, [MOVE_HEAT_WAVE] = @@ -5083,6 +6361,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_HAIL] = @@ -5101,6 +6384,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_HAIL, + .contestComboMoves = {0} }, [MOVE_TORMENT] = @@ -5118,6 +6406,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLATTER] = @@ -5135,6 +6428,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARM}, }, [MOVE_WILL_O_WISP] = @@ -5152,6 +6450,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_MEMENTO] = @@ -5168,6 +6471,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESTORE_REPLACEMENT_HP }, + + .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FACADE] = @@ -5184,6 +6492,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_FOCUS_PUNCH] = @@ -5208,6 +6521,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_SMELLING_SALTS] = @@ -5232,6 +6550,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_REMOVE_STATUS, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FOLLOW_ME] = @@ -5253,6 +6576,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_NATURE_POWER] = @@ -5275,6 +6603,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .mimicBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CHARGE] = @@ -5294,6 +6627,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_CHARGE, + .contestComboMoves = {0} }, [MOVE_TAUNT] = @@ -5312,6 +6650,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_TAUNT, + .contestComboMoves = {0} }, [MOVE_HELPING_HAND] = @@ -5334,6 +6677,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TRICK] = @@ -5353,6 +6701,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ROLE_PLAY] = @@ -5372,6 +6725,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WISH] = @@ -5392,6 +6750,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ASSIST] = @@ -5416,6 +6779,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .mimicBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_INGRAIN] = @@ -5436,6 +6804,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SUPERPOWER] = @@ -5456,6 +6829,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_DEF_DOWN, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_LOCK_ON, COMBO_STARTER_MIND_READER}, }, [MOVE_MAGIC_COAT] = @@ -5474,6 +6852,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_RECYCLE] = @@ -5493,6 +6876,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_REVENGE] = @@ -5508,6 +6896,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = -4, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_REVENGE, + .contestComboMoves = {COMBO_STARTER_PAYBACK}, }, [MOVE_BRICK_BREAK] = @@ -5524,6 +6917,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_YAWN] = @@ -5541,6 +6939,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_YAWN, + .contestComboMoves = {0} }, [MOVE_KNOCK_OFF] = @@ -5560,6 +6963,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_KNOCK_OFF, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FAKE_OUT}, }, [MOVE_ENDEAVOR] = @@ -5577,6 +6985,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_ENDURE}, }, [MOVE_ERUPTION] = @@ -5592,6 +7005,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_ENDURE, COMBO_STARTER_SUNNY_DAY}, }, [MOVE_SKILL_SWAP] = @@ -5609,6 +7027,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_IMPRISON] = @@ -5630,6 +7053,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .forcePressure = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_REFRESH] = @@ -5649,6 +7077,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SING, COMBO_STARTER_WATER_SPORT}, }, [MOVE_GRUDGE] = @@ -5668,6 +7101,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CURSE}, }, [MOVE_SNATCH] = @@ -5689,6 +7127,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SECRET_POWER] = @@ -5709,6 +7152,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SECRET_POWER, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DIVE] = @@ -5730,6 +7178,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .assistBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_DIVE, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF}, }, [MOVE_ARM_THRUST] = @@ -5746,6 +7199,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_CAMOUFLAGE] = @@ -5765,6 +7223,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TAIL_GLOW] = @@ -5784,6 +7247,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LUSTER_PURGE] = @@ -5804,6 +7272,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND}, }, [MOVE_MIST_BALL] = @@ -5825,6 +7298,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND}, }, [MOVE_FEATHER_DANCE] = @@ -5847,6 +7325,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .danceMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TEETER_DANCE] = @@ -5865,6 +7348,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .danceMove = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_4, + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BLAZE_KICK] = @@ -5887,6 +7375,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_MUD_SPORT] = @@ -5906,6 +7399,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_MUD_SPORT, + .contestComboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM, COMBO_STARTER_WATER_SPORT}, }, [MOVE_ICE_BALL] = @@ -5925,6 +7423,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ballisticMove = TRUE, .instructBanned = TRUE, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL}, }, [MOVE_NEEDLE_ARM] = @@ -5947,6 +7450,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SLACK_OFF] = @@ -5967,6 +7475,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HYPER_VOICE] = @@ -5984,6 +7497,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POISON_FANG] = @@ -6006,6 +7524,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_TOXIC, .chance = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 30, }), + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CRUSH_CLAW] = @@ -6027,6 +7550,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, }, [MOVE_BLAST_BURN] = @@ -6046,6 +7574,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_HYDRO_CANNON] = @@ -6065,6 +7598,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_METEOR_MASH] = @@ -6088,6 +7626,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ASTONISH] = @@ -6110,6 +7653,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WEATHER_BALL] = @@ -6126,6 +7674,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SANDSTORM, COMBO_STARTER_SUNNY_DAY}, }, [MOVE_AROMATHERAPY] = @@ -6145,6 +7698,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FAKE_TEARS] = @@ -6162,6 +7720,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AIR_CUTTER] = @@ -6180,6 +7743,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .windMove = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_OVERHEAT] = @@ -6200,6 +7768,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_ODOR_SLEUTH] = @@ -6218,6 +7791,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ROCK_TOMB] = @@ -6238,6 +7816,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_ROCK_THROW}, }, [MOVE_SILVER_WIND] = @@ -6260,6 +7843,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_METAL_SOUND] = @@ -6279,6 +7867,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_METAL_SOUND, + .contestComboMoves = {0} }, [MOVE_GRASS_WHISTLE] = @@ -6302,6 +7895,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TICKLE] = @@ -6319,6 +7917,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COSMIC_POWER] = @@ -6338,6 +7941,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WATER_SPOUT] = @@ -6353,6 +7961,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_SIGNAL_BEAM] = @@ -6373,6 +7986,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SHADOW_PUNCH] = @@ -6390,6 +8008,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_EXTRASENSORY] = @@ -6411,6 +8034,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SKY_UPPERCUT] = @@ -6429,6 +8057,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .punchingMove = TRUE, .damagesAirborne = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_SAND_TOMB] = @@ -6447,6 +8080,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SANDSTORM}, }, [MOVE_SHEER_COLD] = @@ -6462,6 +8100,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_MIND_READER}, }, [MOVE_MUDDY_WATER] = @@ -6483,6 +8126,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_BULLET_SEED] = @@ -6499,6 +8147,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_AERIAL_ACE] = @@ -6516,6 +8169,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ICICLE_SPEAR] = @@ -6531,6 +8189,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_IRON_DEFENSE] = @@ -6550,6 +8213,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BLOCK] = @@ -6568,6 +8236,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HOWL] = @@ -6588,6 +8261,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .soundMove = B_UPDATED_MOVE_FLAGS >= GEN_8, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_CLAW] = @@ -6604,6 +8282,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, }, [MOVE_FRENZY_PLANT] = @@ -6624,6 +8307,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_BULK_UP] = @@ -6643,6 +8331,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BOUNCE] = @@ -6669,6 +8362,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MUD_SHOT] = @@ -6689,6 +8387,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SANDSTORM}, }, [MOVE_POISON_TAIL] = @@ -6711,6 +8414,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COVET] = @@ -6734,6 +8442,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_STEAL_ITEM, }), + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_VOLT_TACKLE] = @@ -6758,6 +8471,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .chance = 10, }), #endif + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MAGICAL_LEAF] = @@ -6773,6 +8491,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_WATER_SPORT] = @@ -6792,6 +8515,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_WATER_SPORT, + .contestComboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_RAIN_DANCE}, }, [MOVE_CALM_MIND] = @@ -6811,6 +8539,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_CALM_MIND, + .contestComboMoves = {0} }, [MOVE_LEAF_BLADE] = @@ -6829,6 +8562,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_DANCE] = @@ -6849,6 +8587,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_DRAGON_DANCE, + .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, }, [MOVE_ROCK_BLAST] = @@ -6865,6 +8608,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = B_UPDATED_MOVE_FLAGS >= GEN_6, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SHOCK_WAVE] = @@ -6880,6 +8628,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE}, }, [MOVE_WATER_PULSE] = @@ -6901,6 +8654,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_DOOM_DESIRE] = @@ -6918,6 +8676,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PSYCHO_BOOST] = @@ -6937,6 +8700,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CALM_MIND}, }, [MOVE_ROOST] = @@ -6957,6 +8725,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_BRAVE_BIRD}, }, [MOVE_GRAVITY] = @@ -6976,6 +8749,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MIRACLE_EYE] = @@ -6994,6 +8772,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WAKE_UP_SLAP] = @@ -7014,6 +8797,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_REMOVE_STATUS, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HAMMER_ARM] = @@ -7035,6 +8823,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_GYRO_BALL] = @@ -7052,6 +8845,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEALING_WISH] = @@ -7070,6 +8868,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BRINE] = @@ -7085,6 +8888,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_NATURAL_GIFT] = @@ -7100,6 +8908,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FEINT] = @@ -7123,6 +8936,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FEINT, }), + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PLUCK] = @@ -7141,6 +8959,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BUG_BITE, }), + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TAILWIND] = @@ -7161,6 +8984,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .windMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ACUPRESSURE] = @@ -7180,6 +9008,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS < GEN_5, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_METAL_BURST] = @@ -7196,6 +9029,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .meFirstBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_METAL_SOUND}, }, [MOVE_U_TURN] = @@ -7211,6 +9049,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CLOSE_COMBAT] = @@ -7230,6 +9073,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_SPDEF_DOWN, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, }, [MOVE_PAYBACK] = @@ -7246,6 +9094,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_PAYBACK, + .contestComboMoves = {COMBO_STARTER_REVENGE}, }, [MOVE_ASSURANCE] = @@ -7262,6 +9115,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_PAYBACK, COMBO_STARTER_REVENGE}, }, [MOVE_EMBARGO] = @@ -7279,6 +9137,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLING] = @@ -7295,6 +9158,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PSYCHO_SHIFT] = @@ -7311,6 +9179,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TRUMP_CARD] = @@ -7327,6 +9200,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEAL_BLOCK] = @@ -7344,6 +9222,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WRING_OUT] = @@ -7359,6 +9242,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POWER_TRICK] = @@ -7378,6 +9266,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GASTRO_ACID] = @@ -7395,6 +9288,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LUCKY_CHANT] = @@ -7414,6 +9312,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_LUCKY_CHANT, + .contestComboMoves = {COMBO_STARTER_HEAL_BELL}, }, [MOVE_ME_FIRST] = @@ -7440,6 +9343,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .mimicBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COPYCAT] = @@ -7465,6 +9373,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .mimicBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POWER_SWAP] = @@ -7482,6 +9395,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GUARD_SWAP] = @@ -7499,6 +9417,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PUNISHMENT] = @@ -7515,6 +9438,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LAST_RESORT] = @@ -7531,6 +9459,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WORRY_SEED] = @@ -7548,6 +9481,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_WORRY_SEED, + .contestComboMoves = {COMBO_STARTER_LEECH_SEED}, }, [MOVE_SUCKER_PUNCH] = @@ -7563,6 +9501,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TOXIC_SPIKES] = @@ -7584,6 +9527,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .forcePressure = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEART_SWAP] = @@ -7601,6 +9549,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AQUA_RING] = @@ -7620,6 +9573,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MAGNET_RISE] = @@ -7640,6 +9598,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .gravityBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLARE_BLITZ] = @@ -7664,6 +9627,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_FORCE_PALM] = @@ -7685,6 +9653,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AURA_SPHERE] = @@ -7702,6 +9675,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ROCK_POLISH] = @@ -7721,6 +9699,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POISON_JAB] = @@ -7742,6 +9725,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DARK_PULSE] = @@ -7763,6 +9751,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_NIGHT_SLASH] = @@ -7781,6 +9774,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AQUA_TAIL] = @@ -7797,6 +9795,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_SEED_BOMB] = @@ -7813,6 +9816,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AIR_SLASH] = @@ -7834,6 +9842,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_X_SCISSOR] = @@ -7851,6 +9864,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, }, [MOVE_BUG_BUZZ] = @@ -7873,6 +9891,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_PULSE] = @@ -7889,6 +9912,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_RUSH] = @@ -7911,6 +9939,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_DRAGON_RUSH, + .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_TAIL}, }, [MOVE_POWER_GEM] = @@ -7926,6 +9959,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAIN_PUNCH] = @@ -7943,6 +9981,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .punchingMove = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_VACUUM_WAVE] = @@ -7958,6 +10001,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FOCUS_BLAST] = @@ -7979,6 +10027,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, }, [MOVE_ENERGY_BALL] = @@ -8000,6 +10053,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_BRAVE_BIRD] = @@ -8017,6 +10075,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_BRAVE_BIRD, + .contestComboMoves = {0} }, [MOVE_EARTH_POWER] = @@ -8038,6 +10101,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SWITCHEROO] = @@ -8057,6 +10125,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GIGA_IMPACT] = @@ -8076,6 +10149,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_NASTY_PLOT] = @@ -8095,6 +10173,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BULLET_PUNCH] = @@ -8112,6 +10195,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AVALANCHE] = @@ -8127,6 +10215,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = -4, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ICE_SHARD] = @@ -8142,6 +10235,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SHADOW_CLAW] = @@ -8159,6 +10257,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_THUNDER_FANG] = @@ -8186,6 +10289,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_THUNDER_FANG, + .contestComboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_FANG, COMBO_STARTER_ICE_FANG}, }, [MOVE_ICE_FANG] = @@ -8212,6 +10320,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_ICE_FANG, + .contestComboMoves = {COMBO_STARTER_FIRE_FANG, COMBO_STARTER_THUNDER_FANG}, }, [MOVE_FIRE_FANG] = @@ -8239,6 +10352,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_FIRE_FANG, + .contestComboMoves = {COMBO_STARTER_ICE_FANG, COMBO_STARTER_THUNDER_FANG}, }, [MOVE_SHADOW_SNEAK] = @@ -8255,6 +10373,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MUD_BOMB] = @@ -8276,6 +10399,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PSYCHO_CUT] = @@ -8293,6 +10421,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ZEN_HEADBUTT] = @@ -8314,6 +10447,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MIRROR_SHOT] = @@ -8334,6 +10472,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLASH_CANNON] = @@ -8354,6 +10497,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ROCK_CLIMB] = @@ -8375,6 +10523,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DEFOG] = @@ -8393,6 +10546,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, //.ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TRICK_ROOM] = @@ -8410,6 +10568,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRACO_METEOR] = @@ -8429,6 +10592,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DISCHARGE] = @@ -8449,6 +10617,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE}, }, [MOVE_LAVA_PLUME] = @@ -8468,6 +10641,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_LEAF_STORM] = @@ -8487,6 +10665,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POWER_WHIP] = @@ -8503,6 +10686,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_ROCK_WRECKER] = @@ -8522,6 +10710,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CROSS_POISON] = @@ -8545,6 +10738,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GUNK_SHOT] = @@ -8565,6 +10763,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_IRON_HEAD] = @@ -8586,6 +10789,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MAGNET_BOMB] = @@ -8602,6 +10810,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STONE_EDGE] = @@ -8618,6 +10831,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CAPTIVATE] = @@ -8635,6 +10853,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARM}, }, [MOVE_STEALTH_ROCK] = @@ -8655,6 +10878,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .forcePressure = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GRASS_KNOT] = @@ -8672,6 +10900,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CHATTER] = @@ -8707,6 +10940,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .chance = 31, #endif }), + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_JUDGMENT] = @@ -8723,6 +10961,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .argument = HOLD_EFFECT_PLATE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BUG_BITE] = @@ -8741,6 +10984,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BUG_BITE, }), + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CHARGE_BEAM] = @@ -8762,6 +11010,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 70, }), + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE}, }, [MOVE_WOOD_HAMMER] = @@ -8779,6 +11032,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AQUA_JET] = @@ -8795,6 +11053,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_ATTACK_ORDER] = @@ -8811,6 +11074,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_ATTACK_ORDER, + .contestComboMoves = {COMBO_STARTER_DEFEND_ORDER, COMBO_STARTER_HEAL_ORDER}, }, [MOVE_DEFEND_ORDER] = @@ -8830,6 +11098,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_DEFEND_ORDER, + .contestComboMoves = {COMBO_STARTER_ATTACK_ORDER, COMBO_STARTER_HEAL_ORDER}, }, [MOVE_HEAL_ORDER] = @@ -8850,6 +11123,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_HEAL_ORDER, + .contestComboMoves = {COMBO_STARTER_ATTACK_ORDER, COMBO_STARTER_DEFEND_ORDER}, }, [MOVE_HEAD_SMASH] = @@ -8867,6 +11145,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DOUBLE_HIT] = @@ -8884,6 +11167,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ROAR_OF_TIME] = @@ -8903,6 +11191,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPACIAL_REND] = @@ -8919,6 +11212,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LUNAR_DANCE] = @@ -8938,6 +11236,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .danceMove = TRUE, + + .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CRUSH_GRIP] = @@ -8953,6 +11256,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MAGMA_STORM] = @@ -8971,6 +11279,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_DARK_VOID] = @@ -8989,6 +11302,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .sketchBanned = (B_SKETCH_BANS >= GEN_9), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SEED_FLARE] = @@ -9009,6 +11327,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_2, .chance = 40, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_OMINOUS_WIND] = @@ -9031,6 +11354,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SHADOW_FORCE] = @@ -9055,6 +11383,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FEINT, }), + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HONE_CLAWS] = @@ -9074,6 +11407,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WIDE_GUARD] = @@ -9096,6 +11434,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .protectionMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GUARD_SPLIT] = @@ -9113,6 +11456,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POWER_SPLIT] = @@ -9130,6 +11478,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WONDER_ROOM] = @@ -9147,6 +11500,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PSYSHOCK] = @@ -9161,6 +11519,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_VENOSHOCK] = @@ -9177,6 +11540,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .argument = STATUS1_PSN_ANY, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_TOXIC}, }, [MOVE_AUTOTOMIZE] = @@ -9196,6 +11564,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_RAGE_POWDER] = @@ -9218,6 +11591,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TELEKINESIS] = @@ -9236,6 +11614,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .gravityBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MAGIC_ROOM] = @@ -9253,6 +11636,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SMACK_DOWN] = @@ -9273,6 +11661,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SMACK_DOWN, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STORM_THROW] = @@ -9289,6 +11682,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .alwaysCriticalHit = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLAME_BURST] = @@ -9308,6 +11706,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLAME_BURST, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SLUDGE_WAVE] = @@ -9328,6 +11731,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_QUIVER_DANCE] = @@ -9348,6 +11756,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEAVY_SLAM] = @@ -9365,6 +11778,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_7, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SYNCHRONOISE] = @@ -9380,6 +11798,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ELECTRO_BALL] = @@ -9396,6 +11819,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SOAK] = @@ -9413,6 +11841,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLAME_CHARGE] = @@ -9435,6 +11868,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COIL] = @@ -9454,6 +11892,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LOW_SWEEP] = @@ -9475,6 +11918,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ACID_SPRAY] = @@ -9496,6 +11944,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_2, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FOUL_PLAY] = @@ -9512,6 +11965,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SIMPLE_BEAM] = @@ -9529,6 +11987,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ENTRAINMENT] = @@ -9546,6 +12009,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AFTER_YOU] = @@ -9566,6 +12034,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ROUND] = @@ -9586,6 +12059,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ROUND, }), + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ECHOED_VOICE] = @@ -9603,6 +12081,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CHIP_AWAY] = @@ -9619,6 +12102,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CLEAR_SMOG] = @@ -9637,6 +12125,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CLEAR_SMOG, }), + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STORED_POWER] = @@ -9652,6 +12145,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_QUICK_GUARD] = @@ -9674,6 +12172,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .protectionMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ALLY_SWITCH] = @@ -9692,6 +12195,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SCALD] = @@ -9713,6 +12221,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_SCALD, + .contestComboMoves = {0} }, [MOVE_SHELL_SMASH] = @@ -9732,6 +12245,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEAL_PULSE] = @@ -9752,6 +12270,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .pulseMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEX] = @@ -9768,6 +12291,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .argument = STATUS1_ANY, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_TOXIC}, }, [MOVE_SKY_DROP] = @@ -9789,6 +12317,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SHIFT_GEAR] = @@ -9808,6 +12341,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CIRCLE_THROW] = @@ -9825,6 +12363,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_INCINERATE] = @@ -9843,6 +12386,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_INCINERATE, }), + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_QUASH] = @@ -9860,6 +12408,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ACROBATICS] = @@ -9876,6 +12429,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_REFLECT_TYPE] = @@ -9894,6 +12452,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_RETALIATE] = @@ -9910,6 +12473,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FINAL_GAMBIT] = @@ -9927,6 +12495,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BESTOW] = @@ -9948,6 +12521,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_INFERNO] = @@ -9968,6 +12546,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WATER_PLEDGE] = @@ -9984,6 +12567,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FIRE_PLEDGE] = @@ -10000,6 +12588,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GRASS_PLEDGE] = @@ -10016,6 +12609,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_VOLT_SWITCH] = @@ -10030,6 +12628,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STRUGGLE_BUG] = @@ -10050,6 +12653,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BULLDOZE] = @@ -10071,6 +12679,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FROST_BREATH] = @@ -10086,6 +12699,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .alwaysCriticalHit = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_TAIL] = @@ -10103,6 +12721,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = COMBO_STARTER_DRAGON_TAIL, + .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH}, }, [MOVE_WORK_UP] = @@ -10121,7 +12744,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE + .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ELECTROWEB] = @@ -10142,6 +12770,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_WILD_CHARGE] = @@ -10159,6 +12792,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRILL_RUN] = @@ -10176,6 +12814,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DUAL_CHOP] = @@ -10193,6 +12836,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEART_STAMP] = @@ -10214,6 +12862,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HORN_LEECH] = @@ -10230,6 +12883,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SACRED_SWORD] = @@ -10247,6 +12905,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, .slicingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_RAZOR_SHELL] = @@ -10269,6 +12932,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEAT_CRASH] = @@ -10285,6 +12953,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LEAF_TORNADO] = @@ -10306,6 +12979,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STEAMROLLER] = @@ -10328,6 +13006,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COTTON_GUARD] = @@ -10347,6 +13030,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_NIGHT_DAZE] = @@ -10367,6 +13055,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 40, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PSYSTRIKE] = @@ -10381,6 +13074,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TAIL_SLAP] = @@ -10397,6 +13095,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HURRICANE] = @@ -10419,6 +13122,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HEAD_CHARGE] = @@ -10436,6 +13144,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GEAR_GRIND] = @@ -10453,6 +13166,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SEARING_SHOT] = @@ -10473,6 +13191,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TECHNO_BLAST] = @@ -10490,6 +13213,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .argument = HOLD_EFFECT_DRIVE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_RELIC_SONG] = @@ -10514,6 +13242,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SLEEP, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SECRET_SWORD] = @@ -10531,6 +13264,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .slicingMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GLACIATE] = @@ -10551,6 +13289,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BOLT_STRIKE] = @@ -10572,6 +13315,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BLUE_FLARE] = @@ -10592,6 +13340,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FIERY_DANCE] = @@ -10614,6 +13367,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FREEZE_SHOCK] = @@ -10638,6 +13396,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ICE_BURN] = @@ -10662,6 +13425,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SNARL] = @@ -10685,6 +13453,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ICICLE_CRASH] = @@ -10705,6 +13478,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_V_CREATE] = @@ -10726,6 +13504,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_V_CREATE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FUSION_FLARE] = @@ -10742,6 +13525,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .thawsUser = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FUSION_BOLT] = @@ -10757,6 +13545,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLYING_PRESS] = @@ -10777,6 +13570,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .minimizeDoubleDamage = TRUE, .gravityBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MAT_BLOCK] = @@ -10801,6 +13599,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .assistBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BELCH] = @@ -10824,6 +13627,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ROTOTILLER] = @@ -10843,6 +13651,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STICKY_WEB] = @@ -10863,6 +13676,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .magicCoatAffected = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FELL_STINGER] = @@ -10879,6 +13697,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PHANTOM_FORCE] = @@ -10907,6 +13730,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FEINT, }), + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TRICK_OR_TREAT] = @@ -10929,6 +13757,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = TYPE_GHOST, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_NOBLE_ROAR] = @@ -10948,6 +13781,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ION_DELUGE] = @@ -10966,6 +13804,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PARABOLIC_CHARGE] = @@ -10986,6 +13829,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FORESTS_CURSE] = @@ -11008,6 +13856,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = TYPE_GRASS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PETAL_BLIZZARD] = @@ -11028,6 +13881,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .windMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FREEZE_DRY] = @@ -11048,6 +13906,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DISARMING_VOICE] = @@ -11069,6 +13932,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PARTING_SHOT] = @@ -11088,6 +13956,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TOPSY_TURVY] = @@ -11105,6 +13978,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAINING_KISS] = @@ -11126,6 +14004,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = 75, // restores 75% HP instead of 50% HP .makesContact = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CRAFTY_SHIELD] = @@ -11150,6 +14033,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLOWER_SHIELD] = @@ -11172,6 +14060,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GRASSY_TERRAIN] = @@ -11195,6 +14088,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_GRASSY_TERRAIN, + .contestComboMoves = {0} }, [MOVE_MISTY_TERRAIN] = @@ -11218,6 +14116,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = COMBO_STARTER_MISTY_TERRAIN, + .contestComboMoves = {0} }, [MOVE_ELECTRIFY] = @@ -11234,6 +14137,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PLAY_ROUGH] = @@ -11255,6 +14163,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FAIRY_WIND] = @@ -11271,6 +14184,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .windMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MOONBLAST] = @@ -11291,6 +14209,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BOOMBURST] = @@ -11308,6 +14231,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FAIRY_LOCK] = @@ -11326,6 +14254,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_KINGS_SHIELD] = @@ -11353,6 +14286,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PLAY_NICE] = @@ -11372,6 +14310,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CONFIDE] = @@ -11392,6 +14335,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DIAMOND_STORM] = @@ -11416,6 +14364,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = B_UPDATED_MOVE_DATA >= GEN_7 ? MOVE_EFFECT_DEF_PLUS_2: MOVE_EFFECT_DEF_PLUS_1, .chance = 50, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STEAM_ERUPTION] = @@ -11442,6 +14395,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SCALD}, }, [MOVE_HYPERSPACE_HOLE] = @@ -11466,6 +14424,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FEINT, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_HYPERSPACE_HOLE, + .contestComboMoves = {COMBO_STARTER_HYPERSPACE_FURY}, }, [MOVE_WATER_SHURIKEN] = @@ -11485,6 +14448,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .category = B_UPDATED_MOVE_DATA >= GEN_7 ? BATTLE_CATEGORY_SPECIAL : BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MYSTICAL_FIRE] = @@ -11509,6 +14477,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPIKY_SHIELD] = @@ -11531,6 +14504,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AROMATIC_MIST] = @@ -11554,6 +14532,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_EERIE_IMPULSE] = @@ -11575,6 +14558,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_VENOM_DRENCH] = @@ -11592,6 +14580,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_TOXIC}, }, [MOVE_POWDER] = @@ -11610,6 +14603,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .powderMove = TRUE, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GEOMANCY] = @@ -11630,6 +14628,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MAGNETIC_FLUX] = @@ -11654,6 +14657,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HAPPY_HOUR] = @@ -11672,6 +14680,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ELECTRIC_TERRAIN] = @@ -11695,6 +14708,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = COMBO_STARTER_ELECTRIC_TERRAIN, + .contestComboMoves = {0} }, [MOVE_DAZZLING_GLEAM] = @@ -11714,6 +14732,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CELEBRATE] = @@ -11738,6 +14761,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HOLD_HANDS] = @@ -11762,6 +14790,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BABY_DOLL_EYES] = @@ -11783,6 +14816,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_NUZZLE] = @@ -11804,6 +14842,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HOLD_BACK] = @@ -11819,6 +14862,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_INFESTATION] = @@ -11838,6 +14886,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POWER_UP_PUNCH] = @@ -11865,6 +14918,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_OBLIVION_WING] = @@ -11885,6 +14943,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_THOUSAND_ARROWS] = @@ -11911,6 +14974,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SMACK_DOWN, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_THOUSAND_ARROWS, + .contestComboMoves = {COMBO_STARTER_THOUSAND_WAVES}, }, [MOVE_THOUSAND_WAVES] = @@ -11935,6 +15003,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PREVENT_ESCAPE, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_THOUSAND_WAVES, + .contestComboMoves = {COMBO_STARTER_THOUSAND_ARROWS}, }, [MOVE_LANDS_WRATH] = @@ -11951,6 +15024,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LIGHT_OF_RUIN] = @@ -11989,6 +15067,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PRECIPICE_BLADES] = @@ -12009,6 +15092,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_ASCENT] = @@ -12033,6 +15121,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_SPDEF_DOWN, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HYPERSPACE_FURY] = @@ -12061,6 +15154,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_HYPERSPACE_FURY, + .contestComboMoves = {COMBO_STARTER_HYPERSPACE_HOLE}, }, [MOVE_SHORE_UP] = @@ -12081,6 +15179,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SANDSTORM} }, [MOVE_FIRST_IMPRESSION] = @@ -12101,6 +15204,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 2, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BANEFUL_BUNKER] = @@ -12127,6 +15235,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPIRIT_SHACKLE] = @@ -12151,6 +15264,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PREVENT_ESCAPE, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DARKEST_LARIAT] = @@ -12172,6 +15290,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPARKLING_ARIA] = @@ -12199,6 +15322,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_REMOVE_STATUS, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SCALD}, }, [MOVE_ICE_HAMMER] = @@ -12220,6 +15348,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL}, }, [MOVE_FLORAL_HEALING] = @@ -12244,6 +15377,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_HIGH_HORSEPOWER] = @@ -12264,6 +15402,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STRENGTH_SAP] = @@ -12282,6 +15425,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SOLAR_BLADE] = @@ -12302,6 +15450,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .slicingMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_LEAFAGE] = @@ -12317,6 +15470,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GROWTH}, }, [MOVE_SPOTLIGHT] = @@ -12338,6 +15496,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TOXIC_THREAD] = @@ -12355,6 +15518,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_TOXIC}, }, [MOVE_LASER_FOCUS] = @@ -12374,6 +15542,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GEAR_UP] = @@ -12394,6 +15567,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_THROAT_CHOP] = @@ -12415,6 +15593,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THROAT_CHOP, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POLLEN_PUFF] = @@ -12431,6 +15614,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ANCHOR_SHOT] = @@ -12452,6 +15640,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PREVENT_ESCAPE, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PSYCHIC_TERRAIN] = @@ -12474,6 +15667,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = COMBO_STARTER_PSYCHIC_TERRAIN, + .contestComboMoves = {0} }, [MOVE_LUNGE] = @@ -12495,6 +15693,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FIRE_LASH] = @@ -12516,6 +15719,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_POWER_TRIP] = @@ -12532,6 +15740,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BURN_UP] = @@ -12553,6 +15766,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_REMOVE_ARG_TYPE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, }, [MOVE_SPEED_SWAP] = @@ -12570,6 +15788,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SMART_STRIKE] = @@ -12586,6 +15809,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PURIFY] = @@ -12605,6 +15833,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_REVELATION_DANCE] = @@ -12625,6 +15858,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .danceMove = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CORE_ENFORCER] = @@ -12648,6 +15886,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CORE_ENFORCER, }), + + .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TROP_KICK] = @@ -12669,6 +15912,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_INSTRUCT] = @@ -12689,6 +15937,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .instructBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BEAK_BLAST] = @@ -12712,6 +15965,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CLANGING_SCALES] = @@ -12737,6 +15995,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_HAMMER] = @@ -12757,6 +16020,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, }, [MOVE_BRUTAL_SWING] = @@ -12773,6 +16041,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_AURORA_VEIL] = @@ -12792,6 +16065,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_HAIL}, }, [MOVE_SHELL_TRAP] = @@ -12814,6 +16092,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLEUR_CANNON] = @@ -12834,6 +16117,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PSYCHIC_FANGS] = @@ -12855,6 +16143,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STOMPING_TANTRUM] = @@ -12876,6 +16169,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SHADOW_BONE] = @@ -12896,6 +16194,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = COMBO_STARTER_SHADOW_BONE, + .contestComboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH}, }, [MOVE_ACCELEROCK] = @@ -12912,6 +16215,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LIQUIDATION] = @@ -12933,6 +16241,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, }, [MOVE_PRISMATIC_LASER] = @@ -12956,6 +16269,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SPECTRAL_THIEF] = @@ -12981,6 +16299,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPECTRAL_THIEF, }), + + .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SUNSTEEL_STRIKE] = @@ -13003,6 +16326,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MOONGEIST_BEAM] = @@ -13024,6 +16352,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TEARFUL_LOOK] = @@ -13042,6 +16375,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ZING_ZAP] = @@ -13062,6 +16400,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_CHARGE}, }, [MOVE_NATURES_MADNESS] = @@ -13082,6 +16425,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MULTI_ATTACK] = @@ -13099,6 +16447,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .argument = HOLD_EFFECT_MEMORY, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MIND_BLOWN] = @@ -13115,6 +16468,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PLASMA_FISTS] = @@ -13133,6 +16491,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PHOTON_GEYSER] = @@ -13154,6 +16517,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ZIPPY_ZAP] = @@ -13459,6 +16827,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DYNAMAX_CANNON] = @@ -13487,6 +16860,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_SNIPE_SHOT] = @@ -13503,6 +16881,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_JAW_LOCK] = @@ -13523,6 +16906,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_TRAP_BOTH, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STUFF_CHEEKS] = @@ -13541,6 +16929,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_NO_RETREAT] = @@ -13559,6 +16952,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TAR_SHOT] = @@ -13575,6 +16973,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MAGIC_POWDER] = @@ -13593,6 +16996,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = TYPE_PSYCHIC, .magicCoatAffected = TRUE, .powderMove = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_DARTS] = @@ -13610,6 +17018,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .strikeCount = 2, .parentalBondBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_TEATIME] = @@ -13628,6 +17041,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_OCTOLOCK] = @@ -13643,6 +17061,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_STATUS, + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BOLT_BEAK] = @@ -13659,6 +17082,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FISHIOUS_REND] = @@ -13680,6 +17108,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COURT_CHANGE] = @@ -13696,6 +17129,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, + + .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_CLANGOROUS_SOUL] = @@ -13721,6 +17159,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .soundMove = TRUE, .danceMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BODY_PRESS] = @@ -13739,6 +17182,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DECORATE] = @@ -13757,6 +17205,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRUM_BEATING] = @@ -13778,6 +17231,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SNAP_TRAP] = @@ -13799,6 +17257,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_PYRO_BALL] = @@ -13822,6 +17285,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BEHEMOTH_BLADE] = @@ -13847,6 +17315,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .mimicBanned = TRUE, .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_BEHEMOTH_BASH] = @@ -13871,6 +17344,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .mimicBanned = TRUE, .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_AURA_WHEEL] = @@ -13893,6 +17371,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BREAKING_SWIPE] = @@ -13919,6 +17402,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_BRANCH_POKE] = @@ -13936,6 +17424,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_OVERDRIVE] = @@ -13954,6 +17447,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_APPLE_ACID] = @@ -13975,6 +17473,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_GRAV_APPLE] = @@ -13996,6 +17499,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_SPIRIT_BREAK] = @@ -14018,6 +17526,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STRANGE_STEAM] = @@ -14043,6 +17556,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LIFE_DEW] = @@ -14064,6 +17582,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_OBSTRUCT] = @@ -14084,6 +17607,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .instructBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_FALSE_SURRENDER] = @@ -14105,6 +17633,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_METEOR_ASSAULT] = @@ -14130,6 +17663,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_ETERNABEAM] = @@ -14150,6 +17688,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_STEEL_BEAM] = @@ -14166,6 +17709,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_EXPANDING_FORCE] = @@ -14185,6 +17733,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_PSYCHIC_TERRAIN} }, [MOVE_STEEL_ROLLER] = @@ -14203,6 +17756,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_FAIL, // Remove a field terrain if there is one and hit, otherwise fail. .skyBattleBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_SCALE_SHOT] = @@ -14219,6 +17777,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .argument = MOVE_EFFECT_SCALE_SHOT, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_METEOR_BEAM] = @@ -14241,6 +17804,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .self = TRUE, .onChargeTurnOnly = TRUE, }), + + .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_SHELL_SIDE_ARM] = @@ -14265,6 +17833,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_MISTY_EXPLOSION] = @@ -14284,6 +17857,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_MISTY_TERRAIN} }, [MOVE_GRASSY_GLIDE] = @@ -14301,6 +17879,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, + + .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_GRASSY_TERRAIN} }, [MOVE_RISING_VOLTAGE] = @@ -14320,6 +17903,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN} }, [MOVE_TERRAIN_PULSE] = @@ -14340,6 +17928,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN, COMBO_STARTER_MISTY_TERRAIN, COMBO_STARTER_GRASSY_TERRAIN, COMBO_STARTER_PSYCHIC_TERRAIN}, }, [MOVE_SKITTER_SMACK] = @@ -14365,6 +17958,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_BURNING_JEALOUSY] = @@ -14390,6 +17988,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .onlyIfTargetRaisedStats = TRUE, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_LASH_OUT] = @@ -14406,6 +18009,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_POLTERGEIST] = @@ -14421,6 +18029,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_CORROSIVE_GAS] = @@ -14441,6 +18054,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .magicCoatAffected = TRUE, + + .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_COACHING] = @@ -14459,6 +18077,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FLIP_TURN] = @@ -14475,6 +18098,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + + .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_TRIPLE_AXEL] = @@ -14492,6 +18120,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DUAL_WINGBEAT] = @@ -14513,6 +18146,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, + + .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_SCORCHING_SANDS] = @@ -14538,6 +18176,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_JUNGLE_HEALING] = @@ -14562,6 +18205,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_WICKED_BLOW] = @@ -14581,6 +18229,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .alwaysCriticalHit = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_SURGING_STRIKES] = @@ -14605,6 +18258,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .punchingMove = TRUE, .strikeCount = 3, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_THUNDER_CAGE] = @@ -14624,6 +18282,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), + + .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DRAGON_ENERGY] = @@ -14644,6 +18307,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FREEZING_GLARE] = @@ -14673,6 +18341,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_FIERY_WRATH] = @@ -14693,6 +18366,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_THUNDEROUS_KICK] = @@ -14719,6 +18397,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 100, }), + + .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_GLACIAL_LANCE] = @@ -14739,6 +18422,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_ASTRAL_BARRAGE] = @@ -14759,6 +18447,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, + + .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0}, }, [MOVE_EERIE_SPELL] = @@ -14777,6 +18470,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, + + .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_SMART, + .contestComboStarterId = 0, + .contestComboMoves = {0} }, [MOVE_DIRE_CLAW] = From ab344b88a3696b98c551d34741fdf85bd3fbf6ef Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 26 Jan 2024 00:38:06 -0300 Subject: [PATCH 19/30] Renamed gBattleMoves to gMovesInfo This is consistent with gSpeciesInfo, the array that contains most of the species data. --- include/battle.h | 8 +- include/config/battle.h | 2 +- include/pokemon.h | 2 +- include/test/battle.h | 14 +- src/battle_ai_main.c | 134 +++++----- src/battle_ai_switch_items.c | 36 +-- src/battle_ai_util.c | 148 +++++------ src/battle_anim_new.c | 2 +- src/battle_arena.c | 16 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 8 +- src/battle_controller_player_partner.c | 4 +- src/battle_controllers.c | 2 +- src/battle_dome.c | 44 ++-- src/battle_dynamax.c | 40 +-- src/battle_gfx_sfx_util.c | 2 +- src/battle_main.c | 58 ++-- src/battle_message.c | 2 +- src/battle_script_commands.c | 248 +++++++++--------- src/battle_tower.c | 10 +- src/battle_tv.c | 16 +- src/battle_util.c | 214 +++++++-------- src/battle_z_move.c | 38 +-- src/contest.c | 34 +-- src/contest_ai.c | 24 +- src/contest_effect.c | 24 +- src/data/battle_moves.h | 2 +- src/data/party_menu.h | 28 +- src/frontier_util.c | 2 +- src/item_menu.c | 12 +- src/menu_specialized.c | 6 +- src/move_relearner.c | 4 +- src/pokedex_plus_hgss.c | 20 +- src/pokemon.c | 24 +- src/pokemon_summary_screen.c | 30 +-- src/rom_header_gf.c | 4 +- test/battle/ability/anger_shell.c | 6 +- test/battle/ability/battle_bond.c | 2 +- test/battle/ability/beads_of_ruin.c | 4 +- test/battle/ability/blaze.c | 2 +- test/battle/ability/cloud_nine.c | 2 +- test/battle/ability/compound_eyes.c | 6 +- test/battle/ability/contrary.c | 10 +- test/battle/ability/corrosion.c | 8 +- test/battle/ability/cute_charm.c | 6 +- test/battle/ability/damp.c | 2 +- test/battle/ability/defeatist.c | 4 +- test/battle/ability/desolate_land.c | 10 +- test/battle/ability/download.c | 6 +- test/battle/ability/dragons_maw.c | 10 +- test/battle/ability/dry_skin.c | 14 +- test/battle/ability/earth_eater.c | 8 +- test/battle/ability/electromorphosis.c | 12 +- test/battle/ability/flame_body.c | 6 +- test/battle/ability/flower_gift.c | 4 +- test/battle/ability/fluffy.c | 10 +- test/battle/ability/frisk.c | 4 +- test/battle/ability/gale_wings.c | 6 +- test/battle/ability/hyper_cutter.c | 16 +- test/battle/ability/ice_scales.c | 8 +- test/battle/ability/immunity.c | 4 +- test/battle/ability/innards_out.c | 10 +- test/battle/ability/insomnia.c | 6 +- test/battle/ability/intimidate.c | 4 +- test/battle/ability/keen_eye.c | 16 +- test/battle/ability/leaf_guard.c | 10 +- test/battle/ability/magic_bounce.c | 12 +- test/battle/ability/magician.c | 2 +- test/battle/ability/minds_eye.c | 2 +- test/battle/ability/mirror_armor.c | 4 +- test/battle/ability/neuroforce.c | 4 +- test/battle/ability/oblivious.c | 6 +- test/battle/ability/opportunist.c | 2 +- test/battle/ability/overcoat.c | 2 +- test/battle/ability/overgrow.c | 2 +- test/battle/ability/own_tempo.c | 8 +- test/battle/ability/parental_bond.c | 26 +- test/battle/ability/pastel_veil.c | 12 +- test/battle/ability/poison_point.c | 6 +- test/battle/ability/prankster.c | 4 +- test/battle/ability/primordial_sea.c | 10 +- test/battle/ability/protosynthesis.c | 4 +- test/battle/ability/purifying_salt.c | 10 +- test/battle/ability/quark_drive.c | 4 +- test/battle/ability/rattled.c | 20 +- test/battle/ability/rocky_payload.c | 10 +- test/battle/ability/sand_veil.c | 2 +- test/battle/ability/sap_sipper.c | 2 +- test/battle/ability/seed_sower.c | 4 +- test/battle/ability/sharpness.c | 4 +- test/battle/ability/sheer_force.c | 14 +- test/battle/ability/snow_cloak.c | 2 +- test/battle/ability/stamina.c | 10 +- test/battle/ability/static.c | 6 +- test/battle/ability/steelworker.c | 10 +- test/battle/ability/stench.c | 4 +- test/battle/ability/sturdy.c | 2 +- test/battle/ability/swarm.c | 6 +- test/battle/ability/sword_of_ruin.c | 4 +- test/battle/ability/tablets_of_ruin.c | 4 +- test/battle/ability/torrent.c | 2 +- test/battle/ability/toxic_debris.c | 4 +- test/battle/ability/transistor.c | 10 +- test/battle/ability/vessel_of_ruin.c | 4 +- test/battle/ability/volt_absorb.c | 18 +- test/battle/ability/water_absorb.c | 14 +- test/battle/ability/weak_armor.c | 12 +- test/battle/ability/wind_power.c | 22 +- test/battle/ability/zero_to_hero.c | 14 +- test/battle/ai.c | 84 +++--- test/battle/ai_check_viability.c | 28 +- test/battle/ai_trytofaint.c | 6 +- test/battle/crit_chance.c | 12 +- test/battle/damage_formula.c | 6 +- test/battle/form_change/mega_evolution.c | 2 +- test/battle/form_change/primal_reversion.c | 8 +- test/battle/form_change/ultra_burst.c | 2 +- test/battle/hold_effect/air_balloon.c | 6 +- test/battle/hold_effect/attack_up.c | 4 +- test/battle/hold_effect/berserk_gene.c | 12 +- test/battle/hold_effect/clear_amulet.c | 14 +- test/battle/hold_effect/critical_hit_up.c | 6 +- test/battle/hold_effect/defense_up.c | 4 +- test/battle/hold_effect/jaboca_berry.c | 6 +- test/battle/hold_effect/kee_berry.c | 6 +- test/battle/hold_effect/maranga_berry.c | 6 +- test/battle/hold_effect/metronome.c | 4 +- test/battle/hold_effect/micle_berry.c | 6 +- test/battle/hold_effect/mirror_herb.c | 2 +- test/battle/hold_effect/red_card.c | 2 +- test/battle/hold_effect/rowap_berry.c | 6 +- test/battle/hold_effect/safety_goggles.c | 2 +- test/battle/hold_effect/special_attack_up.c | 4 +- test/battle/hold_effect/special_defense_up.c | 4 +- test/battle/hold_effect/speed_up.c | 4 +- test/battle/hold_effect/utility_umbrella.c | 4 +- test/battle/hold_effect/white_herb.c | 6 +- test/battle/item_effect/escape.c | 2 +- test/battle/item_effect/increase_stat.c | 14 +- test/battle/move.c | 16 +- test/battle/move_effect/absorb.c | 4 +- test/battle/move_effect/accuracy_down.c | 6 +- test/battle/move_effect/after_you.c | 2 +- test/battle/move_effect/ally_switch.c | 8 +- test/battle/move_effect/assist.c | 2 +- test/battle/move_effect/attack_down.c | 4 +- test/battle/move_effect/attack_up.c | 4 +- test/battle/move_effect/attack_up_user_ally.c | 8 +- test/battle/move_effect/aura_wheel.c | 2 +- test/battle/move_effect/aurora_veil.c | 2 +- test/battle/move_effect/axe_kick.c | 2 +- test/battle/move_effect/barb_barrage.c | 4 +- test/battle/move_effect/beak_blast.c | 14 +- test/battle/move_effect/belly_drum.c | 6 +- test/battle/move_effect/bide.c | 2 +- test/battle/move_effect/brick_break.c | 10 +- test/battle/move_effect/bug_bite.c | 2 +- test/battle/move_effect/burn_hit.c | 4 +- test/battle/move_effect/burn_up.c | 2 +- test/battle/move_effect/chilly_reception.c | 2 +- test/battle/move_effect/collision_course.c | 2 +- test/battle/move_effect/corrosive_gas.c | 4 +- test/battle/move_effect/court_change.c | 2 +- test/battle/move_effect/defense_down.c | 4 +- test/battle/move_effect/defense_up.c | 4 +- test/battle/move_effect/defog.c | 32 +-- test/battle/move_effect/doodle.c | 2 +- test/battle/move_effect/double_shock.c | 2 +- test/battle/move_effect/dream_eater.c | 2 +- test/battle/move_effect/embargo.c | 2 +- test/battle/move_effect/encore.c | 2 +- test/battle/move_effect/evasion_up.c | 6 +- test/battle/move_effect/explosion.c | 4 +- test/battle/move_effect/fickle_beam.c | 6 +- test/battle/move_effect/fillet_away.c | 2 +- test/battle/move_effect/fling.c | 16 +- test/battle/move_effect/focus_punch.c | 2 +- test/battle/move_effect/freeze_hit.c | 4 +- test/battle/move_effect/glaive_rush.c | 4 +- test/battle/move_effect/haze.c | 6 +- test/battle/move_effect/heal_pulse.c | 8 +- test/battle/move_effect/healing_wish.c | 4 +- test/battle/move_effect/hex.c | 4 +- test/battle/move_effect/hit_escape.c | 4 +- .../move_effect/hit_set_remove_terrain.c | 12 +- test/battle/move_effect/hit_switch_target.c | 4 +- test/battle/move_effect/hurricane.c | 4 +- test/battle/move_effect/hydro_steam.c | 2 +- test/battle/move_effect/infernal_parade.c | 4 +- test/battle/move_effect/ion_deluge.c | 4 +- test/battle/move_effect/ivy_cudgel.c | 2 +- test/battle/move_effect/knock_off.c | 2 +- test/battle/move_effect/last_resort.c | 4 +- test/battle/move_effect/leech_seed.c | 2 +- test/battle/move_effect/make_it_rain.c | 2 +- test/battle/move_effect/max_hp_50_recoil.c | 2 +- test/battle/move_effect/meteor_beam.c | 2 +- test/battle/move_effect/metronome.c | 8 +- test/battle/move_effect/mind_blown.c | 2 +- test/battle/move_effect/mirror_move.c | 8 +- test/battle/move_effect/moonlight.c | 2 +- test/battle/move_effect/morning_sun.c | 2 +- test/battle/move_effect/multi_hit.c | 8 +- test/battle/move_effect/ohko.c | 2 +- test/battle/move_effect/paralyze_hit.c | 2 +- test/battle/move_effect/photon_geyser.c | 4 +- test/battle/move_effect/plasma_fists.c | 4 +- test/battle/move_effect/pledge.c | 10 +- test/battle/move_effect/population_bomb.c | 2 +- test/battle/move_effect/protect.c | 60 ++--- test/battle/move_effect/psychic_noise.c | 2 +- test/battle/move_effect/rage_fist.c | 8 +- test/battle/move_effect/recoil.c | 10 +- test/battle/move_effect/recoil_if_miss.c | 6 +- test/battle/move_effect/reflect.c | 6 +- test/battle/move_effect/relic_song.c | 2 +- test/battle/move_effect/revival_blessing.c | 2 +- test/battle/move_effect/roar.c | 2 +- test/battle/move_effect/roost.c | 38 +-- test/battle/move_effect/salt_cure.c | 2 +- test/battle/move_effect/shed_tail.c | 2 +- test/battle/move_effect/shell_trap.c | 14 +- test/battle/move_effect/sleep.c | 2 +- test/battle/move_effect/solar_beam.c | 4 +- test/battle/move_effect/special_attack_down.c | 4 +- test/battle/move_effect/special_attack_up_3.c | 4 +- test/battle/move_effect/spikes.c | 2 +- test/battle/move_effect/stealth_rock.c | 2 +- test/battle/move_effect/sticky_web.c | 6 +- test/battle/move_effect/stockpile.c | 14 +- test/battle/move_effect/strength_sap.c | 8 +- test/battle/move_effect/stuff_cheeks.c | 4 +- test/battle/move_effect/substitute.c | 2 +- test/battle/move_effect/synthesis.c | 2 +- test/battle/move_effect/tailwind.c | 2 +- test/battle/move_effect/take_heart.c | 2 +- test/battle/move_effect/teatime.c | 2 +- test/battle/move_effect/techno_blast.c | 4 +- test/battle/move_effect/telekinesis.c | 8 +- test/battle/move_effect/teleport.c | 2 +- test/battle/move_effect/thunder.c | 4 +- test/battle/move_effect/torment.c | 2 +- test/battle/move_effect/toxic.c | 2 +- test/battle/move_effect/toxic_spikes.c | 4 +- test/battle/move_effect/triple_arrows.c | 2 +- test/battle/move_effect/triple_kick.c | 2 +- test/battle/move_effect/venoshock.c | 4 +- test/battle/move_effect/weather_ball.c | 2 +- test/battle/move_flags/cant_use_twice.c | 8 +- .../damages_airborne_double_damage.c | 2 +- test/battle/move_flags/damages_underground.c | 2 +- test/battle/move_flags/damages_underwater.c | 2 +- .../move_flags/minimize_double_damage.c | 4 +- test/battle/move_flags/powder.c | 2 +- test/battle/move_flags/strike_count.c | 8 +- test/battle/status1/burn.c | 2 +- test/battle/status1/freeze.c | 4 +- test/battle/status1/frostbite.c | 2 +- test/battle/terrain/grassy.c | 4 +- test/battle/weather/rain.c | 4 +- test/battle/weather/sandstorm.c | 2 +- test/battle/weather/snow.c | 4 +- test/battle/weather/sunlight.c | 4 +- test/dynamax.c | 94 +++---- test/test_runner_battle.c | 6 +- 265 files changed, 1407 insertions(+), 1407 deletions(-) diff --git a/include/battle.h b/include/battle.h index a6972864a1e4..fe218282a9f5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -57,7 +57,7 @@ struct __attribute__((packed, aligned(2))) BattleMoveEffect u16 flags:12; // coming soon... }; -#define GET_MOVE_BATTLESCRIPT(move) gBattleMoveEffects[gBattleMoves[move].effect].battleScript +#define GET_MOVE_BATTLESCRIPT(move) gBattleMoveEffects[gMovesInfo[move].effect].battleScript struct ResourceFlags { @@ -786,14 +786,14 @@ STATIC_ASSERT(sizeof(((struct BattleStruct *)0)->palaceFlags) * 8 >= MAX_BATTLER if (gBattleStruct->dynamicMoveType) \ typeArg = gBattleStruct->dynamicMoveType & DYNAMIC_TYPE_MASK; \ else \ - typeArg = gBattleMoves[move].type; \ + typeArg = gMovesInfo[move].type; \ } #define IS_MOVE_PHYSICAL(move)(GetBattleMoveCategory(move) == BATTLE_CATEGORY_PHYSICAL) #define IS_MOVE_SPECIAL(move)(GetBattleMoveCategory(move) == BATTLE_CATEGORY_SPECIAL) -#define IS_MOVE_STATUS(move)(gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) +#define IS_MOVE_STATUS(move)(gMovesInfo[move].category == BATTLE_CATEGORY_STATUS) -#define IS_MOVE_RECOIL(move)(gBattleMoves[move].recoil > 0 || gBattleMoves[move].effect == EFFECT_RECOIL_IF_MISS) +#define IS_MOVE_RECOIL(move)(gMovesInfo[move].recoil > 0 || gMovesInfo[move].effect == EFFECT_RECOIL_IF_MISS) #define BATTLER_MAX_HP(battlerId)(gBattleMons[battlerId].hp == gBattleMons[battlerId].maxHP) #define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0) || (gBattleStruct->enduredDamage & gBitTable[gBattlerTarget])) diff --git a/include/config/battle.h b/include/config/battle.h index 9e74108839dd..49b0c5a073b1 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -61,7 +61,7 @@ #define B_FAINT_SWITCH_IN GEN_LATEST // In Gen4+, sending out a new Pokémon after the previous one fainted happens at the end of the turn. Before, it would happen after each action. // Move data settings -#define B_UPDATED_MOVE_DATA GEN_LATEST // Updates move data in gBattleMoves, including Power, Accuracy, PP, stat changes, targets and chances of secondary effects. +#define B_UPDATED_MOVE_DATA GEN_LATEST // Updates move data in gMovesInfo, including Power, Accuracy, PP, stat changes, targets and chances of secondary effects. #define B_UPDATED_MOVE_TYPES GEN_LATEST // Updates move types. #define B_UPDATED_MOVE_FLAGS GEN_LATEST // Updates move flags. #define B_PHYSICAL_SPECIAL_SPLIT GEN_LATEST // In Gen3, the move's type determines if it will do physical or special damage. The split icon in the summary will reflect this. diff --git a/include/pokemon.h b/include/pokemon.h index b9629b172f86..615d278a5e47 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -608,7 +608,7 @@ extern u8 gEnemyPartyCount; extern struct Pokemon gEnemyParty[PARTY_SIZE]; extern struct SpriteTemplate gMultiuseSpriteTemplate; -extern const struct BattleMove gBattleMoves[]; +extern const struct BattleMove gMovesInfo[]; extern const u8 gFacilityClassToPicIndex[]; extern const u8 gFacilityClassToTrainerClass[]; extern const struct SpeciesInfo gSpeciesInfo[]; diff --git a/include/test/battle.h b/include/test/battle.h index 581546f87b63..c35b412a1887 100644 --- a/include/test/battle.h +++ b/include/test/battle.h @@ -29,7 +29,7 @@ * * ASSUMPTIONS * { - * ASSUME(gBattleMoves[MOVE_STUN_SPORE].effect == EFFECT_PARALYZE); + * ASSUME(gMovesInfo[MOVE_STUN_SPORE].effect == EFFECT_PARALYZE); * } * * SINGLE_BATTLE_TEST("Stun Spore inflicts paralysis") @@ -87,7 +87,7 @@ * SINGLE_BATTLE_TEST("Stun Spore does not affect Grass-types") * { * GIVEN { - * ASSUME(gBattleMoves[MOVE_STUN_SPORE].powderMove); + * ASSUME(gMovesInfo[MOVE_STUN_SPORE].powderMove); * ASSUME(gSpeciesInfo[SPECIES_ODDISH].types[0] == TYPE_GRASS); * PLAYER(SPECIES_ODDISH); // 1. * OPPONENT(SPECIES_ODDISH); // 2. @@ -129,7 +129,7 @@ * PARAMETRIZE { raiseAttack = FALSE; } * PARAMETRIZE { raiseAttack = TRUE; } * GIVEN { - * ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + * ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); * PLAYER(SPECIES_WOBBUFFET); * OPPONENT(SPECIES_WOBBUFFET); * } WHEN { @@ -176,7 +176,7 @@ * Pokémon we can observe the damage of a physical attack with and * without the burn. To document that this test assumes the attack is * physical we can use: - * ASSUME(gBattleMoves[MOVE_WHATEVER].category == BATTLE_CATEGORY_PHYSICAL); + * ASSUME(gMovesInfo[MOVE_WHATEVER].category == BATTLE_CATEGORY_PHYSICAL); * * ASSUMPTIONS * Should be placed immediately after any #includes and contain any @@ -186,7 +186,7 @@ * move_effect_poison_hit.c should be: * ASSUMPTIONS * { - * ASSUME(gBattleMoves[MOVE_POISON_STING].effect == EFFECT_POISON_HIT); + * ASSUME(gMovesInfo[MOVE_POISON_STING].effect == EFFECT_POISON_HIT); * } * * SINGLE_BATTLE_TEST(name, results...) and DOUBLE_BATTLE_TEST(name, results...) @@ -228,7 +228,7 @@ * PARAMETRIZE { hp = 99; } * PARAMETRIZE { hp = 33; } * GIVEN { - * ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); + * ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); * PLAYER(SPECIES_CHARMANDER) { Ability(ABILITY_BLAZE); MaxHP(99); HP(hp); } * OPPONENT(SPECIES_WOBBUFFET); * } WHEN { @@ -265,7 +265,7 @@ * * If the tag is not provided, runs the test 50 times and computes an * approximate pass ratio. - * PASSES_RANDOMLY(gBattleMoves[move].accuracy, 100); + * PASSES_RANDOMLY(gMovesInfo[move].accuracy, 100); * Note that this mode of PASSES_RANDOMLY makes the tests run very * slowly and should be avoided where possible. If the mechanic you are * testing is missing its tag, you should add it. diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 64e71c1b7203..2d27abff658d 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -389,7 +389,7 @@ static u32 Ai_SetMoveAccuracy(struct AiLogicData *aiData, u32 battlerAtk, u32 ba u32 accuracy; u32 abilityAtk = aiData->abilities[battlerAtk]; u32 abilityDef = aiData->abilities[battlerAtk]; - if (abilityAtk == ABILITY_NO_GUARD || abilityDef == ABILITY_NO_GUARD || gBattleMoves[move].accuracy == 0) // Moves with accuracy 0 or no guard ability always hit. + if (abilityAtk == ABILITY_NO_GUARD || abilityDef == ABILITY_NO_GUARD || gMovesInfo[move].accuracy == 0) // Moves with accuracy 0 or no guard ability always hit. accuracy = 100; else accuracy = GetTotalAccuracy(battlerAtk, battlerDef, move, abilityAtk, abilityDef, aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef]); @@ -420,7 +420,7 @@ static void SetBattlerAiMovesData(struct AiLogicData *aiData, u32 battlerAtk, u3 if (move != 0 && move != 0xFFFF - //&& gBattleMoves[move].power != 0 /* we want to get effectiveness and accuracy of status moves */ + //&& gMovesInfo[move].power != 0 /* we want to get effectiveness and accuracy of status moves */ && !(aiData->moveLimitations[battlerAtk] & gBitTable[i])) { dmg = AI_CalcDamage(move, battlerAtk, battlerDef, &effectiveness, TRUE, weather); @@ -714,7 +714,7 @@ static inline bool32 ShouldConsiderMoveForBattler(u32 battlerAi, u32 battlerDef, { if (battlerAi == BATTLE_PARTNER(battlerDef)) { - if (gBattleMoves[move].target == MOVE_TARGET_BOTH || gBattleMoves[move].target == MOVE_TARGET_OPPONENTS_FIELD) + if (gMovesInfo[move].target == MOVE_TARGET_BOTH || gMovesInfo[move].target == MOVE_TARGET_OPPONENTS_FIELD) return FALSE; } return TRUE; @@ -761,7 +761,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) { // move data s8 atkPriority = GetMovePriority(battlerAtk, move); - u32 moveEffect = gBattleMoves[move].effect; + u32 moveEffect = gMovesInfo[move].effect; s32 moveType; u32 moveTarget = AI_GetBattlerMoveTargetType(battlerAtk, move); struct AiLogicData *aiData = AI_DATA; @@ -782,7 +782,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) { // handle negative checks on non-user target // check powder moves - if (gBattleMoves[move].powderMove && !IsAffectedByPowder(battlerDef, aiData->abilities[battlerDef], aiData->holdEffects[battlerDef])) + if (gMovesInfo[move].powderMove && !IsAffectedByPowder(battlerDef, aiData->abilities[battlerDef], aiData->holdEffects[battlerDef])) { RETURN_SCORE_MINUS(20); } @@ -872,11 +872,11 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) RETURN_SCORE_MINUS(10); break; case ABILITY_SOUNDPROOF: - if (gBattleMoves[move].soundMove) + if (gMovesInfo[move].soundMove) RETURN_SCORE_MINUS(10); break; case ABILITY_BULLETPROOF: - if (gBattleMoves[move].ballisticMove) + if (gMovesInfo[move].ballisticMove) RETURN_SCORE_MINUS(10); break; case ABILITY_DAZZLING: @@ -897,7 +897,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) RETURN_SCORE_MINUS(10); break; case ABILITY_MAGIC_BOUNCE: - if (gBattleMoves[move].magicCoatAffected) + if (gMovesInfo[move].magicCoatAffected) RETURN_SCORE_MINUS(20); break; case ABILITY_CONTRARY: @@ -963,7 +963,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) RETURN_SCORE_MINUS(20); break; case ABILITY_MAGIC_BOUNCE: - if (gBattleMoves[move].magicCoatAffected && moveTarget & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY | MOVE_TARGET_OPPONENTS_FIELD)) + if (gMovesInfo[move].magicCoatAffected && moveTarget & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY | MOVE_TARGET_OPPONENTS_FIELD)) RETURN_SCORE_MINUS(20); break; case ABILITY_SWEET_VEIL: @@ -1015,7 +1015,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) // the following checks apply to any target (including user) // throat chop check - if (gDisableStructs[battlerAtk].throatChopTimer && gBattleMoves[move].soundMove) + if (gDisableStructs[battlerAtk].throatChopTimer && gMovesInfo[move].soundMove) return 0; // Can't even select move at all // heal block check if (gStatuses3[battlerAtk] & STATUS3_HEAL_BLOCK && IsHealBlockPreventingMove(battlerAtk, move)) @@ -1053,7 +1053,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) switch (moveEffect) { case EFFECT_HIT: // only applies to Vital Throw - if (gBattleMoves[move].priority < 0 && AI_STRIKES_FIRST(battlerAtk, battlerDef, move) && aiData->hpPercents[battlerAtk] < 40) + if (gMovesInfo[move].priority < 0 && AI_STRIKES_FIRST(battlerAtk, battlerDef, move) && aiData->hpPercents[battlerAtk] < 40) ADJUST_SCORE(-2); // don't want to move last break; default: @@ -1848,7 +1848,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_CONVERSION: //Check first move type - if (IS_BATTLER_OF_TYPE(battlerAtk, gBattleMoves[gBattleMons[battlerAtk].moves[0]].type)) + if (IS_BATTLER_OF_TYPE(battlerAtk, gMovesInfo[gBattleMons[battlerAtk].moves[0]].type)) ADJUST_SCORE(-10); break; case EFFECT_REST: @@ -1959,7 +1959,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) // TODO break; case EFFECT_HEAL_BELL: - if (!AnyPartyMemberStatused(battlerAtk, gBattleMoves[move].soundMove) || PartnerHasSameMoveEffectWithoutTarget(BATTLE_PARTNER(battlerAtk), move, aiData->partnerMove)) + if (!AnyPartyMemberStatused(battlerAtk, gMovesInfo[move].soundMove) || PartnerHasSameMoveEffectWithoutTarget(BATTLE_PARTNER(battlerAtk), move, aiData->partnerMove)) ADJUST_SCORE(-10); break; case EFFECT_ENDURE: @@ -2041,7 +2041,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-9); break; case EFFECT_FAIL_IF_NOT_ARG_TYPE: - if (!IS_BATTLER_OF_TYPE(battlerAtk, gBattleMoves[move].argument)) + if (!IS_BATTLER_OF_TYPE(battlerAtk, gMovesInfo[move].argument)) ADJUST_SCORE(-10); break; case EFFECT_DEFOG: @@ -2065,7 +2065,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (isDoubleBattle) { - if (IsHazardMoveEffect(gBattleMoves[aiData->partnerMove].effect) // partner is going to set up hazards + if (IsHazardMoveEffect(gMovesInfo[aiData->partnerMove].effect) // partner is going to set up hazards && AI_WhoStrikesFirst(BATTLE_PARTNER(battlerAtk), battlerAtk, aiData->partnerMove) == AI_IS_FASTER) // partner is going to set up before the potential Defog { ADJUST_SCORE(-10); @@ -2095,7 +2095,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_SEMI_INVULNERABLE: if (predictedMove != MOVE_NONE && AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_SLOWER - && gBattleMoves[predictedMove].effect == EFFECT_SEMI_INVULNERABLE) + && gMovesInfo[predictedMove].effect == EFFECT_SEMI_INVULNERABLE) ADJUST_SCORE(-10); // Don't Fly/dig/etc if opponent is going to fly/dig/etc after you if (BattlerWillFaintFromWeather(battlerAtk, aiData->abilities[battlerAtk]) @@ -2314,7 +2314,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (isDoubleBattle && gBattleMons[BATTLE_PARTNER(battlerAtk)].hp > 0) { if (aiData->partnerMove != MOVE_NONE - && gBattleMoves[aiData->partnerMove].effect == EFFECT_PLEDGE + && gMovesInfo[aiData->partnerMove].effect == EFFECT_PLEDGE && move != aiData->partnerMove) // Different pledge moves { if (gBattleMons[BATTLE_PARTNER(battlerAtk)].status1 & (STATUS1_SLEEP | STATUS1_FREEZE)) @@ -2493,8 +2493,8 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) instructedMove = gLastMoves[battlerDef]; if (instructedMove == MOVE_NONE - || gBattleMoves[instructedMove].instructBanned - || gBattleMoves[instructedMove].twoTurnMove + || gMovesInfo[instructedMove].instructBanned + || gMovesInfo[instructedMove].twoTurnMove || MoveHasMoveEffectSelf(instructedMove, MOVE_EFFECT_RECHARGE) || IsZMove(instructedMove) || (gLockedMoves[battlerDef] != 0 && gLockedMoves[battlerDef] != 0xFFFF) @@ -2664,10 +2664,10 @@ static s32 AI_TryToFaint(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (IS_TARGETING_PARTNER(battlerAtk, battlerDef)) return score; - if (gBattleMoves[move].power == 0) + if (gMovesInfo[move].power == 0) return score; // can't make anything faint with no power - if (CanIndexMoveFaintTarget(battlerAtk, battlerDef, movesetIndex, 0) && gBattleMoves[move].effect != EFFECT_EXPLOSION) + if (CanIndexMoveFaintTarget(battlerAtk, battlerDef, movesetIndex, 0) && gMovesInfo[move].effect != EFFECT_EXPLOSION) { if (AI_STRIKES_FIRST(battlerAtk, battlerDef, move)) ADJUST_SCORE(5); // Move hits first and can faint the target @@ -2688,15 +2688,15 @@ static s32 AI_TryToFaint(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) { // move data - u32 moveType = gBattleMoves[move].type; - u32 effect = gBattleMoves[move].effect; + u32 moveType = gMovesInfo[move].type; + u32 effect = gMovesInfo[move].effect; u32 moveTarget = AI_GetBattlerMoveTargetType(battlerAtk, move); // ally data u32 battlerAtkPartner = BATTLE_PARTNER(battlerAtk); struct AiLogicData *aiData = AI_DATA; u32 atkPartnerAbility = aiData->abilities[BATTLE_PARTNER(battlerAtk)]; u32 atkPartnerHoldEffect = aiData->holdEffects[BATTLE_PARTNER(battlerAtk)]; - bool32 partnerProtecting = (gBattleMoves[aiData->partnerMove].effect == EFFECT_PROTECT); + bool32 partnerProtecting = (gMovesInfo[aiData->partnerMove].effect == EFFECT_PROTECT); bool32 attackerHasBadAbility = (gAbilities[aiData->abilities[battlerAtk]].aiRating < 0); bool32 partnerHasBadAbility = (gAbilities[atkPartnerAbility].aiRating < 0); u32 predictedMove = aiData->predictedMoves[battlerDef]; @@ -2707,7 +2707,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) // check what effect partner is using if (aiData->partnerMove != 0) { - switch (gBattleMoves[aiData->partnerMove].effect) + switch (gMovesInfo[aiData->partnerMove].effect) { case EFFECT_HELPING_HAND: if (IS_MOVE_STATUS(move)) @@ -2733,7 +2733,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) } // check partner move effect // Adjust for always crit moves - if (gBattleMoves[aiData->partnerMove].alwaysCriticalHit && aiData->abilities[battlerAtk] == ABILITY_ANGER_POINT) + if (gMovesInfo[aiData->partnerMove].alwaysCriticalHit && aiData->abilities[battlerAtk] == ABILITY_ANGER_POINT) { if (AI_WhoStrikesFirst(battlerAtk, battlerAtkPartner, move) == AI_IS_SLOWER) // Partner moving first { @@ -3017,7 +3017,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (AI_WhoStrikesFirst(battlerAtkPartner, FOE(battlerAtkPartner), aiData->partnerMove) == AI_IS_SLOWER // Opponent mon 1 goes before partner || AI_WhoStrikesFirst(battlerAtkPartner, BATTLE_PARTNER(FOE(battlerAtkPartner)), aiData->partnerMove) == AI_IS_SLOWER) // Opponent mon 2 goes before partner { - if (gBattleMoves[aiData->partnerMove].effect == EFFECT_COUNTER || gBattleMoves[aiData->partnerMove].effect == EFFECT_MIRROR_COAT) + if (gMovesInfo[aiData->partnerMove].effect == EFFECT_COUNTER || gMovesInfo[aiData->partnerMove].effect == EFFECT_MIRROR_COAT) break; // These moves need to go last RETURN_SCORE_PLUS(1); } @@ -3050,7 +3050,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (!IsBattlerGrounded(battlerAtkPartner) || (IsBattlerGrounded(battlerAtkPartner) && AI_WhoStrikesFirst(battlerAtk, battlerAtkPartner, move) == AI_IS_SLOWER - && IsUngroundingEffect(gBattleMoves[aiData->partnerMove].effect))) + && IsUngroundingEffect(gMovesInfo[aiData->partnerMove].effect))) ADJUST_SCORE(2); else if (IS_BATTLER_OF_TYPE(battlerAtkPartner, TYPE_FIRE) || IS_BATTLER_OF_TYPE(battlerAtkPartner, TYPE_ELECTRIC) @@ -3113,7 +3113,7 @@ static s32 AI_CompareDamagingMoves(u32 battlerAtk, u32 battlerDef, u32 currId) for (i = 0; i < MAX_MON_MOVES; i++) { - if (moves[i] != MOVE_NONE && gBattleMoves[moves[i]].power) + if (moves[i] != MOVE_NONE && gMovesInfo[moves[i]].power) { noOfHits[i] = GetNoOfHitsToKOBattler(battlerAtk, battlerDef, i); if (noOfHits[i] < leastHits) @@ -3121,7 +3121,7 @@ static s32 AI_CompareDamagingMoves(u32 battlerAtk, u32 battlerDef, u32 currId) leastHits = noOfHits[i]; } viableMoveScores[i] = AI_SCORE_DEFAULT; - isChargingMoveEffect[i] = IsChargingMove(battlerAtk, gBattleMoves[moves[i]].effect); + isChargingMoveEffect[i] = IsChargingMove(battlerAtk, gMovesInfo[moves[i]].effect); } else { @@ -3199,7 +3199,7 @@ static s32 AI_CompareDamagingMoves(u32 battlerAtk, u32 battlerDef, u32 currId) static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) { // move data - u32 moveEffect = gBattleMoves[move].effect; + u32 moveEffect = gMovesInfo[move].effect; struct AiLogicData *aiData = AI_DATA; u32 movesetIndex = AI_THINKING_STRUCT->movesetIndex; u32 effectiveness = aiData->effectiveness[battlerAtk][battlerDef][movesetIndex]; @@ -3211,7 +3211,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) u32 i; // The AI should understand that while Dynamaxed, status moves function like Protect. - if (IsDynamaxed(battlerAtk) && gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) + if (IsDynamaxed(battlerAtk) && gMovesInfo[move].category == BATTLE_CATEGORY_STATUS) moveEffect = EFFECT_PROTECT; // check status move preference @@ -3219,7 +3219,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) ADJUST_SCORE(10); // check thawing moves - if ((gBattleMons[battlerAtk].status1 & (STATUS1_FREEZE | STATUS1_FROSTBITE)) && gBattleMoves[move].thawsUser) + if ((gBattleMons[battlerAtk].status1 & (STATUS1_FREEZE | STATUS1_FROSTBITE)) && gMovesInfo[move].thawsUser) ADJUST_SCORE(10); // check burn / frostbite @@ -3470,7 +3470,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) score += AI_TryToClearStats(battlerAtk, battlerDef, isDoubleBattle); break; case EFFECT_ROAR: - if ((gBattleMoves[move].soundMove && aiData->abilities[battlerDef] == ABILITY_SOUNDPROOF) || aiData->abilities[battlerDef] == ABILITY_SUCTION_CUPS) + if ((gMovesInfo[move].soundMove && aiData->abilities[battlerDef] == ABILITY_SOUNDPROOF) || aiData->abilities[battlerDef] == ABILITY_SUCTION_CUPS) { ADJUST_SCORE(-3); break; @@ -3485,7 +3485,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) ADJUST_SCORE(-2); break; case EFFECT_CONVERSION: - if (!IS_BATTLER_OF_TYPE(battlerAtk, gBattleMoves[gBattleMons[battlerAtk].moves[0]].type)) + if (!IS_BATTLER_OF_TYPE(battlerAtk, gMovesInfo[gBattleMons[battlerAtk].moves[0]].type)) ADJUST_SCORE(1); break; case EFFECT_SWALLOW: @@ -3688,7 +3688,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) if (gDisableStructs[battlerDef].encoreTimer == 0 && (B_MENTAL_HERB < GEN_5 || aiData->holdEffects[battlerDef] != HOLD_EFFECT_MENTAL_HERB)) { - if (gBattleMoveEffects[gBattleMoves[gLastMoves[battlerDef]].effect].encourageEncore) + if (gBattleMoveEffects[gMovesInfo[gLastMoves[battlerDef]].effect].encourageEncore) ADJUST_SCORE(3); } break; @@ -3764,7 +3764,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) switch (move) { case MOVE_QUICK_GUARD: - if (predictedMove != MOVE_NONE && gBattleMoves[predictedMove].priority > 0) + if (predictedMove != MOVE_NONE && gMovesInfo[predictedMove].priority > 0) ProtectChecks(battlerAtk, battlerDef, move, predictedMove, &score); break; case MOVE_WIDE_GUARD: @@ -3937,11 +3937,11 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) { if (AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER) // Attacker goes first { - if (gBattleMoves[predictedMove].effect == EFFECT_EXPLOSION - || gBattleMoves[predictedMove].effect == EFFECT_PROTECT) + if (gMovesInfo[predictedMove].effect == EFFECT_EXPLOSION + || gMovesInfo[predictedMove].effect == EFFECT_PROTECT) ADJUST_SCORE(3); } - else if (gBattleMoves[predictedMove].effect == EFFECT_SEMI_INVULNERABLE && !(gStatuses3[battlerDef] & STATUS3_SEMI_INVULNERABLE)) + else if (gMovesInfo[predictedMove].effect == EFFECT_SEMI_INVULNERABLE && !(gStatuses3[battlerDef] & STATUS3_SEMI_INVULNERABLE)) { ADJUST_SCORE(3); } @@ -4031,7 +4031,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) { if (isDoubleBattle) { - if (IsHazardMoveEffect(gBattleMoves[aiData->partnerMove].effect) // Partner is going to set up hazards + if (IsHazardMoveEffect(gMovesInfo[aiData->partnerMove].effect) // Partner is going to set up hazards && AI_WhoStrikesFirst(battlerAtk, BATTLE_PARTNER(battlerAtk), move) == AI_IS_SLOWER) // Partner going first break; // Don't use Defog if partner is going to set up hazards } @@ -4254,7 +4254,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) case EFFECT_GRUDGE: break; case EFFECT_SNATCH: - if (predictedMove != MOVE_NONE && gBattleMoves[predictedMove].snatchAffected) + if (predictedMove != MOVE_NONE && gMovesInfo[predictedMove].snatchAffected) ADJUST_SCORE(3); // Steal move break; case EFFECT_MUD_SPORT: @@ -4437,7 +4437,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) if ((aiData->abilities[battlerAtk] == ABILITY_VOLT_ABSORB || aiData->abilities[battlerAtk] == ABILITY_MOTOR_DRIVE || aiData->abilities[battlerAtk] == ABILITY_LIGHTNING_ROD) - && gBattleMoves[predictedMove].type == TYPE_NORMAL) + && gMovesInfo[predictedMove].type == TYPE_NORMAL) ADJUST_SCORE(2); break; case EFFECT_FLING: @@ -4468,7 +4468,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) ADJUST_SCORE(1); break; case EFFECT_POWDER: - if (predictedMove != MOVE_NONE && !IS_MOVE_STATUS(predictedMove) && gBattleMoves[predictedMove].type == TYPE_FIRE) + if (predictedMove != MOVE_NONE && !IS_MOVE_STATUS(predictedMove) && gMovesInfo[predictedMove].type == TYPE_FIRE) ADJUST_SCORE(3); break; case EFFECT_TELEKINESIS: @@ -4537,7 +4537,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) { if (AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER) // Attacker goes first { - if (gBattleMoves[predictedMove].type == TYPE_GROUND) + if (gMovesInfo[predictedMove].type == TYPE_GROUND) ADJUST_SCORE(3); // Cause the enemy's move to fail break; } @@ -4629,16 +4629,16 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) } // move effect checks // check move additional effects that are likely to happen - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { // Only consider effects with a guaranteed chance to happen - if (!MoveEffectIsGuaranteed(battlerAtk, aiData->abilities[battlerAtk], &gBattleMoves[move].additionalEffects[i])) + if (!MoveEffectIsGuaranteed(battlerAtk, aiData->abilities[battlerAtk], &gMovesInfo[move].additionalEffects[i])) continue; // Consider move effects that target self - if (gBattleMoves[move].additionalEffects[i].self) + if (gMovesInfo[move].additionalEffects[i].self) { - switch (gBattleMoves[move].additionalEffects[i].moveEffect) + switch (gMovesInfo[move].additionalEffects[i].moveEffect) { case MOVE_EFFECT_SPD_PLUS_2: case MOVE_EFFECT_SPD_PLUS_1: @@ -4654,7 +4654,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) IncreaseStatUpScore( battlerAtk, battlerDef, - STAT_ATK + gBattleMoves[move].additionalEffects[i].moveEffect - MOVE_EFFECT_ATK_PLUS_1, + STAT_ATK + gMovesInfo[move].additionalEffects[i].moveEffect - MOVE_EFFECT_ATK_PLUS_1, &score ); break; @@ -4667,7 +4667,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) IncreaseStatUpScore( battlerAtk, battlerDef, - STAT_ATK + gBattleMoves[move].additionalEffects[i].moveEffect - MOVE_EFFECT_ATK_PLUS_2, + STAT_ATK + gMovesInfo[move].additionalEffects[i].moveEffect - MOVE_EFFECT_ATK_PLUS_2, &score ); break; @@ -4699,7 +4699,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) } else // consider move effects that hinder the target { - switch (gBattleMoves[move].additionalEffects[i].moveEffect) + switch (gMovesInfo[move].additionalEffects[i].moveEffect) { case MOVE_EFFECT_FLINCH: score += ShouldTryToFlinch(battlerAtk, battlerDef, aiData->abilities[battlerAtk], aiData->abilities[battlerDef], move); @@ -4826,11 +4826,11 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) score += AI_ShouldSetUpHazards(battlerAtk, battlerDef, aiData); break; case MOVE_EFFECT_FEINT: - if (gBattleMoves[predictedMove].effect == EFFECT_PROTECT) + if (gMovesInfo[predictedMove].effect == EFFECT_PROTECT) ADJUST_SCORE(3); break; case MOVE_EFFECT_THROAT_CHOP: - if (HasSoundMove(battlerDef) && gBattleMoves[predictedMove].soundMove && AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER) + if (HasSoundMove(battlerDef) && gMovesInfo[predictedMove].soundMove && AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER) ADJUST_SCORE(3); break; case MOVE_EFFECT_FLAME_BURST: @@ -4868,7 +4868,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score if (IS_TARGETING_PARTNER(battlerAtk, battlerDef)) return score; - if (gBattleMoves[move].power) + if (gMovesInfo[move].power) score += AI_CompareDamagingMoves(battlerAtk, battlerDef, AI_THINKING_STRUCT->movesetIndex); // Calculates score based on effects of a move @@ -4894,7 +4894,7 @@ static s32 AI_SetupFirstTurn(u32 battlerAtk, u32 battlerDef, u32 move, s32 score } // check effects to prioritize first turn - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_ATTACK_UP: case EFFECT_ATTACK_UP_USER_ALLY: @@ -4984,9 +4984,9 @@ static s32 AI_SetupFirstTurn(u32 battlerAtk, u32 battlerDef, u32 move, s32 score case EFFECT_HIT: // TEMPORARY - should applied to all moves regardless of EFFECT // Consider move effects - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { - switch (gBattleMoves[move].additionalEffects[i].moveEffect) + switch (gMovesInfo[move].additionalEffects[i].moveEffect) { case MOVE_EFFECT_STEALTH_ROCK: case MOVE_EFFECT_SPIKES: @@ -5010,10 +5010,10 @@ static s32 AI_Risky(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (IS_TARGETING_PARTNER(battlerAtk, battlerDef)) return score; - if (gBattleMoves[move].criticalHitStage > 0) + if (gMovesInfo[move].criticalHitStage > 0) ADJUST_SCORE(2); - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_SLEEP: case EFFECT_EXPLOSION: @@ -5039,9 +5039,9 @@ static s32 AI_Risky(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_HIT: // TEMPORARY - should applied to all moves regardless of EFFECT // Consider move effects - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { - switch (gBattleMoves[move].additionalEffects[i].moveEffect) + switch (gMovesInfo[move].additionalEffects[i].moveEffect) { case MOVE_EFFECT_ALL_STATS_UP: if (Random() & 1) @@ -5079,12 +5079,12 @@ static s32 AI_PreferBatonPass(u32 battlerAtk, u32 battlerDef, u32 move, s32 scor if (IS_TARGETING_PARTNER(battlerAtk, battlerDef) || CountUsablePartyMons(battlerAtk) == 0 - || gBattleMoves[move].power != 0 + || gMovesInfo[move].power != 0 || !HasMoveEffect(battlerAtk, EFFECT_BATON_PASS) || IsBattlerTrapped(battlerAtk, TRUE)) return score; - if (IsStatRaisingEffect(gBattleMoves[move].effect)) + if (IsStatRaisingEffect(gMovesInfo[move].effect)) { if (gBattleResults.battleTurnCounter == 0) ADJUST_SCORE(5); @@ -5095,7 +5095,7 @@ static s32 AI_PreferBatonPass(u32 battlerAtk, u32 battlerDef, u32 move, s32 scor } // other specific checks - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_INGRAIN: if (!(gStatuses3[battlerAtk] & STATUS3_ROOTED)) @@ -5130,8 +5130,8 @@ static s32 AI_PreferBatonPass(u32 battlerAtk, u32 battlerDef, u32 move, s32 scor static s32 AI_HPAware(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) { - u32 effect = gBattleMoves[move].effect; - u32 moveType = gBattleMoves[move].type; + u32 effect = gMovesInfo[move].effect; + u32 moveType = gMovesInfo[move].type; SetTypeBeforeUsingMove(move, battlerAtk); GET_MOVE_TYPE(move, moveType); diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 299d420de90e..3f3f0c12a67b 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -97,7 +97,7 @@ static bool32 HasBadOdds(u32 battler, bool32 emitResult) for (i = 0; i < MAX_MON_MOVES; i++) { aiMove = gBattleMons[battler].moves[i]; - aiMoveEffect = gBattleMoves[aiMove].effect; + aiMoveEffect = gMovesInfo[aiMove].effect; if (aiMove != MOVE_NONE) { // Check if mon has an "important" status move @@ -112,7 +112,7 @@ static bool32 HasBadOdds(u32 battler, bool32 emitResult) } // Only check damage if move has power - if (gBattleMoves[aiMove].power != 0) + if (gMovesInfo[aiMove].power != 0) { // Check if mon has a super effective move if (AI_GetTypeEffectiveness(aiMove, battler, opposingBattler) >= UQ_4_12(2.0)) @@ -145,7 +145,7 @@ static bool32 HasBadOdds(u32 battler, bool32 emitResult) for (i = 0; i < MAX_MON_MOVES; i++) { playerMove = gBattleMons[opposingBattler].moves[i]; - if (playerMove != MOVE_NONE && gBattleMoves[playerMove].power != 0) + if (playerMove != MOVE_NONE && gMovesInfo[playerMove].power != 0) { damageTaken = AI_CalcDamage(playerMove, opposingBattler, battler, &effectiveness, FALSE, weather); if (damageTaken > maxDamageTaken) @@ -332,26 +332,26 @@ static bool32 FindMonThatAbsorbsOpponentsMove(u32 battler, bool32 emitResult) } // Create an array of possible absorb abilities so the AI considers all of them - if (gBattleMoves[gLastLandedMoves[battler]].type == TYPE_FIRE) + if (gMovesInfo[gLastLandedMoves[battler]].type == TYPE_FIRE) { absorbingTypeAbilities[0] = ABILITY_FLASH_FIRE; numAbsorbingAbilities = 1; } - else if (gBattleMoves[gLastLandedMoves[battler]].type == TYPE_WATER) + else if (gMovesInfo[gLastLandedMoves[battler]].type == TYPE_WATER) { absorbingTypeAbilities[0] = ABILITY_WATER_ABSORB; absorbingTypeAbilities[1] = ABILITY_STORM_DRAIN; absorbingTypeAbilities[2] = ABILITY_DRY_SKIN; numAbsorbingAbilities = 3; } - else if (gBattleMoves[gLastLandedMoves[battler]].type == TYPE_ELECTRIC) + else if (gMovesInfo[gLastLandedMoves[battler]].type == TYPE_ELECTRIC) { absorbingTypeAbilities[0] = ABILITY_VOLT_ABSORB; absorbingTypeAbilities[1] = ABILITY_MOTOR_DRIVE; absorbingTypeAbilities[2] = ABILITY_LIGHTNING_ROD; numAbsorbingAbilities = 3; } - else if (gBattleMoves[gLastLandedMoves[battler]].type == TYPE_GRASS) + else if (gMovesInfo[gLastLandedMoves[battler]].type == TYPE_GRASS) { absorbingTypeAbilities[0] = ABILITY_SAP_SIPPER; numAbsorbingAbilities = 1; @@ -452,8 +452,8 @@ static bool32 ShouldSwitchIfGameStatePrompt(u32 battler, bool32 emitResult) switchMon = FALSE; if (IsBattlerAlive(BATTLE_PARTNER(battler)) - && (gBattleMoves[AI_DATA->partnerMove].effect == EFFECT_MISTY_TERRAIN - || gBattleMoves[AI_DATA->partnerMove].effect == EFFECT_ELECTRIC_TERRAIN) + && (gMovesInfo[AI_DATA->partnerMove].effect == EFFECT_MISTY_TERRAIN + || gMovesInfo[AI_DATA->partnerMove].effect == EFFECT_ELECTRIC_TERRAIN) && IsBattlerGrounded(battler) ) switchMon = FALSE; @@ -1225,7 +1225,7 @@ static u32 GetBestMonDmg(struct Pokemon *party, int firstId, int lastId, u8 inva for (j = 0; j < MAX_MON_MOVES; j++) { aiMove = AI_DATA->switchinCandidate.battleMon.moves[j]; - if (aiMove != MOVE_NONE && gBattleMoves[aiMove].power != 0) + if (aiMove != MOVE_NONE && gMovesInfo[aiMove].power != 0) { aiMove = GetMonData(&party[i], MON_DATA_MOVE1 + j); dmg = AI_CalcPartyMonDamage(aiMove, battler, opposingBattler, AI_DATA->switchinCandidate.battleMon, TRUE); @@ -1272,7 +1272,7 @@ static u32 GetSwitchinHazardsDamage(u32 battler, struct BattlePokemon *battleMon { // Stealth Rock if ((hazardFlags & SIDE_STATUS_STEALTH_ROCK) && heldItemEffect != HOLD_EFFECT_HEAVY_DUTY_BOOTS) - hazardDamage += GetStealthHazardDamageByTypesAndHP(gBattleMoves[MOVE_STEALTH_ROCK].type, defType1, defType2, battleMon->maxHP); + hazardDamage += GetStealthHazardDamageByTypesAndHP(gMovesInfo[MOVE_STEALTH_ROCK].type, defType1, defType2, battleMon->maxHP); // Spikes if ((hazardFlags & SIDE_STATUS_SPIKES) && IsMonGrounded(heldItemEffect, ability, defType1, defType2)) { @@ -1663,7 +1663,7 @@ static s32 GetMaxDamagePlayerCouldDealToSwitchin(u32 battler, u32 opposingBattle for (i = 0; i < MAX_MON_MOVES; i++) { playerMove = gBattleMons[opposingBattler].moves[i]; - if (playerMove != MOVE_NONE && gBattleMoves[playerMove].power != 0) + if (playerMove != MOVE_NONE && gMovesInfo[playerMove].power != 0) { damageTaken = AI_CalcPartyMonDamage(playerMove, opposingBattler, battler, battleMon, FALSE); if (damageTaken > maxDamageTaken) @@ -1756,7 +1756,7 @@ static u32 GetBestMonIntegrated(struct Pokemon *party, int firstId, int lastId, aiMove = AI_DATA->switchinCandidate.battleMon.moves[j]; // Only do damage calc if switching after KO, don't need it otherwise and saves ~0.02s per turn - if (isSwitchAfterKO && aiMove != MOVE_NONE && gBattleMoves[aiMove].power != 0) + if (isSwitchAfterKO && aiMove != MOVE_NONE && gMovesInfo[aiMove].power != 0) damageDealt = AI_CalcPartyMonDamage(aiMove, battler, opposingBattler, AI_DATA->switchinCandidate.battleMon, TRUE); // Check for Baton Pass; hitsToKO requirements mean mon can boost and BP without dying whether it's slower or not @@ -1764,7 +1764,7 @@ static u32 GetBestMonIntegrated(struct Pokemon *party, int firstId, int lastId, bits |= gBitTable[i]; // Check for mon with resistance and super effective move for GetBestMonTypeMatchup - if (aiMove != MOVE_NONE && gBattleMoves[aiMove].power != 0) + if (aiMove != MOVE_NONE && gMovesInfo[aiMove].power != 0) { if (typeMatchup < bestResistEffective) { @@ -1780,7 +1780,7 @@ static u32 GetBestMonIntegrated(struct Pokemon *party, int firstId, int lastId, } // If a self destruction move doesn't OHKO, don't factor it into revenge killing - if (gBattleMoves[aiMove].effect == EFFECT_EXPLOSION && damageDealt < playerMonHP) + if (gMovesInfo[aiMove].effect == EFFECT_EXPLOSION && damageDealt < playerMonHP) continue; // Check that mon isn't one shot and set GetBestMonDmg if applicable @@ -1798,7 +1798,7 @@ static u32 GetBestMonIntegrated(struct Pokemon *party, int firstId, int lastId, if (damageDealt > playerMonHP) { // If AI mon is faster and doesn't die to hazards - if ((aiMonSpeed > playerMonSpeed || gBattleMoves[aiMove].priority > 0) && AI_DATA->switchinCandidate.battleMon.hp > GetSwitchinHazardsDamage(battler, &AI_DATA->switchinCandidate.battleMon)) + if ((aiMonSpeed > playerMonSpeed || gMovesInfo[aiMove].priority > 0) && AI_DATA->switchinCandidate.battleMon.hp > GetSwitchinHazardsDamage(battler, &AI_DATA->switchinCandidate.battleMon)) { // We have a revenge killer revengeKillerId = i; @@ -1820,7 +1820,7 @@ static u32 GetBestMonIntegrated(struct Pokemon *party, int firstId, int lastId, if (damageDealt > playerMonHP / 2) { // If AI mon is faster - if (aiMonSpeed > playerMonSpeed || gBattleMoves[aiMove].priority > 0) + if (aiMonSpeed > playerMonSpeed || gMovesInfo[aiMove].priority > 0) { // If AI mon can't be OHKO'd if (hitsToKO > hitsToKOThreshold) @@ -1891,7 +1891,7 @@ static u32 GetBestMonIntegrated(struct Pokemon *party, int firstId, int lastId, // If ace mon is the last available Pokemon and U-Turn/Volt Switch was used - switch to the mon. else if (aceMonId != PARTY_SIZE - && (gBattleMoves[gLastUsedMove].effect == EFFECT_HIT_ESCAPE || gBattleMoves[gLastUsedMove].effect == EFFECT_PARTING_SHOT)) + && (gMovesInfo[gLastUsedMove].effect == EFFECT_HIT_ESCAPE || gMovesInfo[gLastUsedMove].effect == EFFECT_PARTING_SHOT)) return aceMonId; } return PARTY_SIZE; diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 96d79bb256c7..337cd917d983 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -27,7 +27,7 @@ u16 *moves = GetMovesArray(battler); \ for (i = 0; i < MAX_MON_MOVES; i++) \ { \ - if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gBattleMoves[moves[i]].flag) \ + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gMovesInfo[moves[i]].flag) \ return TRUE; \ } \ return FALSE @@ -306,9 +306,9 @@ bool32 IsTruantMonVulnerable(u32 battlerAI, u32 opposingBattler) for (i = 0; i < MAX_MON_MOVES; i++) { u32 move = gBattleResources->battleHistory->usedMoves[opposingBattler][i]; - if (gBattleMoves[move].effect == EFFECT_PROTECT && move != MOVE_ENDURE) + if (gMovesInfo[move].effect == EFFECT_PROTECT && move != MOVE_ENDURE) return TRUE; - if (gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE && AI_WhoStrikesFirst(battlerAI, opposingBattler, GetAIChosenMove(battlerAI)) == AI_IS_SLOWER) + if (gMovesInfo[move].effect == EFFECT_SEMI_INVULNERABLE && AI_WhoStrikesFirst(battlerAI, opposingBattler, GetAIChosenMove(battlerAI)) == AI_IS_SLOWER) return TRUE; } return FALSE; @@ -380,10 +380,10 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes gBattleStruct->zmove.baseMoves[battlerAtk] = move; gBattleStruct->zmove.active = TRUE; } - else if (gBattleMoves[move].effect == EFFECT_PHOTON_GEYSER) + else if (gMovesInfo[move].effect == EFFECT_PHOTON_GEYSER) gBattleStruct->swapDamageCategory = (GetCategoryBasedOnStats(gBattlerAttacker) == BATTLE_CATEGORY_PHYSICAL); - if (gBattleMoves[move].effect == EFFECT_NATURE_POWER) + if (gMovesInfo[move].effect == EFFECT_NATURE_POWER) move = GetNaturePowerMove(); gBattleStruct->dynamicMoveType = 0; @@ -393,20 +393,20 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes GET_MOVE_TYPE(move, moveType); effectivenessMultiplier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, aiData->abilities[battlerDef], FALSE); - if (gBattleMoves[move].power) + if (gMovesInfo[move].power) { s32 critChanceIndex, normalDmg, fixedBasePower, n; ProteanTryChangeType(battlerAtk, aiData->abilities[battlerAtk], move, moveType); // Certain moves like Rollout calculate damage based on values which change during the move execution, but before calling dmg calc. - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_ROLLOUT: n = gDisableStructs[battlerAtk].rolloutTimer - 1; - fixedBasePower = CalcRolloutBasePower(battlerAtk, gBattleMoves[move].power, n < 0 ? 5 : n); + fixedBasePower = CalcRolloutBasePower(battlerAtk, gMovesInfo[move].power, n < 0 ? 5 : n); break; case EFFECT_FURY_CUTTER: - fixedBasePower = CalcFuryCutterBasePower(gBattleMoves[move].power, min(gDisableStructs[battlerAtk].furyCutterCounter + 1, 5)); + fixedBasePower = CalcFuryCutterBasePower(gMovesInfo[move].power, min(gDisableStructs[battlerAtk].furyCutterCounter + 1, 5)); break; default: fixedBasePower = 0; @@ -436,14 +436,14 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes if (!gBattleStruct->zmove.active) { // Handle dynamic move damage - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_LEVEL_DAMAGE: case EFFECT_PSYWAVE: dmg = gBattleMons[battlerAtk].level * (aiData->abilities[battlerAtk] == ABILITY_PARENTAL_BOND ? 2 : 1); break; case EFFECT_FIXED_DAMAGE_ARG: - dmg = gBattleMoves[move].argument * (aiData->abilities[battlerAtk] == ABILITY_PARENTAL_BOND ? 2 : 1); + dmg = gMovesInfo[move].argument * (aiData->abilities[battlerAtk] == ABILITY_PARENTAL_BOND ? 2 : 1); break; case EFFECT_MULTI_HIT: dmg *= (aiData->abilities[battlerAtk] == ABILITY_SKILL_LINK @@ -478,8 +478,8 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes } // Handle other multi-strike moves - if (gBattleMoves[move].strikeCount > 1 && gBattleMoves[move].effect != EFFECT_TRIPLE_KICK) - dmg *= gBattleMoves[move].strikeCount; + if (gMovesInfo[move].strikeCount > 1 && gMovesInfo[move].effect != EFFECT_TRIPLE_KICK) + dmg *= gMovesInfo[move].strikeCount; if (dmg == 0) dmg = 1; @@ -517,7 +517,7 @@ static bool32 AI_IsMoveEffectInPlus(u32 battlerAtk, u32 battlerDef, u32 move, s3 u32 abilityDef = AI_DATA->abilities[battlerDef]; u32 abilityAtk = AI_DATA->abilities[battlerAtk]; - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_HIT_ESCAPE: if (CountUsablePartyMons(battlerAtk) != 0 && ShouldPivot(battlerAtk, battlerDef, abilityDef, move, AI_THINKING_STRUCT->movesetIndex)) @@ -530,12 +530,12 @@ static bool32 AI_IsMoveEffectInPlus(u32 battlerAtk, u32 battlerDef, u32 move, s3 } // check ADDITIONAL_EFFECTS - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { // Consider move effects that target self - if (gBattleMoves[move].additionalEffects[i].self) + if (gMovesInfo[move].additionalEffects[i].self) { - switch (gBattleMoves[move].additionalEffects[i].moveEffect) + switch (gMovesInfo[move].additionalEffects[i].moveEffect) { case MOVE_EFFECT_ATK_PLUS_1: if (BattlerStatCanRise(battlerAtk, abilityAtk, STAT_ATK)) @@ -565,7 +565,7 @@ static bool32 AI_IsMoveEffectInPlus(u32 battlerAtk, u32 battlerDef, u32 move, s3 } else // consider move effects that hinder the target { - switch (gBattleMoves[move].additionalEffects[i].moveEffect) + switch (gMovesInfo[move].additionalEffects[i].moveEffect) { case MOVE_EFFECT_POISON: case MOVE_EFFECT_TOXIC: @@ -599,7 +599,7 @@ static bool32 AI_IsMoveEffectInPlus(u32 battlerAtk, u32 battlerDef, u32 move, s3 case MOVE_EFFECT_SP_DEF_MINUS_1: case MOVE_EFFECT_ACC_MINUS_1: case MOVE_EFFECT_EVS_MINUS_1: - if (ShouldLowerStat(battlerDef, abilityDef, STAT_ATK + (gBattleMoves[move].additionalEffects[i].moveEffect - MOVE_EFFECT_ATK_MINUS_1)) && noOfHitsToKo != 1) + if (ShouldLowerStat(battlerDef, abilityDef, STAT_ATK + (gMovesInfo[move].additionalEffects[i].moveEffect - MOVE_EFFECT_ATK_MINUS_1)) && noOfHitsToKo != 1) return TRUE; break; case MOVE_EFFECT_ATK_MINUS_2: @@ -609,7 +609,7 @@ static bool32 AI_IsMoveEffectInPlus(u32 battlerAtk, u32 battlerDef, u32 move, s3 case MOVE_EFFECT_SP_DEF_MINUS_2: case MOVE_EFFECT_ACC_MINUS_2: case MOVE_EFFECT_EVS_MINUS_2: - if (ShouldLowerStat(battlerDef, abilityDef, STAT_ATK + (gBattleMoves[move].additionalEffects[i].moveEffect - MOVE_EFFECT_ATK_MINUS_2)) && noOfHitsToKo != 1) + if (ShouldLowerStat(battlerDef, abilityDef, STAT_ATK + (gMovesInfo[move].additionalEffects[i].moveEffect - MOVE_EFFECT_ATK_MINUS_2)) && noOfHitsToKo != 1) return TRUE; break; } @@ -626,10 +626,10 @@ static bool32 AI_IsMoveEffectInMinus(u32 battlerAtk, u32 battlerDef, u32 move, s u8 i; // recoil - if (gBattleMoves[move].recoil > 0 && AI_IsDamagedByRecoil(battlerAtk)) + if (gMovesInfo[move].recoil > 0 && AI_IsDamagedByRecoil(battlerAtk)) return TRUE; - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_MIND_BLOWN: case EFFECT_MAX_HP_50_RECOIL: @@ -639,9 +639,9 @@ static bool32 AI_IsMoveEffectInMinus(u32 battlerAtk, u32 battlerDef, u32 move, s return TRUE; break; default: - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { - switch (gBattleMoves[move].additionalEffects[i].moveEffect) + switch (gMovesInfo[move].additionalEffects[i].moveEffect) { case MOVE_EFFECT_ATK_MINUS_1: case MOVE_EFFECT_DEF_MINUS_1: @@ -653,12 +653,12 @@ static bool32 AI_IsMoveEffectInMinus(u32 battlerAtk, u32 battlerDef, u32 move, s case MOVE_EFFECT_DEF_SPDEF_DOWN: case MOVE_EFFECT_SP_DEF_MINUS_1: case MOVE_EFFECT_SP_DEF_MINUS_2: - if ((gBattleMoves[move].additionalEffects[i].self && GetBattlerAbility(battlerAtk) != ABILITY_CONTRARY) + if ((gMovesInfo[move].additionalEffects[i].self && GetBattlerAbility(battlerAtk) != ABILITY_CONTRARY) || (noOfHitsToKo != 1 && abilityDef == ABILITY_CONTRARY && !IsMoldBreakerTypeAbility(abilityAtk))) return TRUE; break; case MOVE_EFFECT_RECHARGE: - return gBattleMoves[move].additionalEffects[i].self; + return gMovesInfo[move].additionalEffects[i].self; } } break; @@ -1023,7 +1023,7 @@ bool32 DoesBattlerIgnoreAbilityChecks(u32 atkAbility, u32 move) if (AI_THINKING_STRUCT->aiFlags[sBattler_AI] & AI_FLAG_NEGATE_UNAWARE) return FALSE; // AI handicap flag: doesn't understand ability suppression concept - if (IsMoldBreakerTypeAbility(atkAbility) || gBattleMoves[move].ignoresTargetAbility) + if (IsMoldBreakerTypeAbility(atkAbility) || gMovesInfo[move].ignoresTargetAbility) return TRUE; return FALSE; @@ -1048,10 +1048,10 @@ u32 AI_GetWeather(struct AiLogicData *aiData) u32 AI_GetBattlerMoveTargetType(u32 battlerId, u32 move) { - if (gBattleMoves[move].effect == EFFECT_EXPANDING_FORCE && AI_IsTerrainAffected(battlerId, STATUS_FIELD_PSYCHIC_TERRAIN)) + if (gMovesInfo[move].effect == EFFECT_EXPANDING_FORCE && AI_IsTerrainAffected(battlerId, STATUS_FIELD_PSYCHIC_TERRAIN)) return MOVE_TARGET_BOTH; else - return gBattleMoves[move].target; + return gMovesInfo[move].target; } bool32 IsAromaVeilProtectedMove(u32 move) @@ -1131,11 +1131,11 @@ bool32 IsSemiInvulnerable(u32 battlerDef, u32 move) { if (gStatuses3[battlerDef] & STATUS3_PHANTOM_FORCE) return TRUE; - else if (!gBattleMoves[move].damagesAirborne && gStatuses3[battlerDef] & STATUS3_ON_AIR) + else if (!gMovesInfo[move].damagesAirborne && gStatuses3[battlerDef] & STATUS3_ON_AIR) return TRUE; - else if (!gBattleMoves[move].damagesUnderwater && gStatuses3[battlerDef] & STATUS3_UNDERWATER) + else if (!gMovesInfo[move].damagesUnderwater && gStatuses3[battlerDef] & STATUS3_UNDERWATER) return TRUE; - else if (!gBattleMoves[move].damagesUnderground && gStatuses3[battlerDef] & STATUS3_UNDERGROUND) + else if (!gMovesInfo[move].damagesUnderground && gStatuses3[battlerDef] & STATUS3_UNDERGROUND) return TRUE; else return FALSE; @@ -1156,22 +1156,22 @@ bool32 IsMoveEncouragedToHit(u32 battlerAtk, u32 battlerDef, u32 move) if (AI_DATA->abilities[battlerDef] == ABILITY_NO_GUARD || AI_DATA->abilities[battlerAtk] == ABILITY_NO_GUARD) return TRUE; - if (B_TOXIC_NEVER_MISS >= GEN_6 && gBattleMoves[move].effect == EFFECT_TOXIC && IS_BATTLER_OF_TYPE(battlerAtk, TYPE_POISON)) + if (B_TOXIC_NEVER_MISS >= GEN_6 && gMovesInfo[move].effect == EFFECT_TOXIC && IS_BATTLER_OF_TYPE(battlerAtk, TYPE_POISON)) return TRUE; // discouraged from hitting weather = AI_GetWeather(AI_DATA); - if ((weather & B_WEATHER_SUN) && gBattleMoves[move].effect == EFFECT_THUNDER) + if ((weather & B_WEATHER_SUN) && gMovesInfo[move].effect == EFFECT_THUNDER) return FALSE; // increased accuracy but don't always hit - if ((weather & B_WEATHER_RAIN) && gBattleMoves[move].effect == EFFECT_THUNDER) + if ((weather & B_WEATHER_RAIN) && gMovesInfo[move].effect == EFFECT_THUNDER) return TRUE; - if ((weather & (B_WEATHER_HAIL | B_WEATHER_SNOW)) && gBattleMoves[move].effect == EFFECT_BLIZZARD) + if ((weather & (B_WEATHER_HAIL | B_WEATHER_SNOW)) && gMovesInfo[move].effect == EFFECT_BLIZZARD) return TRUE; - if (B_MINIMIZE_DMG_ACC >= GEN_6 && (gStatuses3[battlerDef] & STATUS3_MINIMIZED) && gBattleMoves[move].minimizeDoubleDamage) + if (B_MINIMIZE_DMG_ACC >= GEN_6 && (gStatuses3[battlerDef] & STATUS3_MINIMIZED) && gMovesInfo[move].minimizeDoubleDamage) return TRUE; - if (gBattleMoves[move].accuracy == 0) + if (gMovesInfo[move].accuracy == 0) return TRUE; return FALSE; @@ -1630,7 +1630,7 @@ bool32 HasMoveWithType(u32 battler, u32 type) for (i = 0; i < MAX_MON_MOVES; i++) { - if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gBattleMoves[moves[i]].type == type) + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gMovesInfo[moves[i]].type == type) return TRUE; } @@ -1645,7 +1645,7 @@ bool32 HasMoveEffect(u32 battlerId, u32 effect) for (i = 0; i < MAX_MON_MOVES; i++) { if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE - && gBattleMoves[moves[i]].effect == effect) + && gMovesInfo[moves[i]].effect == effect) return TRUE; } @@ -1660,8 +1660,8 @@ bool32 HasMoveEffectANDArg(u32 battlerId, u32 effect, u32 argument) for (i = 0; i < MAX_MON_MOVES; i++) { if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE - && gBattleMoves[moves[i]].effect == effect - && (gBattleMoves[moves[i]].argument & argument)) + && gMovesInfo[moves[i]].effect == effect + && (gMovesInfo[moves[i]].argument & argument)) return TRUE; } @@ -1691,7 +1691,7 @@ bool32 HasMoveWithMoveEffectExcept(u32 battlerId, u32 moveEffect, u32 exception) for (i = 0; i < MAX_MON_MOVES; i++) { if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE - && gBattleMoves[moves[i]].effect != exception + && gMovesInfo[moves[i]].effect != exception && MoveHasMoveEffect(moves[i], moveEffect)) return TRUE; } @@ -1728,7 +1728,7 @@ bool32 HasMoveWithLowAccuracy(u32 battlerAtk, u32 battlerDef, u32 accCheck, bool { if (ignoreStatus && IS_MOVE_STATUS(moves[i])) continue; - else if ((!IS_MOVE_STATUS(moves[i]) && gBattleMoves[moves[i]].accuracy == 0) + else if ((!IS_MOVE_STATUS(moves[i]) && gMovesInfo[moves[i]].accuracy == 0) || AI_GetBattlerMoveTargetType(battlerAtk, moves[i]) & (MOVE_TARGET_USER | MOVE_TARGET_OPPONENTS_FIELD)) continue; @@ -1752,7 +1752,7 @@ bool32 HasSleepMoveWithLowAccuracy(u32 battlerAtk, u32 battlerDef) break; if (!(gBitTable[i] & moveLimitations)) { - if (gBattleMoves[moves[i]].effect == EFFECT_SLEEP + if (gMovesInfo[moves[i]].effect == EFFECT_SLEEP && AI_DATA->moveAccuracy[battlerAtk][battlerDef][i] < 85) return TRUE; } @@ -1762,7 +1762,7 @@ bool32 HasSleepMoveWithLowAccuracy(u32 battlerAtk, u32 battlerDef) bool32 IsHealingMove(u32 move) { - return gBattleMoves[move].healingMove; + return gMovesInfo[move].healingMove; } bool32 HasHealingEffect(u32 battlerId) @@ -1781,7 +1781,7 @@ bool32 HasHealingEffect(u32 battlerId) bool32 IsTrappingMove(u32 move) { - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_MEAN_LOOK: case EFFECT_FAIRY_LOCK: @@ -1924,7 +1924,7 @@ bool32 HasDamagingMove(u32 battlerId) for (i = 0; i < MAX_MON_MOVES; i++) { - if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gBattleMoves[moves[i]].power != 0) + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gMovesInfo[moves[i]].power != 0) return TRUE; } @@ -1939,7 +1939,7 @@ bool32 HasDamagingMoveOfType(u32 battlerId, u32 type) for (i = 0; i < MAX_MON_MOVES; i++) { if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE - && gBattleMoves[moves[i]].type == type && gBattleMoves[moves[i]].power != 0) + && gMovesInfo[moves[i]].type == type && gMovesInfo[moves[i]].power != 0) return TRUE; } @@ -1963,7 +1963,7 @@ bool32 HasHighCritRatioMove(u32 battler) for (i = 0; i < MAX_MON_MOVES; i++) { - if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gBattleMoves[moves[i]].criticalHitStage > 0) + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gMovesInfo[moves[i]].criticalHitStage > 0) return TRUE; } @@ -2229,7 +2229,7 @@ static bool32 PartyBattlerShouldAvoidHazards(u32 currBattler, u32 switchBattler) return FALSE; if (flags & SIDE_STATUS_STEALTH_ROCK) - hazardDamage += GetStealthHazardDamageByTypesAndHP(gBattleMoves[MOVE_STEALTH_ROCK].type, type1, type2, maxHp); + hazardDamage += GetStealthHazardDamageByTypesAndHP(gMovesInfo[MOVE_STEALTH_ROCK].type, type1, type2, maxHp); if (flags & SIDE_STATUS_SPIKES && ((type1 != TYPE_FLYING && type2 != TYPE_FLYING && ability != ABILITY_LEVITATE && holdEffect != HOLD_EFFECT_AIR_BALLOON) @@ -2338,7 +2338,7 @@ bool32 ShouldPivot(u32 battlerAtk, u32 battlerDef, u32 defAbility, u32 move, u32 { if (CanTargetFaintAi(battlerDef, battlerAtk)) { - if (gBattleMoves[move].effect == EFFECT_TELEPORT) + if (gMovesInfo[move].effect == EFFECT_TELEPORT) return DONT_PIVOT; // If you're going to faint because you'll go second, use a different move else return CAN_TRY_PIVOT; // You're probably going to faint anyways so if for some reason you don't, better switch @@ -2780,7 +2780,7 @@ bool32 ShouldAbsorb(u32 battlerAtk, u32 battlerDef, u32 move, s32 damage) if (move == 0xFFFF || AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER) { // using item or user goes first - u32 healPercent = (gBattleMoves[move].argument == 0) ? 50 : gBattleMoves[move].argument; + u32 healPercent = (gMovesInfo[move].argument == 0) ? 50 : gMovesInfo[move].argument; s32 healDmg = (healPercent * damage) / 100; if (gStatuses3[battlerAtk] & STATUS3_HEAL_BLOCK) @@ -2876,7 +2876,7 @@ bool32 DoesPartnerHaveSameMoveEffect(u32 battlerAtkPartner, u32 battlerDef, u32 if (!IsDoubleBattle()) return FALSE; - if (gBattleMoves[move].effect == gBattleMoves[partnerMove].effect + if (gMovesInfo[move].effect == gMovesInfo[partnerMove].effect && partnerMove != MOVE_NONE && gBattleStruct->moveTarget[battlerAtkPartner] == battlerDef) { @@ -2891,7 +2891,7 @@ bool32 PartnerHasSameMoveEffectWithoutTarget(u32 battlerAtkPartner, u32 move, u3 if (!IsDoubleBattle()) return FALSE; - if (gBattleMoves[move].effect == gBattleMoves[partnerMove].effect + if (gMovesInfo[move].effect == gMovesInfo[partnerMove].effect && partnerMove != MOVE_NONE) return TRUE; return FALSE; @@ -2905,12 +2905,12 @@ bool32 PartnerMoveEffectIsStatusSameTarget(u32 battlerAtkPartner, u32 battlerDef if (partnerMove != MOVE_NONE && gBattleStruct->moveTarget[battlerAtkPartner] == battlerDef - && (gBattleMoves[partnerMove].effect == EFFECT_SLEEP - || gBattleMoves[partnerMove].effect == EFFECT_POISON - || gBattleMoves[partnerMove].effect == EFFECT_TOXIC - || gBattleMoves[partnerMove].effect == EFFECT_PARALYZE - || gBattleMoves[partnerMove].effect == EFFECT_WILL_O_WISP - || gBattleMoves[partnerMove].effect == EFFECT_YAWN)) + && (gMovesInfo[partnerMove].effect == EFFECT_SLEEP + || gMovesInfo[partnerMove].effect == EFFECT_POISON + || gMovesInfo[partnerMove].effect == EFFECT_TOXIC + || gMovesInfo[partnerMove].effect == EFFECT_PARALYZE + || gMovesInfo[partnerMove].effect == EFFECT_WILL_O_WISP + || gMovesInfo[partnerMove].effect == EFFECT_YAWN)) return TRUE; return FALSE; } @@ -2918,11 +2918,11 @@ bool32 PartnerMoveEffectIsStatusSameTarget(u32 battlerAtkPartner, u32 battlerDef bool32 IsMoveEffectWeather(u32 move) { if (move != MOVE_NONE - && (gBattleMoves[move].effect == EFFECT_SUNNY_DAY - || gBattleMoves[move].effect == EFFECT_RAIN_DANCE - || gBattleMoves[move].effect == EFFECT_SANDSTORM - || gBattleMoves[move].effect == EFFECT_HAIL - || gBattleMoves[move].effect == EFFECT_SNOWSCAPE)) + && (gMovesInfo[move].effect == EFFECT_SUNNY_DAY + || gMovesInfo[move].effect == EFFECT_RAIN_DANCE + || gMovesInfo[move].effect == EFFECT_SANDSTORM + || gMovesInfo[move].effect == EFFECT_HAIL + || gMovesInfo[move].effect == EFFECT_SNOWSCAPE)) return TRUE; return FALSE; } @@ -2934,10 +2934,10 @@ bool32 PartnerMoveEffectIsTerrain(u32 battlerAtkPartner, u32 partnerMove) return FALSE; if (partnerMove != MOVE_NONE - && (gBattleMoves[partnerMove].effect == EFFECT_GRASSY_TERRAIN - || gBattleMoves[partnerMove].effect == EFFECT_MISTY_TERRAIN - || gBattleMoves[partnerMove].effect == EFFECT_ELECTRIC_TERRAIN - || gBattleMoves[partnerMove].effect == EFFECT_PSYCHIC_TERRAIN)) + && (gMovesInfo[partnerMove].effect == EFFECT_GRASSY_TERRAIN + || gMovesInfo[partnerMove].effect == EFFECT_MISTY_TERRAIN + || gMovesInfo[partnerMove].effect == EFFECT_ELECTRIC_TERRAIN + || gMovesInfo[partnerMove].effect == EFFECT_PSYCHIC_TERRAIN)) return TRUE; return FALSE; @@ -3017,7 +3017,7 @@ bool32 ShouldUseWishAromatherapy(u32 battlerAtk, u32 battlerDef, u32 move) if (!IsDoubleBattle()) { - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_WISH: if (needHealing) @@ -3030,7 +3030,7 @@ bool32 ShouldUseWishAromatherapy(u32 battlerAtk, u32 battlerDef, u32 move) } else { - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_WISH: return ShouldRecover(battlerAtk, battlerDef, move, 50); // Switch recovery isn't good idea in doubles @@ -3149,7 +3149,7 @@ bool32 PartyHasMoveCategory(u32 battlerId, u32 category) if (pp > 0 && move != MOVE_NONE) { //TODO - handle photon geyser, light that burns the sky - if (gBattleMoves[move].category == category) + if (gMovesInfo[move].category == category) return TRUE; } } @@ -3453,7 +3453,7 @@ void IncreaseFrostbiteScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score bool32 AI_MoveMakesContact(u32 ability, u32 holdEffect, u32 move) { - if (gBattleMoves[move].makesContact + if (gMovesInfo[move].makesContact && ability != ABILITY_LONG_REACH && holdEffect != HOLD_EFFECT_PROTECTIVE_PADS) return TRUE; diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index 3d89149f1637..9b25909dddb4 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -9131,7 +9131,7 @@ void AnimTask_DynamaxGrowth(u8 taskId) // from CFRU void AnimTask_GetWeatherToSet(u8 taskId) { - switch (gBattleMoves[gCurrentMove].argument) + switch (gMovesInfo[gCurrentMove].argument) { case MAX_EFFECT_SUN: gBattleAnimArgs[ARG_RET_ID] = 1; diff --git a/src/battle_arena.c b/src/battle_arena.c index b554c6bdc8eb..591893bb75bf 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -363,17 +363,17 @@ void BattleArena_AddMindPoints(u8 battler) // All moves with power == 0 give 0 points, with the following exceptions: // - Protect, Detect, and Endure subtract 1 point - if (gBattleMoves[gCurrentMove].effect == EFFECT_FAKE_OUT - || gBattleMoves[gCurrentMove].effect == EFFECT_PROTECT - || gBattleMoves[gCurrentMove].effect == EFFECT_ENDURE) + if (gMovesInfo[gCurrentMove].effect == EFFECT_FAKE_OUT + || gMovesInfo[gCurrentMove].effect == EFFECT_PROTECT + || gMovesInfo[gCurrentMove].effect == EFFECT_ENDURE) { gBattleStruct->arenaMindPoints[battler]--; } - else if (gBattleMoves[gCurrentMove].power != 0 - && gBattleMoves[gCurrentMove].effect != EFFECT_COUNTER - && gBattleMoves[gCurrentMove].effect != EFFECT_MIRROR_COAT - && gBattleMoves[gCurrentMove].effect != EFFECT_METAL_BURST - && gBattleMoves[gCurrentMove].effect != EFFECT_BIDE) + else if (gMovesInfo[gCurrentMove].power != 0 + && gMovesInfo[gCurrentMove].effect != EFFECT_COUNTER + && gMovesInfo[gCurrentMove].effect != EFFECT_MIRROR_COAT + && gMovesInfo[gCurrentMove].effect != EFFECT_METAL_BURST + && gMovesInfo[gCurrentMove].effect != EFFECT_BIDE) { gBattleStruct->arenaMindPoints[battler]++; } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 7ffcd5ae2c7d..4e272f4d0d4e 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -596,7 +596,7 @@ static void OpponentHandleChooseMove(u32 battler) } while (!CanTargetBattler(battler, target, move)); // Don't bother to loop through table if the move can't attack ally - if (B_WILD_NATURAL_ENEMIES == TRUE && !(gBattleMoves[move].target & MOVE_TARGET_BOTH)) + if (B_WILD_NATURAL_ENEMIES == TRUE && !(gMovesInfo[move].target & MOVE_TARGET_BOTH)) { u16 i, speciesAttacker, speciesTarget, isPartnerEnemy = FALSE; static const u16 naturalEnemies[][2] = diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index a7ff61fce8c4..ea271e440ed4 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -705,13 +705,13 @@ static void HandleInputChooseMove(u32 battler) QueueZMove(battler, chosenMove); gBattleStruct->zmove.viewing = FALSE; - if (gBattleMoves[moveInfo->moves[gMoveSelectionCursor[battler]]].category != BATTLE_CATEGORY_STATUS) + if (gMovesInfo[moveInfo->moves[gMoveSelectionCursor[battler]]].category != BATTLE_CATEGORY_STATUS) moveTarget = MOVE_TARGET_SELECTED; //damaging z moves always have selected target } // Status moves turn into Max Guard when Dynamaxed, targets user. if ((IsDynamaxed(battler) || gBattleStruct->dynamax.playerSelect)) - moveTarget = gBattleMoves[GetMaxMove(battler, moveInfo->moves[gMoveSelectionCursor[battler]])].target; + moveTarget = gMovesInfo[GetMaxMove(battler, moveInfo->moves[gMoveSelectionCursor[battler]])].target; if (moveTarget & MOVE_TARGET_USER) gMultiUsePlayerCursor = battler; @@ -1750,10 +1750,10 @@ static void MoveSelectionDisplayMoveType(u32 battler) || speciesId == SPECIES_OGERPON_CORNERSTONE_MASK || speciesId == SPECIES_OGERPON_CORNERSTONE_MASK_TERA) type = gBattleMons[battler].type2; else - type = gBattleMoves[MOVE_IVY_CUDGEL].type; + type = gMovesInfo[MOVE_IVY_CUDGEL].type; } else - type = gBattleMoves[moveInfo->moves[gMoveSelectionCursor[battler]]].type; + type = gMovesInfo[moveInfo->moves[gMoveSelectionCursor[battler]]].type; StringCopy(txtPtr, gTypeNames[type]); BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_TYPE); diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 62941c92af49..6ede6587b245 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -360,9 +360,9 @@ static void PlayerPartnerHandleChooseMove(u32 battler) } else { - if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_USER_OR_SELECTED)) + if (gMovesInfo[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_USER_OR_SELECTED)) gBattlerTarget = battler; - if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH) + if (gMovesInfo[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH) { gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]) diff --git a/src/battle_controllers.c b/src/battle_controllers.c index d6389f02ccdf..27623c97bc48 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1115,7 +1115,7 @@ void BtlController_EmitPrintString(u32 battler, u32 bufferId, u16 stringID) stringInfo->bakScriptPartyIdx = gBattleStruct->scriptPartyIdx; stringInfo->hpScale = gBattleStruct->hpScale; stringInfo->itemEffectBattler = gPotentialItemEffectBattler; - stringInfo->moveType = gBattleMoves[gCurrentMove].type; + stringInfo->moveType = gMovesInfo[gCurrentMove].type; for (i = 0; i < MAX_BATTLERS_COUNT; i++) stringInfo->abilities[i] = gBattleMons[i].ability; diff --git a/src/battle_dome.c b/src/battle_dome.c index e02d7b9a93f8..a5cbb320da0f 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -2239,7 +2239,7 @@ static void CreateDomeOpponentMon(u8 monPartyId, u16 tournamentTrainerId, u8 tou { SetMonMoveSlot(&gEnemyParty[monPartyId], gFacilityTrainerMons[DOME_MONS[tournamentTrainerId][tournamentMonId]].moves[i], i); - if (gBattleMoves[gFacilityTrainerMons[DOME_MONS[tournamentTrainerId][tournamentMonId]].moves[i]].effect == EFFECT_FRUSTRATION) + if (gMovesInfo[gFacilityTrainerMons[DOME_MONS[tournamentTrainerId][tournamentMonId]].moves[i]].effect == EFFECT_FRUSTRATION) friendship = 0; } @@ -2445,7 +2445,7 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int mode) defType1 = gSpeciesInfo[targetSpecies].types[0]; defType2 = gSpeciesInfo[targetSpecies].types[1]; defAbility = gSpeciesInfo[targetSpecies].abilities[0]; - moveType = gBattleMoves[move].type; + moveType = gMovesInfo[move].type; if (defAbility == ABILITY_LEVITATE && moveType == TYPE_GROUND) { @@ -3933,7 +3933,7 @@ static bool32 IsDomeHealingMove(u32 move) if (IsHealingMove(move)) return TRUE; // Check extra effects not considered plain healing by AI - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_INGRAIN: case EFFECT_REFRESH: @@ -3992,9 +3992,9 @@ static bool32 IsDomeRiskyMoveEffect(u32 effect) static bool32 IsDomeLuckyMove(u32 move) { - if (gBattleMoves[move].accuracy <= 50) + if (gMovesInfo[move].accuracy <= 50) return TRUE; - switch(gBattleMoves[move].effect) + switch(gMovesInfo[move].effect) { case EFFECT_COUNTER: case EFFECT_OHKO: // Technically redundant because of the above accuracy check @@ -4025,10 +4025,10 @@ static bool32 IsDomePopularMove(u32 move) if (i == NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES) return FALSE; // Filter in TMs/HMs - if (gBattleMoves[move].power >= 90) + if (gMovesInfo[move].power >= 90) return TRUE; - switch(gBattleMoves[move].effect) + switch(gMovesInfo[move].effect) { case EFFECT_PROTECT: case EFFECT_MAT_BLOCK: @@ -4043,7 +4043,7 @@ static bool32 IsDomePopularMove(u32 move) static bool32 IsDomeStatusMoveEffect(u32 move) { - switch(gBattleMoves[move].effect) + switch(gMovesInfo[move].effect) { case EFFECT_SLEEP: case EFFECT_CONFUSE: @@ -4116,7 +4116,7 @@ static bool32 IsDomeComboMoveEffect(u32 effect) // Moves dependent on terrain case EFFECT_EXPANDING_FORCE: case EFFECT_GRASSY_GLIDE: - //case EFFECT_MISTY_EXPLOSION: (needs a unique effect in gBattleMoves!) + //case EFFECT_MISTY_EXPLOSION: (needs a unique effect in gMovesInfo!) case EFFECT_PSYBLADE: case EFFECT_RISING_VOLTAGE: case EFFECT_TERRAIN_PULSE: @@ -4346,13 +4346,13 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) switch (k) { case MOVE_POINTS_COMBO: - allocatedArray[k] = IsDomeComboMoveEffect(gBattleMoves[move].effect) ? 1 : 0; + allocatedArray[k] = IsDomeComboMoveEffect(gMovesInfo[move].effect) ? 1 : 0; break; case MOVE_POINTS_STAT_RAISE: - allocatedArray[k] = IsStatRaisingEffect(gBattleMoves[move].effect) ? 1 : 0; + allocatedArray[k] = IsStatRaisingEffect(gMovesInfo[move].effect) ? 1 : 0; break; case MOVE_POINTS_STAT_LOWER: - allocatedArray[k] = IsStatLoweringEffect(gBattleMoves[move].effect) ? 1 : 0; + allocatedArray[k] = IsStatLoweringEffect(gMovesInfo[move].effect) ? 1 : 0; break; case MOVE_POINTS_RARE: allocatedArray[k] = IsDomeRareMove(move) ? 1 : 0; @@ -4361,22 +4361,22 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) allocatedArray[k] = IsDomeHealingMove(move) ? 1 : 0; break; case MOVE_POINTS_RISKY: - allocatedArray[k] = IsDomeRiskyMoveEffect(gBattleMoves[move].effect) ? 1 : 0; + allocatedArray[k] = IsDomeRiskyMoveEffect(gMovesInfo[move].effect) ? 1 : 0; break; case MOVE_POINTS_STATUS: allocatedArray[k] = IsDomeStatusMoveEffect(move); break; case MOVE_POINTS_DMG: - allocatedArray[k] = (gBattleMoves[move].power != 0) ? 1 : 0; + allocatedArray[k] = (gMovesInfo[move].power != 0) ? 1 : 0; break; case MOVE_POINTS_DEF: - allocatedArray[k] = IsDomeDefensiveMoveEffect(gBattleMoves[move].effect) ? 1 : 0; + allocatedArray[k] = IsDomeDefensiveMoveEffect(gMovesInfo[move].effect) ? 1 : 0; break; case MOVE_POINTS_ACCURATE: - allocatedArray[k] = (gBattleMoves[move].accuracy == 0 || gBattleMoves[move].accuracy == 100) ? 1 : 0; + allocatedArray[k] = (gMovesInfo[move].accuracy == 0 || gMovesInfo[move].accuracy == 100) ? 1 : 0; break; case MOVE_POINTS_POWERFUL: - allocatedArray[k] = (gBattleMoves[move].power >= 100) ? 1 : 0; + allocatedArray[k] = (gMovesInfo[move].power >= 100) ? 1 : 0; break; case MOVE_POINTS_POPULAR: allocatedArray[k] = IsDomePopularMove(move) ? 1 : 0; @@ -4385,13 +4385,13 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) allocatedArray[k] = IsDomeLuckyMove(move) ? 1 : 0; break; case MOVE_POINTS_STRONG: - allocatedArray[k] = (gBattleMoves[move].power >= 90) ? 1 : 0; + allocatedArray[k] = (gMovesInfo[move].power >= 90) ? 1 : 0; break; case MOVE_POINTS_LOW_PP: - allocatedArray[k] = (gBattleMoves[move].pp <= 5) ? 1 : 0; + allocatedArray[k] = (gMovesInfo[move].pp <= 5) ? 1 : 0; break; case MOVE_POINTS_EFFECT: - allocatedArray[k] = gBattleMoves[move].sheerForceBoost; + allocatedArray[k] = gMovesInfo[move].sheerForceBoost; break; } } @@ -5148,12 +5148,12 @@ static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roun else moveIds[i * MAX_MON_MOVES + j] = gFacilityTrainerMons[DOME_MONS[winnerTournamentId][i]].moves[j]; - movePower = gBattleMoves[moveIds[i * MAX_MON_MOVES + j]].power; + movePower = gMovesInfo[moveIds[i * MAX_MON_MOVES + j]].power; if (movePower == 0) movePower = 40; else if (movePower == 1) movePower = 60; - else if (gBattleMoves[moveIds[i * MAX_MON_MOVES + j]].effect == EFFECT_EXPLOSION) + else if (gMovesInfo[moveIds[i * MAX_MON_MOVES + j]].effect == EFFECT_EXPLOSION) movePower /= 2; for (k = 0; k < FRONTIER_PARTY_SIZE; k++) diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index d7a45424e275..d2a1492e3cfb 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -264,7 +264,7 @@ bool32 IsMoveBlockedByMaxGuard(u16 move) bool32 IsMoveBlockedByDynamax(u16 move) { // TODO: Certain moves are banned in raids. - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_HEAT_CRASH: case EFFECT_LOW_KICK: @@ -322,19 +322,19 @@ u16 GetMaxMove(u16 battlerId, u16 baseMove) { return MOVE_STRUGGLE; } - else if (gBattleMoves[baseMove].category == BATTLE_CATEGORY_STATUS) + else if (gMovesInfo[baseMove].category == BATTLE_CATEGORY_STATUS) { move = MOVE_MAX_GUARD; } else if (gBattleStruct->dynamicMoveType) { move = GetTypeBasedMaxMove(battlerId, gBattleStruct->dynamicMoveType & DYNAMIC_TYPE_MASK); - gBattleStruct->dynamax.categories[battlerId] = gBattleMoves[baseMove].category; + gBattleStruct->dynamax.categories[battlerId] = gMovesInfo[baseMove].category; } else { - move = GetTypeBasedMaxMove(battlerId, gBattleMoves[baseMove].type); - gBattleStruct->dynamax.categories[battlerId] = gBattleMoves[baseMove].category; + move = GetTypeBasedMaxMove(battlerId, gMovesInfo[baseMove].type); + gBattleStruct->dynamax.categories[battlerId] = gMovesInfo[baseMove].category; } return move; @@ -358,7 +358,7 @@ u8 GetMaxMovePower(u16 move) { u8 tier; // G-Max Drum Solo, G-Max Hydrosnipe, and G-Max Fireball always have 160 base power. - if (gBattleMoves[GetMaxMove(gBattlerAttacker, move)].argument == MAX_EFFECT_FIXED_POWER) + if (gMovesInfo[GetMaxMove(gBattlerAttacker, move)].argument == MAX_EFFECT_FIXED_POWER) return 160; // Exceptions to all other rules below: @@ -371,8 +371,8 @@ u8 GetMaxMovePower(u16 move) } tier = GetMaxPowerTier(move); - if (gBattleMoves[move].type == TYPE_FIGHTING - || gBattleMoves[move].type == TYPE_POISON + if (gMovesInfo[move].type == TYPE_FIGHTING + || gMovesInfo[move].type == TYPE_POISON || move == MOVE_MULTI_ATTACK) { switch (tier) @@ -407,9 +407,9 @@ u8 GetMaxMovePower(u16 move) static u8 GetMaxPowerTier(u16 move) { - if (gBattleMoves[move].strikeCount >= 2 && gBattleMoves[move].strikeCount <= 5) + if (gMovesInfo[move].strikeCount >= 2 && gMovesInfo[move].strikeCount <= 5) { - switch(gBattleMoves[move].power) + switch(gMovesInfo[move].power) { case 0 ... 25: return MAX_POWER_TIER_2; case 26 ... 30: return MAX_POWER_TIER_3; @@ -420,7 +420,7 @@ static u8 GetMaxPowerTier(u16 move) } } - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_BIDE: case EFFECT_SUPER_FANG: @@ -457,7 +457,7 @@ static u8 GetMaxPowerTier(u16 move) case EFFECT_LOW_KICK: return MAX_POWER_TIER_7; case EFFECT_MULTI_HIT: - switch(gBattleMoves[move].power) + switch(gMovesInfo[move].power) { case 0 ... 15: return MAX_POWER_TIER_1; case 16 ... 18: return MAX_POWER_TIER_2; @@ -467,7 +467,7 @@ static u8 GetMaxPowerTier(u16 move) } } - switch (gBattleMoves[move].power) + switch (gMovesInfo[move].power) { case 0 ... 40: return MAX_POWER_TIER_1; case 45 ... 50: return MAX_POWER_TIER_2; @@ -509,7 +509,7 @@ void ChooseDamageNonTypesString(u8 type) // Returns the status effect that should be applied by a G-Max Move. static u32 GetMaxMoveStatusEffect(u16 move) { - u8 maxEffect = gBattleMoves[move].argument; + u8 maxEffect = gMovesInfo[move].argument; switch (maxEffect) { // Status 1 @@ -576,7 +576,7 @@ void BS_SetMaxMoveEffect(void) { NATIVE_ARGS(); u16 effect = 0; - u8 maxEffect = gBattleMoves[gCurrentMove].argument; + u8 maxEffect = gMovesInfo[gCurrentMove].argument; // Don't continue if the move didn't land. if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT) @@ -595,7 +595,7 @@ void BS_SetMaxMoveEffect(void) if (!NoAliveMonsForEitherParty()) { // Max Effects are ordered by stat ID. - SET_STATCHANGER(gBattleMoves[gCurrentMove].argument, 1, FALSE); + SET_STATCHANGER(gMovesInfo[gCurrentMove].argument, 1, FALSE); BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_EffectRaiseStatAllies; effect++; @@ -623,7 +623,7 @@ void BS_SetMaxMoveEffect(void) break; default: // Max Effects are ordered by stat ID. - statId = gBattleMoves[gCurrentMove].argument - MAX_EFFECT_LOWER_ATTACK + 1; + statId = gMovesInfo[gCurrentMove].argument - MAX_EFFECT_LOWER_ATTACK + 1; break; } SET_STATCHANGER(statId, stage, TRUE); @@ -672,7 +672,7 @@ void BS_SetMaxMoveEffect(void) case MAX_EFFECT_PSYCHIC_TERRAIN: { u32 statusFlag = 0; - switch (gBattleMoves[gCurrentMove].argument) + switch (gMovesInfo[gCurrentMove].argument) { case MAX_EFFECT_MISTY_TERRAIN: statusFlag = STATUS_FIELD_MISTY_TERRAIN; @@ -715,9 +715,9 @@ void BS_SetMaxMoveEffect(void) { gSideStatuses[side] |= SIDE_STATUS_DAMAGE_NON_TYPES; gSideTimers[side].damageNonTypesTimer = 5; // damage is dealt for 4 turns, ends on 5th - gSideTimers[side].damageNonTypesType = gBattleMoves[gCurrentMove].type; + gSideTimers[side].damageNonTypesType = gMovesInfo[gCurrentMove].type; BattleScriptPush(gBattlescriptCurrInstr + 1); - ChooseDamageNonTypesString(gBattleMoves[gCurrentMove].type); + ChooseDamageNonTypesString(gMovesInfo[gCurrentMove].type); gBattlescriptCurrInstr = BattleScript_DamageNonTypesStarts; effect++; } diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index c14b364e77ea..4aaf1b6e8356 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -1002,7 +1002,7 @@ void LoadBattleMonGfxAndAnimate(u8 battler, bool8 loadMonSprite, u8 spriteId) void TrySetBehindSubstituteSpriteBit(u8 battler, u16 move) { - if (gBattleMoves[move].effect == EFFECT_SUBSTITUTE || gBattleMoves[move].effect == EFFECT_SHED_TAIL) + if (gMovesInfo[move].effect == EFFECT_SUBSTITUTE || gMovesInfo[move].effect == EFFECT_SHED_TAIL) gBattleSpritesDataPtr->battlerData[battler].behindSubstitute = 1; } diff --git a/src/battle_main.c b/src/battle_main.c index d36f8ff38652..89ffa6f32a82 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1919,7 +1919,7 @@ void CustomTrainerPartyAssignMoves(struct Pokemon *mon, const struct TrainerMon for (j = 0; j < MAX_MON_MOVES; ++j) { SetMonData(mon, MON_DATA_MOVE1 + j, &partyEntry->moves[j]); - SetMonData(mon, MON_DATA_PP1 + j, &gBattleMoves[partyEntry->moves[j]].pp); + SetMonData(mon, MON_DATA_PP1 + j, &gMovesInfo[partyEntry->moves[j]].pp); } } @@ -3091,7 +3091,7 @@ void SwitchInClearSetData(u32 battler) struct DisableStruct disableStructCopy = gDisableStructs[battler]; ClearIllusionMon(battler); - if (gBattleMoves[gCurrentMove].effect != EFFECT_BATON_PASS) + if (gMovesInfo[gCurrentMove].effect != EFFECT_BATON_PASS) { for (i = 0; i < NUM_BATTLE_STATS; i++) gBattleMons[battler].statStages[i] = DEFAULT_STAT_STAGE; @@ -3106,7 +3106,7 @@ void SwitchInClearSetData(u32 battler) } } } - if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) + if (gMovesInfo[gCurrentMove].effect == EFFECT_BATON_PASS) { gBattleMons[battler].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED); gStatuses3[battler] &= (STATUS3_LEECHSEED_BATTLER | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED @@ -3148,7 +3148,7 @@ void SwitchInClearSetData(u32 battler) memset(&gDisableStructs[battler], 0, sizeof(struct DisableStruct)); - if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) + if (gMovesInfo[gCurrentMove].effect == EFFECT_BATON_PASS) { gDisableStructs[battler].substituteHP = disableStructCopy.substituteHP; gDisableStructs[battler].battlerWithSureHit = disableStructCopy.battlerWithSureHit; @@ -3156,7 +3156,7 @@ void SwitchInClearSetData(u32 battler) gDisableStructs[battler].battlerPreventingEscape = disableStructCopy.battlerPreventingEscape; gDisableStructs[battler].embargoTimer = disableStructCopy.embargoTimer; } - else if (gBattleMoves[gCurrentMove].effect == EFFECT_SHED_TAIL) + else if (gMovesInfo[gCurrentMove].effect == EFFECT_SHED_TAIL) { gBattleMons[battler].status2 |= STATUS2_SUBSTITUTE; gDisableStructs[battler].substituteHP = disableStructCopy.substituteHP; @@ -4707,18 +4707,18 @@ s8 GetMovePriority(u32 battler, u16 move) s8 priority; u16 ability = GetBattlerAbility(battler); - if (gBattleStruct->zmove.toBeUsed[battler] && gBattleMoves[move].power != 0) + if (gBattleStruct->zmove.toBeUsed[battler] && gMovesInfo[move].power != 0) move = gBattleStruct->zmove.toBeUsed[battler]; - priority = gBattleMoves[move].priority; + priority = gMovesInfo[move].priority; // Max Guard check - if (gBattleStruct->dynamax.usingMaxMove[battler] && gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) - return gBattleMoves[MOVE_MAX_GUARD].priority; + if (gBattleStruct->dynamax.usingMaxMove[battler] && gMovesInfo[move].category == BATTLE_CATEGORY_STATUS) + return gMovesInfo[MOVE_MAX_GUARD].priority; if (ability == ABILITY_GALE_WINGS && (B_GALE_WINGS < GEN_7 || BATTLER_MAX_HP(battler)) - && gBattleMoves[move].type == TYPE_FLYING) + && gMovesInfo[move].type == TYPE_FLYING) { priority++; } @@ -4727,7 +4727,7 @@ s8 GetMovePriority(u32 battler, u16 move) gProtectStructs[battler].pranksterElevated = 1; priority++; } - else if (gBattleMoves[move].effect == EFFECT_GRASSY_GLIDE && gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN && IsBattlerGrounded(battler)) + else if (gMovesInfo[move].effect == EFFECT_GRASSY_GLIDE && gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN && IsBattlerGrounded(battler)) { priority++; } @@ -5621,7 +5621,7 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) gBattleStruct->ateBoost[battlerAtk] = 0; gSpecialStatuses[battlerAtk].gemBoost = FALSE; - if (gBattleMoves[move].effect == EFFECT_WEATHER_BALL) + if (gMovesInfo[move].effect == EFFECT_WEATHER_BALL) { if (WEATHER_HAS_EFFECT) { @@ -5637,7 +5637,7 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) gBattleStruct->dynamicMoveType = TYPE_NORMAL | F_DYNAMIC_TYPE_SET; } } - else if (gBattleMoves[move].effect == EFFECT_HIDDEN_POWER) + else if (gMovesInfo[move].effect == EFFECT_HIDDEN_POWER) { u8 typeBits = ((gBattleMons[battlerAtk].hpIV & 1) << 0) | ((gBattleMons[battlerAtk].attackIV & 1) << 1) @@ -5653,11 +5653,11 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) gBattleStruct->dynamicMoveType++; gBattleStruct->dynamicMoveType |= F_DYNAMIC_TYPE_IGNORE_PHYSICALITY | F_DYNAMIC_TYPE_SET; } - else if (gBattleMoves[move].effect == EFFECT_CHANGE_TYPE_ON_ITEM && holdEffect == gBattleMoves[move].argument) + else if (gMovesInfo[move].effect == EFFECT_CHANGE_TYPE_ON_ITEM && holdEffect == gMovesInfo[move].argument) { gBattleStruct->dynamicMoveType = ItemId_GetSecondaryId(gBattleMons[battlerAtk].item) | F_DYNAMIC_TYPE_SET; } - else if (gBattleMoves[move].effect == EFFECT_REVELATION_DANCE) + else if (gMovesInfo[move].effect == EFFECT_REVELATION_DANCE) { if (gBattleMons[battlerAtk].type1 != TYPE_MYSTERY) gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].type1 | F_DYNAMIC_TYPE_SET; @@ -5666,26 +5666,26 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) else if (gBattleMons[battlerAtk].type3 != TYPE_MYSTERY) gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].type3 | F_DYNAMIC_TYPE_SET; } - else if (gBattleMoves[move].effect == EFFECT_RAGING_BULL + else if (gMovesInfo[move].effect == EFFECT_RAGING_BULL && (gBattleMons[battlerAtk].species == SPECIES_TAUROS_PALDEAN_COMBAT_BREED || gBattleMons[battlerAtk].species == SPECIES_TAUROS_PALDEAN_BLAZE_BREED || gBattleMons[battlerAtk].species == SPECIES_TAUROS_PALDEAN_AQUA_BREED)) { gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].type2 | F_DYNAMIC_TYPE_SET; } - else if (gBattleMoves[move].effect == EFFECT_IVY_CUDGEL + else if (gMovesInfo[move].effect == EFFECT_IVY_CUDGEL && (gBattleMons[battlerAtk].species == SPECIES_OGERPON_WELLSPRING_MASK || gBattleMons[battlerAtk].species == SPECIES_OGERPON_WELLSPRING_MASK_TERA || gBattleMons[battlerAtk].species == SPECIES_OGERPON_HEARTHFLAME_MASK || gBattleMons[battlerAtk].species == SPECIES_OGERPON_HEARTHFLAME_MASK_TERA || gBattleMons[battlerAtk].species == SPECIES_OGERPON_CORNERSTONE_MASK || gBattleMons[battlerAtk].species == SPECIES_OGERPON_CORNERSTONE_MASK_TERA )) { gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].type2 | F_DYNAMIC_TYPE_SET; } - else if (gBattleMoves[move].effect == EFFECT_NATURAL_GIFT) + else if (gMovesInfo[move].effect == EFFECT_NATURAL_GIFT) { if (ItemId_GetPocket(gBattleMons[battlerAtk].item) == POCKET_BERRIES) gBattleStruct->dynamicMoveType = gNaturalGiftTable[ITEM_TO_BERRY(gBattleMons[battlerAtk].item)].type; } - else if (gBattleMoves[move].effect == EFFECT_TERRAIN_PULSE) + else if (gMovesInfo[move].effect == EFFECT_TERRAIN_PULSE) { if (IsBattlerTerrainAffected(battlerAtk, STATUS_FIELD_TERRAIN_ANY)) { @@ -5704,11 +5704,11 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) attackerAbility = GetBattlerAbility(battlerAtk); - if (gBattleMoves[move].type == TYPE_NORMAL - && gBattleMoves[move].effect != EFFECT_HIDDEN_POWER - && gBattleMoves[move].effect != EFFECT_WEATHER_BALL - && gBattleMoves[move].effect != EFFECT_CHANGE_TYPE_ON_ITEM - && gBattleMoves[move].effect != EFFECT_NATURAL_GIFT + if (gMovesInfo[move].type == TYPE_NORMAL + && gMovesInfo[move].effect != EFFECT_HIDDEN_POWER + && gMovesInfo[move].effect != EFFECT_WEATHER_BALL + && gMovesInfo[move].effect != EFFECT_CHANGE_TYPE_ON_ITEM + && gMovesInfo[move].effect != EFFECT_NATURAL_GIFT && ((attackerAbility == ABILITY_PIXILATE && (ateType = TYPE_FAIRY)) || (attackerAbility == ABILITY_REFRIGERATE && (ateType = TYPE_ICE)) || (attackerAbility == ABILITY_AERILATE && (ateType = TYPE_FLYING)) @@ -5720,20 +5720,20 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) if (!IsDynamaxed(battlerAtk)) gBattleStruct->ateBoost[battlerAtk] = 1; } - else if (gBattleMoves[move].type != TYPE_NORMAL - && gBattleMoves[move].effect != EFFECT_HIDDEN_POWER - && gBattleMoves[move].effect != EFFECT_WEATHER_BALL + else if (gMovesInfo[move].type != TYPE_NORMAL + && gMovesInfo[move].effect != EFFECT_HIDDEN_POWER + && gMovesInfo[move].effect != EFFECT_WEATHER_BALL && attackerAbility == ABILITY_NORMALIZE) { gBattleStruct->dynamicMoveType = TYPE_NORMAL | F_DYNAMIC_TYPE_SET; if (!IsDynamaxed(battlerAtk)) gBattleStruct->ateBoost[battlerAtk] = 1; } - else if (gBattleMoves[move].soundMove && attackerAbility == ABILITY_LIQUID_VOICE) + else if (gMovesInfo[move].soundMove && attackerAbility == ABILITY_LIQUID_VOICE) { gBattleStruct->dynamicMoveType = TYPE_WATER | F_DYNAMIC_TYPE_SET; } - else if (gBattleMoves[move].effect == EFFECT_AURA_WHEEL && gBattleMons[battlerAtk].species == SPECIES_MORPEKO_HANGRY) + else if (gMovesInfo[move].effect == EFFECT_AURA_WHEEL && gBattleMons[battlerAtk].species == SPECIES_MORPEKO_HANGRY) { gBattleStruct->dynamicMoveType = TYPE_DARK | F_DYNAMIC_TYPE_SET; } diff --git a/src/battle_message.c b/src/battle_message.c index bd5af96b7cb5..7b61aa3c2735 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -3986,7 +3986,7 @@ void SetPpNumbersPaletteInMoveSelection(u32 battler) var = GetCurrentPpToMaxPpState(chooseMoveStruct->currentPp[gMoveSelectionCursor[battler]], chooseMoveStruct->maxPp[gMoveSelectionCursor[battler]]); else - var = GetCurrentPpToMaxPpState(chooseMoveStruct->currentPp[gMoveSelectionCursor[battler]], gBattleMoves[gMoveSelectionCursor[battler]].pp); + var = GetCurrentPpToMaxPpState(chooseMoveStruct->currentPp[gMoveSelectionCursor[battler]], gMovesInfo[gMoveSelectionCursor[battler]].pp); gPlttBufferUnfaded[BG_PLTT_ID(5) + 12] = palPtr[(var * 2) + 0]; gPlttBufferUnfaded[BG_PLTT_ID(5) + 11] = palPtr[(var * 2) + 1]; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 34c59ac4dac4..d5a8111cc432 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1254,7 +1254,7 @@ bool32 ProteanTryChangeType(u32 battler, u32 ability, u32 move, u32 moveType) bool32 IsMoveNotAllowedInSkyBattles(u32 move) { - return ((gBattleStruct->isSkyBattle) && (gBattleMoves[gCurrentMove].skyBattleBanned)); + return ((gBattleStruct->isSkyBattle) && (gMovesInfo[gCurrentMove].skyBattleBanned)); } static void Cmd_attackcanceler(void) @@ -1289,7 +1289,7 @@ static void Cmd_attackcanceler(void) if (AtkCanceller_UnableToUseMove(moveType)) return; - if (WEATHER_HAS_EFFECT && gBattleMoves[gCurrentMove].power) + if (WEATHER_HAS_EFFECT && gMovesInfo[gCurrentMove].power) { if (moveType == TYPE_FIRE && (gBattleWeather & B_WEATHER_RAIN_PRIMAL)) { @@ -1368,21 +1368,21 @@ static void Cmd_attackcanceler(void) gHitMarker |= HITMARKER_OBEYS; // Check if no available target present on the field or if Sky Battles ban the move if ((NoTargetPresent(gBattlerAttacker, gCurrentMove) - && (!gBattleMoves[gCurrentMove].twoTurnMove || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))) + && (!gMovesInfo[gCurrentMove].twoTurnMove || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))) || (IsMoveNotAllowedInSkyBattles(gCurrentMove))) { - if (gBattleMoves[gCurrentMove].effect == EFFECT_FLING) // Edge case for removing a mon's item when there is no target available after using Fling. + if (gMovesInfo[gCurrentMove].effect == EFFECT_FLING) // Edge case for removing a mon's item when there is no target available after using Fling. gBattlescriptCurrInstr = BattleScript_FlingFailConsumeItem; else gBattlescriptCurrInstr = BattleScript_FailedFromAtkString; - if (!gBattleMoves[gCurrentMove].twoTurnMove || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) + if (!gMovesInfo[gCurrentMove].twoTurnMove || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) CancelMultiTurnMoves(gBattlerAttacker); return; } if (gProtectStructs[gBattlerTarget].bounceMove - && gBattleMoves[gCurrentMove].magicCoatAffected + && gMovesInfo[gCurrentMove].magicCoatAffected && !gProtectStructs[gBattlerAttacker].usesBouncedMove) { gProtectStructs[gBattlerTarget].usesBouncedMove = TRUE; @@ -1403,7 +1403,7 @@ static void Cmd_attackcanceler(void) return; } else if (GetBattlerAbility(gBattlerTarget) == ABILITY_MAGIC_BOUNCE - && gBattleMoves[gCurrentMove].magicCoatAffected + && gMovesInfo[gCurrentMove].magicCoatAffected && !gProtectStructs[gBattlerAttacker].usesBouncedMove) { gProtectStructs[gBattlerTarget].usesBouncedMove = TRUE; @@ -1427,7 +1427,7 @@ static void Cmd_attackcanceler(void) for (i = 0; i < gBattlersCount; i++) { - if ((gProtectStructs[gBattlerByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].snatchAffected) + if ((gProtectStructs[gBattlerByTurnOrder[i]].stealMove) && gMovesInfo[gCurrentMove].snatchAffected) { gProtectStructs[gBattlerByTurnOrder[i]].stealMove = FALSE; gBattleScripting.battler = gBattlerByTurnOrder[i]; @@ -1455,8 +1455,8 @@ static void Cmd_attackcanceler(void) } else if (IsBattlerProtected(gBattlerTarget, gCurrentMove) && (gCurrentMove != MOVE_CURSE || IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GHOST)) - && ((!gBattleMoves[gCurrentMove].twoTurnMove || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))) - && gBattleMoves[gCurrentMove].effect != EFFECT_SUCKER_PUNCH) + && ((!gMovesInfo[gCurrentMove].twoTurnMove || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))) + && gMovesInfo[gCurrentMove].effect != EFFECT_SUCKER_PUNCH) { if (IsMoveMakingContact(gCurrentMove, gBattlerAttacker)) gProtectStructs[gBattlerAttacker].touchedProtectLike = TRUE; @@ -1536,7 +1536,7 @@ static bool8 JumpIfMoveAffectedByProtect(u16 move) static bool32 AccuracyCalcHelper(u16 move) { if ((gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && gDisableStructs[gBattlerTarget].battlerWithSureHit == gBattlerAttacker) - || (B_TOXIC_NEVER_MISS >= GEN_6 && gBattleMoves[move].effect == EFFECT_TOXIC && IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_POISON)) + || (B_TOXIC_NEVER_MISS >= GEN_6 && gMovesInfo[move].effect == EFFECT_TOXIC && IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_POISON)) || gStatuses4[gBattlerTarget] & STATUS4_GLAIVE_RUSH) { JumpIfMoveFailed(7, move); @@ -1559,7 +1559,7 @@ static bool32 AccuracyCalcHelper(u16 move) // If the target is under the effects of Telekinesis, and the move isn't a OH-KO move, move hits. else if (gStatuses3[gBattlerTarget] & STATUS3_TELEKINESIS && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE) - && gBattleMoves[move].effect != EFFECT_OHKO) + && gMovesInfo[move].effect != EFFECT_OHKO) { JumpIfMoveFailed(7, move); return TRUE; @@ -1572,9 +1572,9 @@ static bool32 AccuracyCalcHelper(u16 move) } if ((gStatuses3[gBattlerTarget] & STATUS3_PHANTOM_FORCE) - || ((gStatuses3[gBattlerTarget] & STATUS3_ON_AIR) && !(gBattleMoves[move].damagesAirborne || gBattleMoves[move].damagesAirborneDoubleDamage)) - || ((gStatuses3[gBattlerTarget] & STATUS3_UNDERGROUND) && !gBattleMoves[move].damagesUnderground) - || ((gStatuses3[gBattlerTarget] & STATUS3_UNDERWATER) && !gBattleMoves[move].damagesUnderwater)) + || ((gStatuses3[gBattlerTarget] & STATUS3_ON_AIR) && !(gMovesInfo[move].damagesAirborne || gMovesInfo[move].damagesAirborneDoubleDamage)) + || ((gStatuses3[gBattlerTarget] & STATUS3_UNDERGROUND) && !gMovesInfo[move].damagesUnderground) + || ((gStatuses3[gBattlerTarget] & STATUS3_UNDERWATER) && !gMovesInfo[move].damagesUnderwater)) { gMoveResultFlags |= MOVE_RESULT_MISSED; JumpIfMoveFailed(7, move); @@ -1583,14 +1583,14 @@ static bool32 AccuracyCalcHelper(u16 move) if (WEATHER_HAS_EFFECT) { - if ((gBattleMoves[move].effect == EFFECT_THUNDER || gBattleMoves[move].effect == EFFECT_RAIN_ALWAYS_HIT) + if ((gMovesInfo[move].effect == EFFECT_THUNDER || gMovesInfo[move].effect == EFFECT_RAIN_ALWAYS_HIT) && IsBattlerWeatherAffected(gBattlerTarget, B_WEATHER_RAIN)) { // thunder/hurricane/genie moves ignore acc checks in rain unless target is holding utility umbrella JumpIfMoveFailed(7, move); return TRUE; } - else if ((gBattleWeather & (B_WEATHER_HAIL | B_WEATHER_SNOW)) && gBattleMoves[move].effect == EFFECT_BLIZZARD) + else if ((gBattleWeather & (B_WEATHER_HAIL | B_WEATHER_SNOW)) && gMovesInfo[move].effect == EFFECT_BLIZZARD) { // Blizzard ignores acc checks in Hail in Gen4+ JumpIfMoveFailed(7, move); @@ -1600,13 +1600,13 @@ static bool32 AccuracyCalcHelper(u16 move) if (B_MINIMIZE_DMG_ACC >= GEN_6 && (gStatuses3[gBattlerTarget] & STATUS3_MINIMIZED) - && gBattleMoves[move].minimizeDoubleDamage) + && gMovesInfo[move].minimizeDoubleDamage) { JumpIfMoveFailed(7, move); return TRUE; } - if (gBattleMoves[move].accuracy == 0) + if (gMovesInfo[move].accuracy == 0) { JumpIfMoveFailed(7, move); return TRUE; @@ -1630,7 +1630,7 @@ u32 GetTotalAccuracy(u32 battlerAtk, u32 battlerDef, u32 move, u32 atkAbility, u if (atkAbility == ABILITY_UNAWARE || atkAbility == ABILITY_KEEN_EYE || atkAbility == ABILITY_MINDS_EYE || (B_ILLUMINATE_EFFECT >= GEN_9 && atkAbility == ABILITY_ILLUMINATE)) evasionStage = DEFAULT_STAT_STAGE; - if (gBattleMoves[move].ignoresTargetDefenseEvasionStages) + if (gMovesInfo[move].ignoresTargetDefenseEvasionStages) evasionStage = DEFAULT_STAT_STAGE; if (defAbility == ABILITY_UNAWARE) accStage = DEFAULT_STAT_STAGE; @@ -1645,9 +1645,9 @@ u32 GetTotalAccuracy(u32 battlerAtk, u32 battlerDef, u32 move, u32 atkAbility, u if (buff > MAX_STAT_STAGE) buff = MAX_STAT_STAGE; - moveAcc = gBattleMoves[move].accuracy; + moveAcc = gMovesInfo[move].accuracy; // Check Thunder and Hurricane on sunny weather. - if (IsBattlerWeatherAffected(battlerDef, B_WEATHER_SUN) && gBattleMoves[move].effect == EFFECT_THUNDER) + if (IsBattlerWeatherAffected(battlerDef, B_WEATHER_SUN) && gMovesInfo[move].effect == EFFECT_THUNDER) moveAcc = 50; // Check Wonder Skin. if (defAbility == ABILITY_WONDER_SKIN && IS_MOVE_STATUS(move) && moveAcc > 50) @@ -1760,7 +1760,7 @@ static void Cmd_accuracycheck(void) else if (gSpecialStatuses[gBattlerAttacker].parentalBondState == PARENTAL_BOND_2ND_HIT || (gSpecialStatuses[gBattlerAttacker].multiHitOn && (abilityAtk == ABILITY_SKILL_LINK || holdEffectAtk == HOLD_EFFECT_LOADED_DICE - || !(gBattleMoves[move].effect == EFFECT_TRIPLE_KICK || gBattleMoves[move].effect == EFFECT_POPULATION_BOMB)))) + || !(gMovesInfo[move].effect == EFFECT_TRIPLE_KICK || gMovesInfo[move].effect == EFFECT_POPULATION_BOMB)))) { // No acc checks for second hit of Parental Bond or multi hit moves, except Triple Kick/Triple Axel/Population Bomb gBattlescriptCurrInstr = cmd->nextInstr; @@ -1797,7 +1797,7 @@ static void Cmd_accuracycheck(void) else gBattleCommunication[MISS_TYPE] = B_MSG_MISSED; - if (gBattleMoves[move].power) + if (gMovesInfo[move].power) CalcTypeEffectivenessMultiplier(move, type, gBattlerAttacker, gBattlerTarget, abilityDef, TRUE); } JumpIfMoveFailed(7, move); @@ -1836,7 +1836,7 @@ static void Cmd_ppreduce(void) if (moveTarget == MOVE_TARGET_BOTH || moveTarget == MOVE_TARGET_FOES_AND_ALLY || moveTarget == MOVE_TARGET_ALL_BATTLERS - || gBattleMoves[gCurrentMove].forcePressure) + || gMovesInfo[gCurrentMove].forcePressure) { for (i = 0; i < gBattlersCount; i++) { @@ -1896,7 +1896,7 @@ s32 CalcCritChanceStageArgs(u32 battlerAtk, u32 battlerDef, u32 move, bool32 rec critChance = -1; } else if (gStatuses3[battlerAtk] & STATUS3_LASER_FOCUS - || gBattleMoves[gCurrentMove].alwaysCriticalHit + || gMovesInfo[gCurrentMove].alwaysCriticalHit || (abilityAtk == ABILITY_MERCILESS && gBattleMons[battlerDef].status1 & STATUS1_PSN_ANY)) { critChance = -2; @@ -1904,7 +1904,7 @@ s32 CalcCritChanceStageArgs(u32 battlerAtk, u32 battlerDef, u32 move, bool32 rec else { critChance = 2 * ((gBattleMons[battlerAtk].status2 & STATUS2_FOCUS_ENERGY) != 0) - + gBattleMoves[gCurrentMove].criticalHitStage + + gMovesInfo[gCurrentMove].criticalHitStage + (holdEffectAtk == HOLD_EFFECT_SCOPE_LENS) + 2 * (holdEffectAtk == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[battlerAtk].species == SPECIES_CHANSEY) + 2 * BENEFITS_FROM_LEEK(battlerAtk, holdEffectAtk) @@ -2048,7 +2048,7 @@ static void Cmd_adjustdamage(void) gSpecialStatuses[gBattlerTarget].affectionEndured = TRUE; } - if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE + if (gMovesInfo[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattlerTarget].endured && !gSpecialStatuses[gBattlerTarget].focusBanded && !gSpecialStatuses[gBattlerTarget].focusSashed @@ -2097,7 +2097,7 @@ static void Cmd_adjustdamage(void) if (gSpecialStatuses[gBattlerAttacker].gemBoost && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && gBattleMons[gBattlerAttacker].item - && gBattleMoves[gCurrentMove].effect != EFFECT_PLEDGE + && gMovesInfo[gCurrentMove].effect != EFFECT_PLEDGE && gCurrentMove != MOVE_STRUGGLE) { BattleScriptPushCursor(); @@ -2358,7 +2358,7 @@ static void Cmd_datahpupdate(void) // Note: While physicalDmg/specialDmg below are only distinguished between for Counter/Mirror Coat, they are // used in combination as general damage trackers for other purposes. specialDmg is additionally used // to help determine if a fire move should defrost the target. - if (IS_MOVE_PHYSICAL(gCurrentMove) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE) && gBattleMoves[gCurrentMove].effect != EFFECT_PAIN_SPLIT) + if (IS_MOVE_PHYSICAL(gCurrentMove) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE) && gMovesInfo[gCurrentMove].effect != EFFECT_PAIN_SPLIT) { gProtectStructs[battler].physicalDmg = gHpDealt; gSpecialStatuses[battler].physicalDmg = gHpDealt; @@ -2373,7 +2373,7 @@ static void Cmd_datahpupdate(void) gSpecialStatuses[battler].physicalBattlerId = gBattlerTarget; } } - else if (!IS_MOVE_PHYSICAL(gCurrentMove) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE) && gBattleMoves[gCurrentMove].effect != EFFECT_PAIN_SPLIT) + else if (!IS_MOVE_PHYSICAL(gCurrentMove) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE) && gMovesInfo[gCurrentMove].effect != EFFECT_PAIN_SPLIT) { // Record special damage/attacker for Mirror Coat gProtectStructs[battler].specialDmg = gHpDealt; @@ -3650,7 +3650,7 @@ void SetMoveEffect(bool32 primary, bool32 certain) case MOVE_EFFECT_REMOVE_ARG_TYPE: // This seems unnecessary but is done to make it work properly with Parental Bond BattleScriptPush(gBattlescriptCurrInstr + 1); - switch (gBattleMoves[gCurrentMove].argument) + switch (gMovesInfo[gCurrentMove].argument) { case TYPE_FIRE: // Burn Up gBattlescriptCurrInstr = BattleScript_RemoveFireType; @@ -3662,7 +3662,7 @@ void SetMoveEffect(bool32 primary, bool32 certain) gBattlescriptCurrInstr = BattleScript_RemoveGenericType; break; } - RemoveBattlerType(gEffectBattler, gBattleMoves[gCurrentMove].argument); + RemoveBattlerType(gEffectBattler, gMovesInfo[gCurrentMove].argument); break; case MOVE_EFFECT_ROUND: TryUpdateRoundTurnOrder(); // If another Pokémon uses Round before the user this turn, the user will use Round directly after it @@ -3822,17 +3822,17 @@ static void Cmd_setadditionaleffects(void) if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - if (gBattleMoves[gCurrentMove].numAdditionalEffects > gBattleStruct->additionalEffectsCounter) + if (gMovesInfo[gCurrentMove].numAdditionalEffects > gBattleStruct->additionalEffectsCounter) { u32 percentChance; u16 moveTarget = GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove); const u8 *currentPtr = gBattlescriptCurrInstr; - const struct AdditionalEffect *additionalEffect = &gBattleMoves[gCurrentMove].additionalEffects[gBattleStruct->additionalEffectsCounter]; + const struct AdditionalEffect *additionalEffect = &gMovesInfo[gCurrentMove].additionalEffects[gBattleStruct->additionalEffectsCounter]; // Check additional effect flags // self-targeting move effects cannot occur multiple times per turn // only occur on the last setmoveeffect when there are multiple targets - if (!(gBattleMoves[gCurrentMove].additionalEffects[gBattleStruct->additionalEffectsCounter].self + if (!(gMovesInfo[gCurrentMove].additionalEffects[gBattleStruct->additionalEffectsCounter].self && (moveTarget == MOVE_TARGET_BOTH || moveTarget == MOVE_TARGET_FOES_AND_ALLY) && GetNextTarget(moveTarget, TRUE) != MAX_BATTLERS_COUNT) && !(additionalEffect->onlyIfTargetRaisedStats && !gProtectStructs[gBattlerTarget].statRaised) @@ -3858,7 +3858,7 @@ static void Cmd_setadditionaleffects(void) // Call setadditionaleffects again in the case of a move with multiple effects gBattleStruct->additionalEffectsCounter++; - if (gBattleMoves[gCurrentMove].numAdditionalEffects > gBattleStruct->additionalEffectsCounter) + if (gMovesInfo[gCurrentMove].numAdditionalEffects > gBattleStruct->additionalEffectsCounter) gBattleScripting.moveEffect = MOVE_EFFECT_CONTINUE; else gBattleScripting.moveEffect = gBattleStruct->additionalEffectsCounter = 0; @@ -5463,7 +5463,7 @@ static void Cmd_moveend(void) && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget) && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED - && gBattleMoves[gCurrentMove].power != 0 + && gMovesInfo[gCurrentMove].power != 0 && CompareStat(gBattlerTarget, STAT_ATK, MAX_STAT_STAGE, CMP_LESS_THAN)) { SET_STATCHANGER(STAT_ATK, 1, FALSE); @@ -5490,7 +5490,7 @@ static void Cmd_moveend(void) if (gBattleMons[gBattlerTarget].status1 & STATUS1_FROSTBITE && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget - && gBattleMoves[originallyUsedMove].thawsUser + && gMovesInfo[originallyUsedMove].thawsUser && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { gBattleMons[gBattlerTarget].status1 &= ~STATUS1_FROSTBITE; @@ -5508,9 +5508,9 @@ static void Cmd_moveend(void) && IsBattlerAlive(gBattlerAttacker) && gBattleScripting.savedDmg != 0) // Some checks may be redundant alongside this one { - if (gBattleMoves[gCurrentMove].recoil > 0) + if (gMovesInfo[gCurrentMove].recoil > 0) { - gBattleMoveDamage = max(1, gBattleScripting.savedDmg * max(1, gBattleMoves[gCurrentMove].recoil) / 100); + gBattleMoveDamage = max(1, gBattleScripting.savedDmg * max(1, gMovesInfo[gCurrentMove].recoil) / 100); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_MoveEffectRecoil; effect = TRUE; @@ -5556,8 +5556,8 @@ static void Cmd_moveend(void) && gChosenMove != MOVE_STRUGGLE && (*choicedMoveAtk == MOVE_NONE || *choicedMoveAtk == MOVE_UNAVAILABLE)) { - if ((gBattleMoves[gChosenMove].effect == EFFECT_BATON_PASS - || gBattleMoves[gChosenMove].effect == EFFECT_HEALING_WISH) + if ((gMovesInfo[gChosenMove].effect == EFFECT_BATON_PASS + || gMovesInfo[gChosenMove].effect == EFFECT_HEALING_WISH) && !(gMoveResultFlags & MOVE_RESULT_FAILED)) { gBattleScripting.moveendState++; @@ -5617,15 +5617,15 @@ static void Cmd_moveend(void) } break; case MOVE_EFFECT_REMOVE_STATUS: // Smelling salts, Wake-Up Slap, Sparkling Aria - if ((gBattleMons[gBattlerTarget].status1 & gBattleMoves[gCurrentMove].argument) && IsBattlerAlive(gBattlerTarget)) + if ((gBattleMons[gBattlerTarget].status1 & gMovesInfo[gCurrentMove].argument) && IsBattlerAlive(gBattlerTarget)) { - gBattleMons[gBattlerTarget].status1 &= ~(gBattleMoves[gCurrentMove].argument); + gBattleMons[gBattlerTarget].status1 &= ~(gMovesInfo[gCurrentMove].argument); BtlController_EmitSetMonData(gBattlerTarget, 0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattlerTarget].status1); MarkBattlerForControllerExec(gBattlerTarget); effect = TRUE; BattleScriptPush(gBattlescriptCurrInstr); - switch (gBattleMoves[gCurrentMove].argument) + switch (gMovesInfo[gCurrentMove].argument) { case STATUS1_PARALYSIS: gBattlescriptCurrInstr = BattleScript_TargetPRLZHeal; @@ -5695,7 +5695,7 @@ static void Cmd_moveend(void) break; case MOVEEND_NUM_HITS: if (gBattlerAttacker != gBattlerTarget - && gBattleMoves[gCurrentMove].category != BATTLE_CATEGORY_STATUS + && gMovesInfo[gCurrentMove].category != BATTLE_CATEGORY_STATUS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED) { @@ -5745,7 +5745,7 @@ static void Cmd_moveend(void) gBattleStruct->lastMoveFailed &= ~(gBitTable[gBattlerAttacker]); // Set ShellTrap to activate after the attacker's turn if target was hit by a physical move. - if (gBattleMoves[gChosenMoveByBattler[gBattlerTarget]].effect == EFFECT_SHELL_TRAP + if (gMovesInfo[gChosenMoveByBattler[gBattlerTarget]].effect == EFFECT_SHELL_TRAP && gBattlerTarget != gBattlerAttacker && GetBattlerSide(gBattlerTarget) != GetBattlerSide(gBattlerAttacker) && gProtectStructs[gBattlerTarget].physicalDmg @@ -5780,8 +5780,8 @@ static void Cmd_moveend(void) } if (!(gAbsentBattlerFlags & gBitTable[gBattlerAttacker]) && !(gBattleStruct->absentBattlerFlags & gBitTable[gBattlerAttacker]) - && gBattleMoves[originallyUsedMove].effect != EFFECT_BATON_PASS - && gBattleMoves[originallyUsedMove].effect != EFFECT_HEALING_WISH) + && gMovesInfo[originallyUsedMove].effect != EFFECT_BATON_PASS + && gMovesInfo[originallyUsedMove].effect != EFFECT_HEALING_WISH) { if (gHitMarker & HITMARKER_OBEYS) { @@ -5823,7 +5823,7 @@ static void Cmd_moveend(void) case MOVEEND_MIRROR_MOVE: // mirror move if (!(gAbsentBattlerFlags & gBitTable[gBattlerAttacker]) && !(gBattleStruct->absentBattlerFlags & gBitTable[gBattlerAttacker]) - && !gBattleMoves[originallyUsedMove].mirrorMoveBanned + && !gMovesInfo[originallyUsedMove].mirrorMoveBanned && gHitMarker & HITMARKER_OBEYS && gBattlerAttacker != gBattlerTarget && !(gHitMarker & HITMARKER_FAINTED(gBattlerTarget)) @@ -5922,12 +5922,12 @@ static void Cmd_moveend(void) if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && !(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gMultiHitCounter - && !(gBattleMoves[gCurrentMove].effect == EFFECT_PRESENT && gBattleStruct->presentBasePower == 0)) // Silly edge case + && !(gMovesInfo[gCurrentMove].effect == EFFECT_PRESENT && gBattleStruct->presentBasePower == 0)) // Silly edge case { gBattleScripting.multihitString[4]++; if (--gMultiHitCounter == 0) { - if (gBattleMoves[gCurrentMove].argument == MOVE_EFFECT_SCALE_SHOT && !NoAliveMonsForEitherParty()) + if (gMovesInfo[gCurrentMove].argument == MOVE_EFFECT_SCALE_SHOT && !NoAliveMonsForEitherParty()) { BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_DefDownSpeedUp; @@ -5979,7 +5979,7 @@ static void Cmd_moveend(void) break; } case MOVEEND_EJECT_BUTTON: - if (gBattleMoves[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET + if (gMovesInfo[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET && IsBattlerAlive(gBattlerAttacker) && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove) && (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER || (gBattleTypeFlags & BATTLE_TYPE_TRAINER))) @@ -6000,7 +6000,7 @@ static void Cmd_moveend(void) { gBattleScripting.battler = battler; gLastUsedItem = gBattleMons[battler].item; - if (gBattleMoves[gCurrentMove].effect == EFFECT_HIT_ESCAPE) + if (gMovesInfo[gCurrentMove].effect == EFFECT_HIT_ESCAPE) gBattlescriptCurrInstr = BattleScript_MoveEnd; // Prevent user switch-in selection BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_EjectButtonActivates; @@ -6012,7 +6012,7 @@ static void Cmd_moveend(void) gBattleScripting.moveendState++; break; case MOVEEND_RED_CARD: - if ((gBattleMoves[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET || gBattleStruct->hitSwitchTargetFailed) + if ((gMovesInfo[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET || gBattleStruct->hitSwitchTargetFailed) && IsBattlerAlive(gBattlerAttacker) && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove) && GetBattlerAbility(gBattlerAttacker) != ABILITY_GUARD_DOG) @@ -6036,7 +6036,7 @@ static void Cmd_moveend(void) gLastUsedItem = gBattleMons[battler].item; gBattleStruct->savedBattlerTarget = gBattleScripting.battler = battler; // Battler with red card gEffectBattler = gBattlerAttacker; - if (gBattleMoves[gCurrentMove].effect == EFFECT_HIT_ESCAPE) + if (gMovesInfo[gCurrentMove].effect == EFFECT_HIT_ESCAPE) gBattlescriptCurrInstr = BattleScript_MoveEnd; // Prevent user switch-in selection BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_RedCardActivates; @@ -6118,7 +6118,7 @@ static void Cmd_moveend(void) gBattleScripting.moveendState++; break; case MOVEEND_DANCER: // Special case because it's so annoying - if (gBattleMoves[gCurrentMove].danceMove) + if (gMovesInfo[gCurrentMove].danceMove) { u8 battler, nextDancer = 0; @@ -6352,7 +6352,7 @@ static void Cmd_switchindataupdate(void) gBattleMons[battler].item = ITEM_NONE; } - if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) + if (gMovesInfo[gCurrentMove].effect == EFFECT_BATON_PASS) { for (i = 0; i < NUM_BATTLE_STATS; i++) { @@ -7041,7 +7041,7 @@ static void Cmd_switchineffects(void) && GetBattlerAbility(battler) != ABILITY_MAGIC_GUARD) { gDisableStructs[battler].stealthRockDone = TRUE; - gBattleMoveDamage = GetStealthHazardDamage(gBattleMoves[MOVE_STEALTH_ROCK].type, battler); + gBattleMoveDamage = GetStealthHazardDamage(gMovesInfo[MOVE_STEALTH_ROCK].type, battler); if (gBattleMoveDamage != 0) SetDmgHazardsBattlescript(battler, B_MSG_STEALTHROCKDMG); @@ -7098,7 +7098,7 @@ static void Cmd_switchineffects(void) && GetBattlerAbility(battler) != ABILITY_MAGIC_GUARD) { gDisableStructs[battler].steelSurgeDone = TRUE; - gBattleMoveDamage = GetStealthHazardDamage(gBattleMoves[MOVE_G_MAX_STEELSURGE].type, battler); + gBattleMoveDamage = GetStealthHazardDamage(gMovesInfo[MOVE_G_MAX_STEELSURGE].type, battler); if (gBattleMoveDamage != 0) SetDmgHazardsBattlescript(battler, B_MSG_SHARPSTEELDMG); @@ -7849,7 +7849,7 @@ static void Cmd_removeitem(void) // Popped Air Balloon cannot be restored by any means. // Corroded items cannot be restored either. if (GetBattlerHoldEffect(battler, TRUE) != HOLD_EFFECT_AIR_BALLOON - && gBattleMoves[gCurrentMove].effect != EFFECT_CORROSIVE_GAS) + && gMovesInfo[gCurrentMove].effect != EFFECT_CORROSIVE_GAS) gBattleStruct->usedHeldItems[gBattlerPartyIndexes[battler]][GetBattlerSide(battler)] = itemId; // Remember if switched out gBattleMons[battler].item = ITEM_NONE; @@ -8277,7 +8277,7 @@ static void Cmd_useitemonopponent(void) static bool32 HasAttackerFaintedTarget(void) { if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) - && gBattleMoves[gCurrentMove].power != 0 + && gMovesInfo[gCurrentMove].power != 0 && (gLastHitBy[gBattlerTarget] == 0xFF || gLastHitBy[gBattlerTarget] == gBattlerAttacker) && gBattleStruct->moveTarget[gBattlerAttacker] == gBattlerTarget && gBattlerTarget != gBattlerAttacker @@ -8459,11 +8459,11 @@ static bool32 IsElectricAbilityAffected(u32 ability) u32 moveType; if (gBattleStruct->dynamicMoveType == 0) - moveType = gBattleMoves[gCurrentMove].type; + moveType = gMovesInfo[gCurrentMove].type; else if (!(gBattleStruct->dynamicMoveType & F_DYNAMIC_TYPE_IGNORE_PHYSICALITY)) moveType = gBattleStruct->dynamicMoveType & DYNAMIC_TYPE_MASK; else - moveType = gBattleMoves[gCurrentMove].type; + moveType = gMovesInfo[gCurrentMove].type; if (moveType == TYPE_ELECTRIC && GetBattlerAbility(gBattlerTarget) == ability) return TRUE; @@ -9359,7 +9359,7 @@ static void Cmd_various(void) case VARIOUS_TRY_ACTIVATE_FELL_STINGER: { VARIOUS_ARGS(); - if (gBattleMoves[gCurrentMove].effect == EFFECT_FELL_STINGER + if (gMovesInfo[gCurrentMove].effect == EFFECT_FELL_STINGER && HasAttackerFaintedTarget() && !NoAliveMonsForEitherParty() && CompareStat(gBattlerAttacker, STAT_ATK, MAX_STAT_STAGE, CMP_LESS_THAN)) @@ -9498,7 +9498,7 @@ static void Cmd_various(void) { VARIOUS_ARGS(const u8 *failInstr); u16 move = gBattleMons[gBattlerTarget].moves[gBattleStruct->chosenMovePositions[gBattlerTarget]]; - if (IS_MOVE_STATUS(move) || gBattleMoves[move].meFirstBanned + if (IS_MOVE_STATUS(move) || gMovesInfo[move].meFirstBanned || GetBattlerTurnOrderNum(gBattlerAttacker) > GetBattlerTurnOrderNum(gBattlerTarget)) gBattlescriptCurrInstr = cmd->failInstr; else @@ -9537,15 +9537,15 @@ static void Cmd_various(void) case VARIOUS_TRY_SOAK: { VARIOUS_ARGS(const u8 *failInstr); - if (GetBattlerType(gBattlerTarget, 0) == gBattleMoves[gCurrentMove].type - && GetBattlerType(gBattlerTarget, 1) == gBattleMoves[gCurrentMove].type) + if (GetBattlerType(gBattlerTarget, 0) == gMovesInfo[gCurrentMove].type + && GetBattlerType(gBattlerTarget, 1) == gMovesInfo[gCurrentMove].type) { gBattlescriptCurrInstr = cmd->failInstr; } else { - SET_BATTLER_TYPE(gBattlerTarget, gBattleMoves[gCurrentMove].type); - PREPARE_TYPE_BUFFER(gBattleTextBuff1, gBattleMoves[gCurrentMove].type); + SET_BATTLER_TYPE(gBattlerTarget, gMovesInfo[gCurrentMove].type); + PREPARE_TYPE_BUFFER(gBattleTextBuff1, gMovesInfo[gCurrentMove].type); gBattlescriptCurrInstr = cmd->nextInstr; } return; @@ -9593,7 +9593,7 @@ static void Cmd_various(void) case VARIOUS_SET_ARG_TO_BATTLE_DAMAGE: { VARIOUS_ARGS(); - gBattleMoveDamage = gBattleMoves[gCurrentMove].argument; + gBattleMoveDamage = gMovesInfo[gCurrentMove].argument; break; } case VARIOUS_TRY_HIT_SWITCH_TARGET: @@ -9633,7 +9633,7 @@ static void Cmd_various(void) VARIOUS_ARGS(const u8 *failInstr); u16 move = gLastPrintedMoves[gBattlerTarget]; if (move == MOVE_NONE || move == MOVE_UNAVAILABLE || MoveHasMoveEffectSelf(move, MOVE_EFFECT_RECHARGE) - || gBattleMoves[move].instructBanned || gBattleMoves[move].twoTurnMove || IsDynamaxed(gBattlerTarget)) + || gMovesInfo[move].instructBanned || gMovesInfo[move].twoTurnMove || IsDynamaxed(gBattlerTarget)) { gBattlescriptCurrInstr = cmd->failInstr; } @@ -9869,14 +9869,14 @@ static void Cmd_various(void) case VARIOUS_TRY_THIRD_TYPE: { VARIOUS_ARGS(const u8 *failInstr); - if (IS_BATTLER_OF_TYPE(battler, gBattleMoves[gCurrentMove].argument)) + if (IS_BATTLER_OF_TYPE(battler, gMovesInfo[gCurrentMove].argument)) { gBattlescriptCurrInstr = cmd->failInstr; } else { - gBattleMons[battler].type3 = gBattleMoves[gCurrentMove].argument; - PREPARE_TYPE_BUFFER(gBattleTextBuff1, gBattleMoves[gCurrentMove].argument); + gBattleMons[battler].type3 = gMovesInfo[gCurrentMove].argument; + PREPARE_TYPE_BUFFER(gBattleTextBuff1, gMovesInfo[gCurrentMove].argument); gBattlescriptCurrInstr = cmd->nextInstr; } return; @@ -10327,7 +10327,7 @@ static void Cmd_various(void) targetDefStat *= gStatStageRatios[statStage][0]; targetDefStat /= gStatStageRatios[statStage][1]; - physical = ((((2 * gBattleMons[gBattlerAttacker].level / 5 + 2) * gBattleMoves[gCurrentMove].power * attackerAtkStat) / targetDefStat) / 50); + physical = ((((2 * gBattleMons[gBattlerAttacker].level / 5 + 2) * gMovesInfo[gCurrentMove].power * attackerAtkStat) / targetDefStat) / 50); statStage = gBattleMons[gBattlerAttacker].statStages[STAT_SPATK]; attackerSpAtkStat *= gStatStageRatios[statStage][0]; @@ -10337,7 +10337,7 @@ static void Cmd_various(void) targetSpDefStat *= gStatStageRatios[statStage][0]; targetSpDefStat /= gStatStageRatios[statStage][1]; - special = ((((2 * gBattleMons[gBattlerAttacker].level / 5 + 2) * gBattleMoves[gCurrentMove].power * attackerSpAtkStat) / targetSpDefStat) / 50); + special = ((((2 * gBattleMons[gBattlerAttacker].level / 5 + 2) * gMovesInfo[gCurrentMove].power * attackerSpAtkStat) / targetSpDefStat) / 50); if (((physical > special) || (physical == special && (Random() % 2) == 0))) gBattleStruct->swapDamageCategory = TRUE; @@ -10713,7 +10713,7 @@ static void TryResetProtectUseCounter(u32 battler) { u32 lastMove = gLastResultingMoves[battler]; if (lastMove == MOVE_UNAVAILABLE - || (!gBattleMoves[lastMove].protectionMove && (B_ALLY_SWITCH_FAIL_CHANCE >= GEN_9 && gBattleMoves[lastMove].effect != EFFECT_ALLY_SWITCH))) + || (!gMovesInfo[lastMove].protectionMove && (B_ALLY_SWITCH_FAIL_CHANCE >= GEN_9 && gMovesInfo[lastMove].effect != EFFECT_ALLY_SWITCH))) gDisableStructs[battler].protectUses = 0; } @@ -10732,9 +10732,9 @@ static void Cmd_setprotectlike(void) || (gCurrentMove == MOVE_WIDE_GUARD && B_WIDE_GUARD != GEN_5) || (gCurrentMove == MOVE_QUICK_GUARD && B_QUICK_GUARD != GEN_5)) { - if (!gBattleMoves[gCurrentMove].argument) // Protects one mon only. + if (!gMovesInfo[gCurrentMove].argument) // Protects one mon only. { - if (gBattleMoves[gCurrentMove].effect == EFFECT_ENDURE) + if (gMovesInfo[gCurrentMove].effect == EFFECT_ENDURE) { gProtectStructs[gBattlerAttacker].endured = TRUE; gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_BRACED_ITSELF; @@ -11262,8 +11262,8 @@ static void Cmd_setdrainedhp(void) { CMD_ARGS(); - if (gBattleMoves[gCurrentMove].argument != 0) - gBattleMoveDamage = (gHpDealt * gBattleMoves[gCurrentMove].argument / 100); + if (gMovesInfo[gCurrentMove].argument != 0) + gBattleMoveDamage = (gHpDealt * gMovesInfo[gCurrentMove].argument / 100); else gBattleMoveDamage = (gHpDealt / 2); @@ -11923,7 +11923,7 @@ static void Cmd_tryconversiontypechange(void) { if (gBattleMons[gBattlerAttacker].moves[moveChecked] != MOVE_NONE) { - moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[moveChecked]].type; + moveType = gMovesInfo[gBattleMons[gBattlerAttacker].moves[moveChecked]].type; break; } } @@ -11951,7 +11951,7 @@ static void Cmd_tryconversiontypechange(void) for (moveChecked = 0; moveChecked < validMoves; moveChecked++) { - moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[moveChecked]].type; + moveType = gMovesInfo[gBattleMons[gBattlerAttacker].moves[moveChecked]].type; if (moveType == TYPE_MYSTERY) { @@ -11978,7 +11978,7 @@ static void Cmd_tryconversiontypechange(void) { while ((moveChecked = MOD(Random(), MAX_MON_MOVES)) >= validMoves); - moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[moveChecked]].type; + moveType = gMovesInfo[gBattleMons[gBattlerAttacker].moves[moveChecked]].type; if (moveType == TYPE_MYSTERY) { @@ -12094,7 +12094,7 @@ static void Cmd_tryKO(void) } else { - u16 odds = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattlerAttacker].level - gBattleMons[gBattlerTarget].level); + u16 odds = gMovesInfo[gCurrentMove].accuracy + (gBattleMons[gBattlerAttacker].level - gBattleMons[gBattlerTarget].level); if (B_SHEER_COLD_ACC >= GEN_7 && gCurrentMove == MOVE_SHEER_COLD && !IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_ICE)) odds -= 10; if (RandomPercentage(RNG_ACCURACY, odds) && gBattleMons[gBattlerAttacker].level >= gBattleMons[gBattlerTarget].level) @@ -12374,8 +12374,8 @@ static void Cmd_transformdataexecution(void) gBattleStruct->overwrittenAbilities[gBattlerAttacker] = GetBattlerAbility(gBattlerTarget); for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].pp < 5) - gBattleMons[gBattlerAttacker].pp[i] = gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].pp; + if (gMovesInfo[gBattleMons[gBattlerAttacker].moves[i]].pp < 5) + gBattleMons[gBattlerAttacker].pp[i] = gMovesInfo[gBattleMons[gBattlerAttacker].moves[i]].pp; else gBattleMons[gBattlerAttacker].pp[i] = 5; } @@ -12394,7 +12394,7 @@ static void Cmd_setsubstitute(void) { CMD_ARGS(); - u32 factor = gBattleMoves[gCurrentMove].effect == EFFECT_SHED_TAIL ? 2 : 4; + u32 factor = gMovesInfo[gCurrentMove].effect == EFFECT_SHED_TAIL ? 2 : 4; u32 hp = GetNonDynamaxMaxHP(gBattlerAttacker) / factor; if (GetNonDynamaxMaxHP(gBattlerAttacker) / factor == 0) @@ -12425,7 +12425,7 @@ static void Cmd_mimicattackcopy(void) { CMD_ARGS(const u8 *failInstr); - if ((gBattleMoves[gLastMoves[gBattlerTarget]].mimicBanned) + if ((gMovesInfo[gLastMoves[gBattlerTarget]].mimicBanned) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) || gLastMoves[gBattlerTarget] == MOVE_NONE || gLastMoves[gBattlerTarget] == MOVE_UNAVAILABLE) @@ -12446,8 +12446,8 @@ static void Cmd_mimicattackcopy(void) { gChosenMove = 0xFFFF; gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastMoves[gBattlerTarget]; - if (gBattleMoves[gLastMoves[gBattlerTarget]].pp < 5) - gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBattlerTarget]].pp; + if (gMovesInfo[gLastMoves[gBattlerTarget]].pp < 5) + gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gMovesInfo[gLastMoves[gBattlerTarget]].pp; else gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 5; @@ -12465,8 +12465,8 @@ static void Cmd_mimicattackcopy(void) static bool32 InvalidMetronomeMove(u32 move) { - return gBattleMoves[move].effect == EFFECT_PLACEHOLDER - || gBattleMoves[move].metronomeBanned; + return gMovesInfo[move].effect == EFFECT_PLACEHOLDER + || gMovesInfo[move].metronomeBanned; } static void Cmd_metronome(void) @@ -12624,7 +12624,7 @@ static void Cmd_trysetencore(void) } } - if ((gBattleMoves[gLastMoves[gBattlerTarget]].encoreBanned) + if ((gMovesInfo[gLastMoves[gBattlerTarget]].encoreBanned) || gLastMoves[gBattlerTarget] == MOVE_NONE || gLastMoves[gBattlerTarget] == MOVE_UNAVAILABLE) { @@ -12681,7 +12681,7 @@ static void Cmd_settypetorandomresistance(void) { gBattlescriptCurrInstr = cmd->failInstr; } - else if (gBattleMoves[gLastLandedMoves[gBattlerAttacker]].twoTurnMove + else if (gMovesInfo[gLastLandedMoves[gBattlerAttacker]].twoTurnMove && gBattleMons[gLastHitBy[gBattlerAttacker]].status2 & STATUS2_MULTIPLETURNS) { gBattlescriptCurrInstr = cmd->failInstr; @@ -12744,7 +12744,7 @@ static void Cmd_copymovepermanently(void) if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) && gLastPrintedMoves[gBattlerTarget] != MOVE_UNAVAILABLE - && !gBattleMoves[gLastPrintedMoves[gBattlerTarget]].sketchBanned) + && !gMovesInfo[gLastPrintedMoves[gBattlerTarget]].sketchBanned) { s32 i; @@ -12765,7 +12765,7 @@ static void Cmd_copymovepermanently(void) struct MovePpInfo movePpData; gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBattlerTarget]; - gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBattlerTarget]].pp; + gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gMovesInfo[gLastPrintedMoves[gBattlerTarget]].pp; for (i = 0; i < MAX_MON_MOVES; i++) { @@ -12796,8 +12796,8 @@ static void Cmd_trychoosesleeptalkmove(void) for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].sleepTalkBanned - || gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].twoTurnMove) + if (gMovesInfo[gBattleMons[gBattlerAttacker].moves[i]].sleepTalkBanned + || gMovesInfo[gBattleMons[gBattlerAttacker].moves[i]].twoTurnMove) { unusableMovesBits |= gBitTable[i]; } @@ -12903,7 +12903,7 @@ static void Cmd_tryspiteppreduce(void) { s32 ppToDeduct = B_PP_REDUCED_BY_SPITE >= GEN_4 ? 4 : (Random() & 3) + 2; // G-Max Depletion only deducts 2 PP. - if (IsMaxMove(gCurrentMove) && gBattleMoves[gCurrentMove].argument == MAX_EFFECT_SPITE) + if (IsMaxMove(gCurrentMove) && gMovesInfo[gCurrentMove].argument == MAX_EFFECT_SPITE) ppToDeduct = 2; if (gBattleMons[gBattlerTarget].pp[i] < ppToDeduct) @@ -13333,7 +13333,7 @@ static void Cmd_jumpifnopursuitswitchdmg(void) && !(gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE)) && gBattleMons[gBattlerAttacker].hp && !gDisableStructs[gBattlerTarget].truantCounter - && gBattleMoves[gChosenMoveByBattler[gBattlerTarget]].effect == EFFECT_PURSUIT) + && gMovesInfo[gChosenMoveByBattler[gBattlerTarget]].effect == EFFECT_PURSUIT) { s32 i; @@ -13609,7 +13609,7 @@ static void Cmd_trydobeatup(void) gBattlescriptCurrInstr = cmd->nextInstr; gBattleMoveDamage = gSpeciesInfo[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack; - gBattleMoveDamage *= gBattleMoves[gCurrentMove].power; + gBattleMoveDamage *= gMovesInfo[gCurrentMove].power; gBattleMoveDamage *= (GetMonData(&party[gBattleCommunication[0]], MON_DATA_LEVEL) * 2 / 5 + 2); gBattleMoveDamage /= gSpeciesInfo[gBattleMons[gBattlerTarget].species].baseDefense; gBattleMoveDamage = (gBattleMoveDamage / 50) + 2; @@ -13725,7 +13725,7 @@ static void Cmd_setforcedtarget(void) gSideTimers[GetBattlerSide(gBattlerTarget)].followmeTimer = 1; gSideTimers[GetBattlerSide(gBattlerTarget)].followmeTarget = gBattlerTarget; - gSideTimers[GetBattlerSide(gBattlerTarget)].followmePowder = gBattleMoves[gCurrentMove].powderMove; + gSideTimers[GetBattlerSide(gBattlerTarget)].followmePowder = gMovesInfo[gCurrentMove].powderMove; gBattlescriptCurrInstr = cmd->nextInstr; } @@ -14143,7 +14143,7 @@ static void Cmd_setroom(void) { CMD_ARGS(); - switch (gBattleMoves[gCurrentMove].effect) + switch (gMovesInfo[gCurrentMove].effect) { case EFFECT_TRICK_ROOM: HandleRoomMove(STATUS_FIELD_TRICK_ROOM, &gFieldTimers.trickRoomTimer, 0); @@ -14306,7 +14306,7 @@ static void Cmd_assistattackselect(void) { u16 move = GetMonData(&party[monId], MON_DATA_MOVE1 + moveId); - if (gBattleMoves[move].assistBanned) + if (gMovesInfo[move].assistBanned) continue; validMoves[chooseableMovesNo++] = move; @@ -14423,7 +14423,7 @@ static void Cmd_jumpifnotcurrentmoveargtype(void) u8 battler = GetBattlerForBattleScript(cmd->battler); const u8 *failInstr = cmd->failInstr; - if (!IS_BATTLER_OF_TYPE(battler, gBattleMoves[gCurrentMove].argument)) + if (!IS_BATTLER_OF_TYPE(battler, gMovesInfo[gCurrentMove].argument)) gBattlescriptCurrInstr = failInstr; else gBattlescriptCurrInstr = cmd->nextInstr; @@ -14518,7 +14518,7 @@ static void Cmd_settypebasedhalvers(void) bool8 worked = FALSE; - if (gBattleMoves[gCurrentMove].effect == EFFECT_MUD_SPORT) + if (gMovesInfo[gCurrentMove].effect == EFFECT_MUD_SPORT) { if (B_SPORT_TURNS >= GEN_6) { @@ -14573,7 +14573,7 @@ bool32 DoesSubstituteBlockMove(u32 battlerAtk, u32 battlerDef, u32 move) { if (!(gBattleMons[battlerDef].status2 & STATUS2_SUBSTITUTE)) return FALSE; - else if (gBattleMoves[move].ignoresSubstitute) + else if (gMovesInfo[move].ignoresSubstitute) return FALSE; else if (GetBattlerAbility(battlerAtk) == ABILITY_INFILTRATOR) return FALSE; @@ -14681,7 +14681,7 @@ static void Cmd_pursuitdoubles(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBattlerFlags & gBitTable[battler]) && gChosenActionByBattler[battler] == B_ACTION_USE_MOVE - && gBattleMoves[gChosenMoveByBattler[battler]].effect == EFFECT_PURSUIT) + && gMovesInfo[gChosenMoveByBattler[battler]].effect == EFFECT_PURSUIT) { gActionsByTurnOrder[battler] = B_ACTION_TRY_FINISH; gCurrentMove = gChosenMoveByBattler[battler]; @@ -15612,9 +15612,9 @@ static bool32 CriticalCapture(u32 odds) bool32 IsMoveAffectedByParentalBond(u32 move, u32 battler) { if (move != MOVE_NONE && move != MOVE_UNAVAILABLE && move != MOVE_STRUGGLE - && !gBattleMoves[move].parentalBondBanned - && gBattleMoves[move].category != BATTLE_CATEGORY_STATUS - && gBattleMoves[move].strikeCount < 2) + && !gMovesInfo[move].parentalBondBanned + && gMovesInfo[move].category != BATTLE_CATEGORY_STATUS + && gMovesInfo[move].strikeCount < 2) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { @@ -15642,7 +15642,7 @@ bool32 IsMoveAffectedByParentalBond(u32 move, u32 battler) static bool8 IsFinalStrikeEffect(u16 move) { u32 i; - u16 moveEffect = gBattleMoves[move].effect; + u16 moveEffect = gMovesInfo[move].effect; for (i = 0; i < ARRAY_COUNT(sFinalStrikeOnlyEffects); i++) { @@ -15677,9 +15677,9 @@ static bool8 CanBurnHitThaw(u16 move) if (B_BURN_HIT_THAW >= GEN_6) { - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { - if (gBattleMoves[move].additionalEffects[i].moveEffect == MOVE_EFFECT_BURN) + if (gMovesInfo[move].additionalEffects[i].moveEffect == MOVE_EFFECT_BURN) return TRUE; } } @@ -16132,7 +16132,7 @@ void BS_JumpIfArgument(void) { NATIVE_ARGS(u8 argument, const u8 *jumpInstr); - if (gBattleMoves[gCurrentMove].argument == cmd->argument) + if (gMovesInfo[gCurrentMove].argument == cmd->argument) gBattlescriptCurrInstr = cmd->jumpInstr; else gBattlescriptCurrInstr = cmd->nextInstr; @@ -16143,7 +16143,7 @@ void BS_SetRemoveTerrain(void) NATIVE_ARGS(const u8 *jumpInstr); u32 statusFlag = 0; - switch (gBattleMoves[gCurrentMove].effect) + switch (gMovesInfo[gCurrentMove].effect) { case EFFECT_MISTY_TERRAIN: statusFlag = STATUS_FIELD_MISTY_TERRAIN; @@ -16162,7 +16162,7 @@ void BS_SetRemoveTerrain(void) gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TERRAIN_SET_PSYCHIC; break; case EFFECT_HIT_SET_REMOVE_TERRAIN: - switch (gBattleMoves[gCurrentMove].argument) + switch (gMovesInfo[gCurrentMove].argument) { case ARG_SET_PSYCHIC_TERRAIN: // Genesis Supernova statusFlag = STATUS_FIELD_PSYCHIC_TERRAIN; @@ -16344,7 +16344,7 @@ void BS_SetPledge(void) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE && IsBattlerAlive(partner) && gCurrentMove != partnerMove - && gBattleMoves[partnerMove].effect == EFFECT_PLEDGE) + && gMovesInfo[partnerMove].effect == EFFECT_PLEDGE) { u32 currPledgeUser = 0; u32 newTurnOrder[] = {0xFF, 0xFF}; @@ -16471,9 +16471,9 @@ void BS_TryHealPulse(void) } else { - if (GetBattlerAbility(gBattlerAttacker) == ABILITY_MEGA_LAUNCHER && gBattleMoves[gCurrentMove].pulseMove) + if (GetBattlerAbility(gBattlerAttacker) == ABILITY_MEGA_LAUNCHER && gMovesInfo[gCurrentMove].pulseMove) gBattleMoveDamage = -(GetNonDynamaxMaxHP(gBattlerTarget) * 75 / 100); - else if (gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN && gBattleMoves[gCurrentMove].argument == MOVE_EFFECT_FLORAL_HEALING) + else if (gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN && gMovesInfo[gCurrentMove].argument == MOVE_EFFECT_FLORAL_HEALING) gBattleMoveDamage = -(GetNonDynamaxMaxHP(gBattlerTarget) * 2 / 3); else gBattleMoveDamage = -(GetNonDynamaxMaxHP(gBattlerTarget) / 2); @@ -16488,7 +16488,7 @@ void BS_TryCopycat(void) { NATIVE_ARGS(const u8 *failInstr); - if (gLastUsedMove == MOVE_NONE || gLastUsedMove == MOVE_UNAVAILABLE || gBattleMoves[gLastUsedMove].copycatBanned) + if (gLastUsedMove == MOVE_NONE || gLastUsedMove == MOVE_UNAVAILABLE || gMovesInfo[gLastUsedMove].copycatBanned) { gBattlescriptCurrInstr = cmd->failInstr; } diff --git a/src/battle_tower.c b/src/battle_tower.c index c18e7d8d26e2..a3916dba3331 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1708,7 +1708,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) for (j = 0; j < MAX_MON_MOVES; j++) { SetMonMoveSlot(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monId].moves[j], j); - if (gBattleMoves[gFacilityTrainerMons[monId].moves[j]].effect == EFFECT_FRUSTRATION) + if (gMovesInfo[gFacilityTrainerMons[monId].moves[j]].effect == EFFECT_FRUSTRATION) friendship = 0; // Frustration is more powerful the lower the pokemon's friendship is. } @@ -1746,7 +1746,7 @@ static void UNUSED Unused_CreateApprenticeMons(u16 trainerId, u8 firstMonId) friendship = MAX_FRIENDSHIP; for (j = 0; j < MAX_MON_MOVES; j++) { - if (gBattleMoves[apprentice->party[i].moves[j]].effect == EFFECT_FRUSTRATION) + if (gMovesInfo[apprentice->party[i].moves[j]].effect == EFFECT_FRUSTRATION) friendship = 0; } SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_FRIENDSHIP, &friendship); @@ -1874,7 +1874,7 @@ static void FillFactoryTentTrainerParty(u16 trainerId, u8 firstMonId) for (j = 0; j < MAX_MON_MOVES; j++) { SetMonMoveAvoidReturn(&gEnemyParty[firstMonId + i], gFacilityTrainerMons[monId].moves[j], j); - if (gBattleMoves[gFacilityTrainerMons[monId].moves[j]].effect == EFFECT_FRUSTRATION) + if (gMovesInfo[gFacilityTrainerMons[monId].moves[j]].effect == EFFECT_FRUSTRATION) friendship = 0; } @@ -3069,7 +3069,7 @@ static void FillPartnerParty(u16 trainerId) for (j = 0; j < MAX_MON_MOVES; j++) { SetMonMoveSlot(&gPlayerParty[MULTI_PARTY_SIZE + i], gFacilityTrainerMons[monId].moves[j], j); - if (gBattleMoves[gFacilityTrainerMons[monId].moves[j]].effect == EFFECT_FRUSTRATION) + if (gMovesInfo[gFacilityTrainerMons[monId].moves[j]].effect == EFFECT_FRUSTRATION) friendship = 0; } SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_FRIENDSHIP, &friendship); @@ -3504,7 +3504,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) for (j = 0; j < MAX_MON_MOVES; j++) { SetMonMoveSlot(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monId].moves[j], j); - if (gBattleMoves[gFacilityTrainerMons[monId].moves[j]].effect == EFFECT_FRUSTRATION) + if (gMovesInfo[gFacilityTrainerMons[monId].moves[j]].effect == EFFECT_FRUSTRATION) friendship = 0; // Frustration is more powerful the lower the pokemon's friendship is. } diff --git a/src/battle_tv.c b/src/battle_tv.c index c0e976dfc978..cb70d1deedd4 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -783,7 +783,7 @@ void BattleTv_SetDataBasedOnMove(u16 move, u16 weatherFlags, struct DisableStruc tvPtr->side[atkSide].wishMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; tvPtr->side[atkSide].wishMoveSlot = moveSlot; } - if (gBattleMoves[move].effect == EFFECT_EXPLOSION) + if (gMovesInfo[move].effect == EFFECT_EXPLOSION) { tvPtr->side[atkSide ^ BIT_SIDE].explosionMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; tvPtr->side[atkSide ^ BIT_SIDE].explosionMoveSlot = moveSlot; @@ -791,8 +791,8 @@ void BattleTv_SetDataBasedOnMove(u16 move, u16 weatherFlags, struct DisableStruc tvPtr->side[atkSide ^ BIT_SIDE].explosion = TRUE; } - AddMovePoints(PTS_REFLECT, move, gBattleMoves[move].power, 0); - AddMovePoints(PTS_LIGHT_SCREEN, move, gBattleMoves[move].power, 0); + AddMovePoints(PTS_REFLECT, move, gMovesInfo[move].power, 0); + AddMovePoints(PTS_LIGHT_SCREEN, move, gMovesInfo[move].power, 0); AddMovePoints(PTS_WATER_SPORT, move, 0, 0); AddMovePoints(PTS_MUD_SPORT, move, 0, 0); } @@ -937,10 +937,10 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) { case PTS_MOVE_EFFECT: // arg1 -> move slot, arg2 -> move { - u8 baseFromEffect = gBattleMoveEffects[gBattleMoves[arg2].effect].battleTvScore; + u8 baseFromEffect = gBattleMoveEffects[gMovesInfo[arg2].effect].battleTvScore; // Various cases to add/remove points - if (gBattleMoves[arg2].recoil > 0) + if (gMovesInfo[arg2].recoil > 0) baseFromEffect++; // Recoil moves if (MoveHasMoveEffect(arg2, MOVE_EFFECT_RAPIDSPIN)) baseFromEffect++; @@ -1015,7 +1015,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) #define power arg2 case PTS_WATER_SPORT: // If used fire move during Water Sport - if (tvPtr->pos[defSide][0].waterSportMonId != -(tvPtr->pos[defSide][1].waterSportMonId) && gBattleMoves[move].type == TYPE_FIRE) + if (tvPtr->pos[defSide][0].waterSportMonId != -(tvPtr->pos[defSide][1].waterSportMonId) && gMovesInfo[move].type == TYPE_FIRE) { if (tvPtr->pos[defSide][0].waterSportMonId != 0) { @@ -1031,7 +1031,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) break; case PTS_MUD_SPORT: // If used Electric move during Mud Sport - if (tvPtr->pos[defSide][0].mudSportMonId != -(tvPtr->pos[defSide][1].mudSportMonId) && gBattleMoves[move].type == TYPE_ELECTRIC) + if (tvPtr->pos[defSide][0].mudSportMonId != -(tvPtr->pos[defSide][1].mudSportMonId) && gMovesInfo[move].type == TYPE_ELECTRIC) { if (tvPtr->pos[defSide][0].mudSportMonId != 0) { @@ -1259,7 +1259,7 @@ static void TrySetBattleSeminarShow(void) powerOverride = 0; if (ShouldCalculateDamage(gCurrentMove, &dmgByMove[i], &powerOverride)) { - gBattleMoveDamage = CalculateMoveDamage(gCurrentMove, gBattlerAttacker, gBattlerTarget, gBattleMoves[gCurrentMove].type, powerOverride, FALSE, FALSE, FALSE); + gBattleMoveDamage = CalculateMoveDamage(gCurrentMove, gBattlerAttacker, gBattlerTarget, gMovesInfo[gCurrentMove].type, powerOverride, FALSE, FALSE, FALSE); dmgByMove[i] = gBattleMoveDamage; if (dmgByMove[i] == 0 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) dmgByMove[i] = 1; diff --git a/src/battle_util.c b/src/battle_util.c index e70e0f919155..fc34a48c59c4 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -112,8 +112,8 @@ bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide, u32 move) if (gSideTimers[defSide].followmeTimer == 0 || gBattleMons[gSideTimers[defSide].followmeTarget].hp == 0 - || gBattleMoves[move].effect == EFFECT_SNIPE_SHOT - || gBattleMoves[move].effect == EFFECT_SKY_DROP + || gMovesInfo[move].effect == EFFECT_SNIPE_SHOT + || gMovesInfo[move].effect == EFFECT_SKY_DROP || ability == ABILITY_PROPELLER_TAIL || ability == ABILITY_STALWART) return FALSE; @@ -223,7 +223,7 @@ void HandleAction_UseMove(void) } else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gSideTimers[side].followmeTimer == 0 - && (gBattleMoves[gCurrentMove].power != 0 || (moveTarget != MOVE_TARGET_USER && moveTarget != MOVE_TARGET_ALL_BATTLERS)) + && (gMovesInfo[gCurrentMove].power != 0 || (moveTarget != MOVE_TARGET_USER && moveTarget != MOVE_TARGET_ALL_BATTLERS)) && ((GetBattlerAbility(*(gBattleStruct->moveTarget + gBattlerAttacker)) != ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC) || (GetBattlerAbility(*(gBattleStruct->moveTarget + gBattlerAttacker)) != ABILITY_STORM_DRAIN && moveType == TYPE_WATER))) { @@ -235,8 +235,8 @@ void HandleAction_UseMove(void) && ((GetBattlerAbility(battler) == ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC) || (GetBattlerAbility(battler) == ABILITY_STORM_DRAIN && moveType == TYPE_WATER)) && GetBattlerTurnOrderNum(battler) < var - && gBattleMoves[gCurrentMove].effect != EFFECT_SNIPE_SHOT - && gBattleMoves[gCurrentMove].effect != EFFECT_PLEDGE + && gMovesInfo[gCurrentMove].effect != EFFECT_SNIPE_SHOT + && gMovesInfo[gCurrentMove].effect != EFFECT_PLEDGE && (GetBattlerAbility(gBattlerAttacker) != ABILITY_PROPELLER_TAIL || GetBattlerAbility(gBattlerAttacker) != ABILITY_STALWART)) { @@ -1254,7 +1254,7 @@ static bool32 IsGravityPreventingMove(u32 move) if (!(gFieldStatuses & STATUS_FIELD_GRAVITY)) return FALSE; - return gBattleMoves[move].gravityBanned; + return gMovesInfo[move].gravityBanned; } bool32 IsHealBlockPreventingMove(u32 battler, u32 move) @@ -1262,12 +1262,12 @@ bool32 IsHealBlockPreventingMove(u32 battler, u32 move) if (!(gStatuses3[battler] & STATUS3_HEAL_BLOCK)) return FALSE; - return gBattleMoves[move].healingMove; + return gMovesInfo[move].healingMove; } static bool32 IsBelchPreventingMove(u32 battler, u32 move) { - if (gBattleMoves[move].effect != EFFECT_BELCH) + if (gMovesInfo[move].effect != EFFECT_BELCH) return FALSE; return !(gBattleStruct->ateBerry[battler & BIT_SIDE] & gBitTable[gBattlerPartyIndexes[battler]]); @@ -1333,7 +1333,7 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) } } - if (DYNAMAX_BYPASS_CHECK && gBattleStruct->zmove.toBeUsed[gBattlerAttacker] == MOVE_NONE && gDisableStructs[battler].throatChopTimer != 0 && gBattleMoves[move].soundMove) + if (DYNAMAX_BYPASS_CHECK && gBattleStruct->zmove.toBeUsed[gBattlerAttacker] == MOVE_NONE && gDisableStructs[battler].throatChopTimer != 0 && gMovesInfo[move].soundMove) { gCurrentMove = move; if (gBattleTypeFlags & BATTLE_TYPE_PALACE) @@ -1408,7 +1408,7 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) } } - if (DYNAMAX_BYPASS_CHECK && gBattleMoves[move].effect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) + if (DYNAMAX_BYPASS_CHECK && gMovesInfo[move].effect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) { gCurrentMove = move; if (gBattleTypeFlags & BATTLE_TYPE_PALACE) @@ -1423,7 +1423,7 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) } } - if (gBattleMoves[move].cantUseTwice && move == gLastResultingMoves[battler]) + if (gMovesInfo[move].cantUseTwice && move == gLastResultingMoves[battler]) { gCurrentMove = move; PREPARE_MOVE_BUFFER(gBattleTextBuff1, gCurrentMove); @@ -1455,7 +1455,7 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) limitations++; } } - else if (holdEffect == HOLD_EFFECT_ASSAULT_VEST && IS_MOVE_STATUS(move) && gBattleMoves[move].effect != EFFECT_ME_FIRST) + else if (holdEffect == HOLD_EFFECT_ASSAULT_VEST && IS_MOVE_STATUS(move) && gMovesInfo[move].effect != EFFECT_ME_FIRST) { if (IsDynamaxed(gBattlerAttacker)) gCurrentMove = MOVE_MAX_GUARD; @@ -1503,7 +1503,7 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) } } - if (gBattleMoves[move].effect == EFFECT_PLACEHOLDER) + if (gMovesInfo[move].effect == EFFECT_PLACEHOLDER) { if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { @@ -1532,7 +1532,7 @@ u8 CheckMoveLimitations(u32 battler, u8 unusableMoves, u16 check) for (i = 0; i < MAX_MON_MOVES; i++) { move = gBattleMons[battler].moves[i]; - moveEffect = gBattleMoves[move].effect; + moveEffect = gMovesInfo[move].effect; // No move if (check & MOVE_LIMITATION_ZEROMOVE && move == MOVE_NONE) unusableMoves |= gBitTable[i]; @@ -1561,7 +1561,7 @@ u8 CheckMoveLimitations(u32 battler, u8 unusableMoves, u16 check) else if (check & MOVE_LIMITATION_CHOICE_ITEM && HOLD_EFFECT_CHOICE(holdEffect) && *choicedMove != MOVE_NONE && *choicedMove != MOVE_UNAVAILABLE && *choicedMove != move) unusableMoves |= gBitTable[i]; // Assault Vest - else if (check & MOVE_LIMITATION_ASSAULT_VEST && holdEffect == HOLD_EFFECT_ASSAULT_VEST && IS_MOVE_STATUS(move) && gBattleMoves[move].effect != EFFECT_ME_FIRST) + else if (check & MOVE_LIMITATION_ASSAULT_VEST && holdEffect == HOLD_EFFECT_ASSAULT_VEST && IS_MOVE_STATUS(move) && gMovesInfo[move].effect != EFFECT_ME_FIRST) unusableMoves |= gBitTable[i]; // Gravity else if (check & MOVE_LIMITATION_GRAVITY && IsGravityPreventingMove(move)) @@ -1573,7 +1573,7 @@ u8 CheckMoveLimitations(u32 battler, u8 unusableMoves, u16 check) else if (check & MOVE_LIMITATION_BELCH && IsBelchPreventingMove(battler, move)) unusableMoves |= gBitTable[i]; // Throat Chop - else if (check & MOVE_LIMITATION_THROAT_CHOP && gDisableStructs[battler].throatChopTimer && gBattleMoves[move].soundMove) + else if (check & MOVE_LIMITATION_THROAT_CHOP && gDisableStructs[battler].throatChopTimer && gMovesInfo[move].soundMove) unusableMoves |= gBitTable[i]; // Stuff Cheeks else if (check & MOVE_LIMITATION_STUFF_CHEEKS && moveEffect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) @@ -1582,7 +1582,7 @@ u8 CheckMoveLimitations(u32 battler, u8 unusableMoves, u16 check) else if (check & MOVE_LIMITATION_CHOICE_ITEM && GetBattlerAbility(battler) == ABILITY_GORILLA_TACTICS && *choicedMove != MOVE_NONE && *choicedMove != MOVE_UNAVAILABLE && *choicedMove != move) unusableMoves |= gBitTable[i]; // Can't Use Twice flag - else if (check & MOVE_LIMITATION_CANT_USE_TWICE && gBattleMoves[move].cantUseTwice && move == gLastResultingMoves[battler]) + else if (check & MOVE_LIMITATION_CANT_USE_TWICE && gMovesInfo[move].cantUseTwice && move == gLastResultingMoves[battler]) unusableMoves |= gBitTable[i]; } return unusableMoves; @@ -3252,7 +3252,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) gBattleStruct->atkCancellerTracker++; break; case CANCELLER_FROZEN: // check being frozen - if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE && !(gBattleMoves[gCurrentMove].thawsUser)) + if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE && !(gMovesInfo[gCurrentMove].thawsUser)) { if (!RandomPercentage(RNG_FROZEN, 20)) { @@ -3470,7 +3470,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) } effect = 2; } - if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FROSTBITE && gBattleMoves[gCurrentMove].thawsUser) + if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FROSTBITE && gMovesInfo[gCurrentMove].thawsUser) { if (!(MoveHasMoveEffectSelfArg(gCurrentMove, MOVE_EFFECT_REMOVE_ARG_TYPE, TYPE_FIRE) && !IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_FIRE))) { @@ -3484,7 +3484,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) gBattleStruct->atkCancellerTracker++; break; case CANCELLER_POWDER_MOVE: - if ((gBattleMoves[gCurrentMove].powderMove) && (gBattlerAttacker != gBattlerTarget)) + if ((gMovesInfo[gCurrentMove].powderMove) && (gBattlerAttacker != gBattlerTarget)) { if (B_POWDER_GRASS >= GEN_6 && (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_GRASS) || GetBattlerAbility(gBattlerTarget) == ABILITY_OVERCOAT)) @@ -3521,7 +3521,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) gBattleStruct->atkCancellerTracker++; break; case CANCELLER_THROAT_CHOP: - if (gBattleStruct->zmove.toBeUsed[gBattlerAttacker] == MOVE_NONE && gDisableStructs[gBattlerAttacker].throatChopTimer && gBattleMoves[gCurrentMove].soundMove) + if (gBattleStruct->zmove.toBeUsed[gBattlerAttacker] == MOVE_NONE && gDisableStructs[gBattlerAttacker].throatChopTimer && gMovesInfo[gCurrentMove].soundMove) { gProtectStructs[gBattlerAttacker].usedThroatChopPreventedMove = TRUE; CancelMultiTurnMoves(gBattlerAttacker); @@ -3545,7 +3545,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) gBattleScripting.battler = gBattlerAttacker; if (gBattleStruct->zmove.activeCategory == BATTLE_CATEGORY_STATUS) { - gBattleStruct->zmove.effect = gBattleMoves[gBattleStruct->zmove.baseMoves[gBattlerAttacker]].zMove.effect; + gBattleStruct->zmove.effect = gMovesInfo[gBattleStruct->zmove.baseMoves[gBattlerAttacker]].zMove.effect; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_ZMoveActivateStatus; } @@ -3559,7 +3559,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) gBattleStruct->atkCancellerTracker++; break; case CANCELLER_MULTIHIT_MOVES: - if (gBattleMoves[gCurrentMove].effect == EFFECT_MULTI_HIT) + if (gMovesInfo[gCurrentMove].effect == EFFECT_MULTI_HIT) { u16 ability = gBattleMons[gBattlerAttacker].ability; @@ -3580,19 +3580,19 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0) } - else if (gBattleMoves[gCurrentMove].strikeCount > 1) + else if (gMovesInfo[gCurrentMove].strikeCount > 1) { - if (gBattleMoves[gCurrentMove].effect == EFFECT_POPULATION_BOMB && GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_LOADED_DICE) + if (gMovesInfo[gCurrentMove].effect == EFFECT_POPULATION_BOMB && GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_LOADED_DICE) { gMultiHitCounter = RandomUniform(RNG_LOADED_DICE, 4, 10); } else { - gMultiHitCounter = gBattleMoves[gCurrentMove].strikeCount; + gMultiHitCounter = gMovesInfo[gCurrentMove].strikeCount; PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 3, 0) } } - else if (B_BEAT_UP >= GEN_5 && gBattleMoves[gCurrentMove].effect == EFFECT_BEAT_UP) + else if (B_BEAT_UP >= GEN_5 && gMovesInfo[gCurrentMove].effect == EFFECT_BEAT_UP) { struct Pokemon* party = GetBattlerParty(gBattlerAttacker); int i; @@ -3640,8 +3640,8 @@ u8 AtkCanceller_UnableToUseMove2(void) if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN && IsBattlerGrounded(gBattlerTarget) && GetChosenMovePriority(gBattlerAttacker) > 0 - && gBattleMoves[gCurrentMove].target != MOVE_TARGET_ALL_BATTLERS - && gBattleMoves[gCurrentMove].target != MOVE_TARGET_OPPONENTS_FIELD + && gMovesInfo[gCurrentMove].target != MOVE_TARGET_ALL_BATTLERS + && gMovesInfo[gCurrentMove].target != MOVE_TARGET_OPPONENTS_FIELD && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)) { CancelMultiTurnMoves(gBattlerAttacker); @@ -3900,7 +3900,7 @@ static void ForewarnChooseMove(u32 battler) continue; data[count].moveId = gBattleMons[i].moves[j]; data[count].battler = i; - switch (gBattleMoves[data[count].moveId].effect) + switch (gMovesInfo[data[count].moveId].effect) { case EFFECT_OHKO: data[count].power = 150; @@ -3911,10 +3911,10 @@ static void ForewarnChooseMove(u32 battler) data[count].power = 120; break; default: - if (gBattleMoves[data[count].moveId].power == 1) + if (gMovesInfo[data[count].moveId].power == 1) data[count].power = 80; else - data[count].power = gBattleMoves[data[count].moveId].power; + data[count].power = gMovesInfo[data[count].moveId].power; break; } count++; @@ -4843,8 +4843,8 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 u16 battlerAbility = GetBattlerAbility(battler); u16 targetAbility = GetBattlerAbility(gBattlerTarget); - if ((gLastUsedAbility == ABILITY_SOUNDPROOF && gBattleMoves[move].soundMove && !(moveTarget & MOVE_TARGET_USER)) - || (gLastUsedAbility == ABILITY_BULLETPROOF && gBattleMoves[move].ballisticMove)) + if ((gLastUsedAbility == ABILITY_SOUNDPROOF && gMovesInfo[move].soundMove && !(moveTarget & MOVE_TARGET_USER)) + || (gLastUsedAbility == ABILITY_BULLETPROOF && gMovesInfo[move].ballisticMove)) { if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) gHitMarker |= HITMARKER_NO_PPDEDUCT; @@ -4890,7 +4890,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 switch (gLastUsedAbility) { case ABILITY_VOLT_ABSORB: - if (moveType == TYPE_ELECTRIC && gBattleMoves[move].target != MOVE_TARGET_ALL_BATTLERS) + if (moveType == TYPE_ELECTRIC && gMovesInfo[move].target != MOVE_TARGET_ALL_BATTLERS) effect = 1; break; case ABILITY_WATER_ABSORB: @@ -4899,11 +4899,11 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 effect = 1; break; case ABILITY_MOTOR_DRIVE: - if (moveType == TYPE_ELECTRIC && gBattleMoves[move].target != MOVE_TARGET_ALL_BATTLERS) + if (moveType == TYPE_ELECTRIC && gMovesInfo[move].target != MOVE_TARGET_ALL_BATTLERS) effect = 2, statId = STAT_SPEED; break; case ABILITY_LIGHTNING_ROD: - if (moveType == TYPE_ELECTRIC && gBattleMoves[move].target != MOVE_TARGET_ALL_BATTLERS) + if (moveType == TYPE_ELECTRIC && gMovesInfo[move].target != MOVE_TARGET_ALL_BATTLERS) effect = 2, statId = STAT_SPATK; break; case ABILITY_STORM_DRAIN: @@ -4946,7 +4946,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 effect = 2, statId = STAT_DEF, statAmount = 2; break; case ABILITY_WIND_RIDER: - if (gBattleMoves[gCurrentMove].windMove && !(GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove) & MOVE_TARGET_USER)) + if (gMovesInfo[gCurrentMove].windMove && !(GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove) & MOVE_TARGET_USER)) effect = 2, statId = STAT_ATK; break; case ABILITY_EARTH_EATER: @@ -5105,7 +5105,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 && (CompareStat(battler, STAT_SPEED, MAX_STAT_STAGE, CMP_LESS_THAN) // Don't activate if both Speed and Defense cannot be raised. || CompareStat(battler, STAT_DEF, MIN_STAT_STAGE, CMP_GREATER_THAN))) { - if (gBattleMoves[gCurrentMove].effect == EFFECT_HIT_ESCAPE && CanBattlerSwitch(gBattlerAttacker)) + if (gMovesInfo[gCurrentMove].effect == EFFECT_HIT_ESCAPE && CanBattlerSwitch(gBattlerAttacker)) gProtectStructs[battler].disableEjectPack = TRUE; // Set flag for target BattleScriptPushCursor(); @@ -5194,7 +5194,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 case ABILITY_COLOR_CHANGE: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && move != MOVE_STRUGGLE - && gBattleMoves[move].power != 0 + && gMovesInfo[move].power != 0 && TARGET_TURN_DAMAGED && !IS_BATTLER_OF_TYPE(battler, moveType) && gBattleMons[battler].hp != 0) @@ -5525,7 +5525,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 } break; case ABILITY_WIND_POWER: - if (!(gBattleMoves[gCurrentMove].windMove)) + if (!(gMovesInfo[gCurrentMove].windMove)) break; // fall through case ABILITY_ELECTROMORPHOSIS: @@ -5606,7 +5606,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 { case ABILITY_DANCER: if (IsBattlerAlive(battler) - && (gBattleMoves[gCurrentMove].danceMove) + && (gMovesInfo[gCurrentMove].danceMove) && !gSpecialStatuses[battler].dancerUsedMove && gBattlerAttacker != battler) { @@ -6017,7 +6017,7 @@ u32 GetBattlerAbility(u32 battler) if (((IsMoldBreakerTypeAbility(gBattleMons[gBattlerAttacker].ability) && !(gStatuses3[gBattlerAttacker] & STATUS3_GASTRO_ACID)) - || gBattleMoves[gCurrentMove].ignoresTargetAbility) + || gMovesInfo[gCurrentMove].ignoresTargetAbility) && gAbilities[gBattleMons[battler].ability].breakable && gBattlerByTurnOrder[gCurrentTurnActionNumber] == gBattlerAttacker && gActionsByTurnOrder[gBattlerByTurnOrder[gBattlerAttacker]] == B_ACTION_USE_MOVE @@ -7484,7 +7484,7 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) if (gBattleMoveDamage != 0 // Need to have done damage && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED - && !gBattleMoves[gCurrentMove].ignoresKingsRock + && !gMovesInfo[gCurrentMove].ignoresKingsRock && gBattleMons[gBattlerTarget].hp && RandomPercentage(RNG_HOLD_EFFECT_FLINCH, atkHoldEffectParam) && ability != ABILITY_STENCH) @@ -7553,7 +7553,7 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) case HOLD_EFFECT_THROAT_SPRAY: // Does NOT need to be a damaging move if (gProtectStructs[gBattlerAttacker].targetAffected && gBattleMons[gBattlerAttacker].hp != 0 - && gBattleMoves[gCurrentMove].soundMove + && gMovesInfo[gCurrentMove].soundMove && CompareStat(gBattlerAttacker, STAT_SPATK, MAX_STAT_STAGE, CMP_LESS_THAN) && !NoAliveMonsForEitherParty()) // Don't activate if battle will end { @@ -7835,7 +7835,7 @@ u32 GetMoveTarget(u16 move, u8 setTarget) else { targetBattler = SetRandomTarget(gBattlerAttacker); - if (gBattleMoves[move].type == TYPE_ELECTRIC + if (gMovesInfo[move].type == TYPE_ELECTRIC && IsAbilityOnOpposingSide(gBattlerAttacker, ABILITY_LIGHTNING_ROD) && GetBattlerAbility(targetBattler) != ABILITY_LIGHTNING_ROD) { @@ -7843,7 +7843,7 @@ u32 GetMoveTarget(u16 move, u8 setTarget) RecordAbilityBattle(targetBattler, gBattleMons[targetBattler].ability); gSpecialStatuses[targetBattler].lightningRodRedirected = TRUE; } - else if (gBattleMoves[move].type == TYPE_WATER + else if (gMovesInfo[move].type == TYPE_WATER && IsAbilityOnOpposingSide(gBattlerAttacker, ABILITY_STORM_DRAIN) && GetBattlerAbility(targetBattler) != ABILITY_STORM_DRAIN) { @@ -8065,14 +8065,14 @@ bool32 IsMoveMakingContact(u32 move, u32 battlerAtk) { u32 atkHoldEffect = GetBattlerHoldEffect(battlerAtk, TRUE); - if (!gBattleMoves[move].makesContact) + if (!gMovesInfo[move].makesContact) { - if (gBattleMoves[move].effect == EFFECT_SHELL_SIDE_ARM && gBattleStruct->swapDamageCategory) + if (gMovesInfo[move].effect == EFFECT_SHELL_SIDE_ARM && gBattleStruct->swapDamageCategory) return TRUE; else return FALSE; } - else if ((atkHoldEffect == HOLD_EFFECT_PUNCHING_GLOVE && gBattleMoves[move].punchingMove) + else if ((atkHoldEffect == HOLD_EFFECT_PUNCHING_GLOVE && gMovesInfo[move].punchingMove) || atkHoldEffect == HOLD_EFFECT_PROTECTIVE_PADS || GetBattlerAbility(battlerAtk) == ABILITY_LONG_REACH) { @@ -8098,7 +8098,7 @@ bool32 IsBattlerProtected(u32 battler, u32 move) // Z-Moves and Max Moves bypass protection (except Max Guard). if ((IsMaxMove(move) || gBattleStruct->zmove.active) && (!gProtectStructs[battler].maxGuarded - || gBattleMoves[move].argument == MAX_EFFECT_BYPASS_PROTECT)) + || gMovesInfo[move].argument == MAX_EFFECT_BYPASS_PROTECT)) return FALSE; // Max Guard is silly about the moves it blocks, including Teatime. @@ -8108,10 +8108,10 @@ bool32 IsBattlerProtected(u32 battler, u32 move) // Protective Pads doesn't stop Unseen Fist from bypassing Protect effects, so IsMoveMakingContact() isn't used here. // This means extra logic is needed to handle Shell Side Arm. if (GetBattlerAbility(gBattlerAttacker) == ABILITY_UNSEEN_FIST - && (gBattleMoves[move].makesContact || (gBattleMoves[move].effect == EFFECT_SHELL_SIDE_ARM && gBattleStruct->swapDamageCategory)) + && (gMovesInfo[move].makesContact || (gMovesInfo[move].effect == EFFECT_SHELL_SIDE_ARM && gBattleStruct->swapDamageCategory)) && !gProtectStructs[battler].maxGuarded) // Max Guard cannot be bypassed by Unseen Fist return FALSE; - else if (gBattleMoves[move].ignoresProtect) + else if (gMovesInfo[move].ignoresProtect) return FALSE; else if (gProtectStructs[battler].protected) return TRUE; @@ -8126,7 +8126,7 @@ bool32 IsBattlerProtected(u32 battler, u32 move) return TRUE; else if (gProtectStructs[battler].spikyShielded) return TRUE; - else if (gProtectStructs[battler].kingsShielded && gBattleMoves[move].power != 0) + else if (gProtectStructs[battler].kingsShielded && gMovesInfo[move].power != 0) return TRUE; else if (gProtectStructs[battler].maxGuarded) return TRUE; @@ -8390,13 +8390,13 @@ u32 CalcFuryCutterBasePower(u32 basePower, u32 furyCutterCounter) static inline u32 CalcMoveBasePower(u32 move, u32 battlerAtk, u32 battlerDef, u32 abilityDef, u32 weather) { u32 i; - u32 basePower = gBattleMoves[move].power; + u32 basePower = gMovesInfo[move].power; u32 weight, hpFraction, speed; if (gBattleStruct->zmove.active) return GetZMovePower(gBattleStruct->zmove.baseMoves[battlerAtk]); - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_PLEDGE: if (gBattleStruct->pledgeMove) @@ -8464,7 +8464,7 @@ static inline u32 CalcMoveBasePower(u32 move, u32 battlerAtk, u32 battlerDef, u3 break; case EFFECT_DOUBLE_POWER_ON_ARG_STATUS: // Comatose targets treated as if asleep - if ((gBattleMons[battlerDef].status1 | (STATUS1_SLEEP * (abilityDef == ABILITY_COMATOSE))) & gBattleMoves[move].argument) + if ((gBattleMons[battlerDef].status1 | (STATUS1_SLEEP * (abilityDef == ABILITY_COMATOSE))) & gMovesInfo[move].argument) basePower *= 2; break; case EFFECT_WRING_OUT: @@ -8558,7 +8558,7 @@ static inline u32 CalcMoveBasePower(u32 move, u32 battlerAtk, u32 battlerDef, u3 } break; case EFFECT_FUSION_COMBO: - if (gBattleMoves[gLastUsedMove].effect == EFFECT_FUSION_COMBO && move != gLastUsedMove) + if (gMovesInfo[gLastUsedMove].effect == EFFECT_FUSION_COMBO && move != gLastUsedMove) basePower *= 2; break; case EFFECT_LASH_OUT: @@ -8650,7 +8650,7 @@ static inline u32 CalcMoveBasePowerAfterModifiers(u32 move, u32 battlerAtk, u32 u32 atkSide = GetBattlerSide(battlerAtk); // move effect - switch (gBattleMoves[move].effect) + switch (gMovesInfo[move].effect) { case EFFECT_FACADE: if (gBattleMons[battlerAtk].status1 & (STATUS1_BURN | STATUS1_PSN_ANY | STATUS1_PARALYSIS | STATUS1_FROSTBITE)) @@ -8730,11 +8730,11 @@ static inline u32 CalcMoveBasePowerAfterModifiers(u32 move, u32 battlerAtk, u32 modifier = uq4_12_multiply(modifier, UQ_4_12(1.2)); break; case ABILITY_IRON_FIST: - if (gBattleMoves[move].punchingMove) + if (gMovesInfo[move].punchingMove) modifier = uq4_12_multiply(modifier, UQ_4_12(1.2)); break; case ABILITY_SHEER_FORCE: - if (gBattleMoves[move].sheerForceBoost) + if (gMovesInfo[move].sheerForceBoost) modifier = uq4_12_multiply(modifier, UQ_4_12(1.3)); break; case ABILITY_SAND_FORCE: @@ -8757,11 +8757,11 @@ static inline u32 CalcMoveBasePowerAfterModifiers(u32 move, u32 battlerAtk, u32 modifier = uq4_12_multiply(modifier, UQ_4_12(1.3)); break; case ABILITY_STRONG_JAW: - if (gBattleMoves[move].bitingMove) + if (gMovesInfo[move].bitingMove) modifier = uq4_12_multiply(modifier, UQ_4_12(1.5)); break; case ABILITY_MEGA_LAUNCHER: - if (gBattleMoves[move].pulseMove) + if (gMovesInfo[move].pulseMove) modifier = uq4_12_multiply(modifier, UQ_4_12(1.5)); break; case ABILITY_WATER_BUBBLE: @@ -8793,7 +8793,7 @@ static inline u32 CalcMoveBasePowerAfterModifiers(u32 move, u32 battlerAtk, u32 modifier = uq4_12_multiply(modifier, UQ_4_12(1.2)); break; case ABILITY_PUNK_ROCK: - if (gBattleMoves[move].soundMove) + if (gMovesInfo[move].soundMove) modifier = uq4_12_multiply(modifier, UQ_4_12(1.3)); break; case ABILITY_STEELY_SPIRIT: @@ -8845,7 +8845,7 @@ static inline u32 CalcMoveBasePowerAfterModifiers(u32 move, u32 battlerAtk, u32 modifier = uq4_12_multiply(modifier, UQ_4_12(1.3)); break; case ABILITY_SHARPNESS: - if (gBattleMoves[move].slicingMove) + if (gMovesInfo[move].slicingMove) modifier = uq4_12_multiply(modifier, UQ_4_12(1.5)); break; case ABILITY_SUPREME_OVERLORD: @@ -8984,7 +8984,7 @@ static inline u32 CalcMoveBasePowerAfterModifiers(u32 move, u32 battlerAtk, u32 modifier = uq4_12_multiply(modifier, holdEffectModifier); break; case HOLD_EFFECT_PUNCHING_GLOVE: - if (gBattleMoves[move].punchingMove) + if (gMovesInfo[move].punchingMove) modifier = uq4_12_multiply(modifier, UQ_4_12(1.1)); break; } @@ -9000,7 +9000,7 @@ static inline u32 CalcAttackStat(u32 move, u32 battlerAtk, u32 battlerDef, u32 m atkBaseSpeciesId = GET_BASE_SPECIES_ID(gBattleMons[battlerAtk].species); - if (gBattleMoves[move].effect == EFFECT_FOUL_PLAY) + if (gMovesInfo[move].effect == EFFECT_FOUL_PLAY) { if (IS_MOVE_PHYSICAL(move)) { @@ -9013,7 +9013,7 @@ static inline u32 CalcAttackStat(u32 move, u32 battlerAtk, u32 battlerDef, u32 m atkStage = gBattleMons[battlerDef].statStages[STAT_SPATK]; } } - else if (gBattleMoves[move].effect == EFFECT_BODY_PRESS) + else if (gMovesInfo[move].effect == EFFECT_BODY_PRESS) { atkStat = gBattleMons[battlerAtk].defense; atkStage = gBattleMons[battlerAtk].statStages[STAT_DEF]; @@ -9223,7 +9223,7 @@ static inline u32 CalcDefenseStat(u32 move, u32 battlerAtk, u32 battlerDef, u32 spDef = gBattleMons[battlerDef].spDefense; } - if (gBattleMoves[move].effect == EFFECT_PSYSHOCK || IS_MOVE_PHYSICAL(move)) // uses defense stat instead of sp.def + if (gMovesInfo[move].effect == EFFECT_PSYSHOCK || IS_MOVE_PHYSICAL(move)) // uses defense stat instead of sp.def { defStat = def; defStage = gBattleMons[battlerDef].statStages[STAT_DEF]; @@ -9237,7 +9237,7 @@ static inline u32 CalcDefenseStat(u32 move, u32 battlerAtk, u32 battlerDef, u32 } // Self-destruct / Explosion cut defense in half - if (B_EXPLOSION_DEFENSE < GEN_5 && gBattleMoves[gCurrentMove].effect == EFFECT_EXPLOSION) + if (B_EXPLOSION_DEFENSE < GEN_5 && gMovesInfo[gCurrentMove].effect == EFFECT_EXPLOSION) defStat /= 2; // critical hits ignore positive stat changes @@ -9247,7 +9247,7 @@ static inline u32 CalcDefenseStat(u32 move, u32 battlerAtk, u32 battlerDef, u32 if (atkAbility == ABILITY_UNAWARE) defStage = DEFAULT_STAT_STAGE; // certain moves also ignore stat changes - if (gBattleMoves[move].ignoresTargetDefenseEvasionStages) + if (gMovesInfo[move].ignoresTargetDefenseEvasionStages) defStage = DEFAULT_STAT_STAGE; defStat *= gStatStageRatios[defStage][0]; @@ -9288,7 +9288,7 @@ static inline u32 CalcDefenseStat(u32 move, u32 battlerAtk, u32 battlerDef, u32 modifier = uq4_12_multiply_half_down(modifier, UQ_4_12(1.5)); break; case ABILITY_PURIFYING_SALT: - if (gBattleMoves[move].type == TYPE_GHOST) + if (gMovesInfo[move].type == TYPE_GHOST) modifier = uq4_12_multiply_half_down(modifier, UQ_4_12(2.0)); break; } @@ -9391,7 +9391,7 @@ static uq4_12_t GetWeatherDamageModifier(u32 battlerAtk, u32 move, u32 moveType, { if (weather == B_WEATHER_NONE) return UQ_4_12(1.0); - if (gBattleMoves[move].effect == EFFECT_HYDRO_STEAM && (weather & B_WEATHER_SUN) && holdEffectAtk != HOLD_EFFECT_UTILITY_UMBRELLA) + if (gMovesInfo[move].effect == EFFECT_HYDRO_STEAM && (weather & B_WEATHER_SUN) && holdEffectAtk != HOLD_EFFECT_UTILITY_UMBRELLA) return UQ_4_12(1.5); if (holdEffectDef == HOLD_EFFECT_UTILITY_UMBRELLA) return UQ_4_12(1.0); @@ -9415,12 +9415,12 @@ static inline uq4_12_t GetBurnOrFrostBiteModifier(u32 battlerAtk, u32 move, u32 { if (gBattleMons[battlerAtk].status1 & STATUS1_BURN && IS_MOVE_PHYSICAL(move) - && (B_BURN_FACADE_DMG < GEN_6 || gBattleMoves[move].effect != EFFECT_FACADE) + && (B_BURN_FACADE_DMG < GEN_6 || gMovesInfo[move].effect != EFFECT_FACADE) && abilityAtk != ABILITY_GUTS) return UQ_4_12(0.5); if (gBattleMons[battlerAtk].status1 & STATUS1_FROSTBITE && IS_MOVE_SPECIAL(move) - && (B_BURN_FACADE_DMG < GEN_6 || gBattleMoves[move].effect != EFFECT_FACADE) + && (B_BURN_FACADE_DMG < GEN_6 || gMovesInfo[move].effect != EFFECT_FACADE) && abilityAtk != ABILITY_GUTS) return UQ_4_12(0.5); return UQ_4_12(1.0); @@ -9449,28 +9449,28 @@ static inline uq4_12_t GetZMaxMoveAgainstProtectionModifier(u32 battlerDef, u32 static inline uq4_12_t GetMinimizeModifier(u32 move, u32 battlerDef) { - if (gBattleMoves[move].minimizeDoubleDamage && gStatuses3[battlerDef] & STATUS3_MINIMIZED) + if (gMovesInfo[move].minimizeDoubleDamage && gStatuses3[battlerDef] & STATUS3_MINIMIZED) return UQ_4_12(2.0); return UQ_4_12(1.0); } static inline uq4_12_t GetUndergroundModifier(u32 move, u32 battlerDef) { - if (gBattleMoves[move].damagesUnderground && gStatuses3[battlerDef] & STATUS3_UNDERGROUND) + if (gMovesInfo[move].damagesUnderground && gStatuses3[battlerDef] & STATUS3_UNDERGROUND) return UQ_4_12(2.0); return UQ_4_12(1.0); } static inline uq4_12_t GetDiveModifier(u32 move, u32 battlerDef) { - if (gBattleMoves[move].damagesUnderwater && gStatuses3[battlerDef] & STATUS3_UNDERWATER) + if (gMovesInfo[move].damagesUnderwater && gStatuses3[battlerDef] & STATUS3_UNDERWATER) return UQ_4_12(2.0); return UQ_4_12(1.0); } static inline uq4_12_t GetAirborneModifier(u32 move, u32 battlerDef) { - if (gBattleMoves[move].damagesAirborneDoubleDamage && gStatuses3[battlerDef] & STATUS3_ON_AIR) + if (gMovesInfo[move].damagesAirborneDoubleDamage && gStatuses3[battlerDef] & STATUS3_ON_AIR) return UQ_4_12(2.0); return UQ_4_12(1.0); } @@ -9491,7 +9491,7 @@ static inline uq4_12_t GetScreensModifier(u32 move, u32 battlerAtk, u32 battlerD static inline uq4_12_t GetCollisionCourseElectroDriftModifier(u32 move, uq4_12_t typeEffectivenessModifier) { - if (gBattleMoves[move].effect == EFFECT_COLLISION_COURSE && typeEffectivenessModifier >= UQ_4_12(2.0)) + if (gMovesInfo[move].effect == EFFECT_COLLISION_COURSE && typeEffectivenessModifier >= UQ_4_12(2.0)) return UQ_4_12(1.3333); return UQ_4_12(1.0); } @@ -9538,7 +9538,7 @@ static inline uq4_12_t GetDefenderAbilitiesModifier(u32 move, u32 moveType, u32 return UQ_4_12(0.5); break; case ABILITY_PUNK_ROCK: - if (gBattleMoves[move].soundMove) + if (gMovesInfo[move].soundMove) return UQ_4_12(0.5); break; case ABILITY_ICE_SCALES: @@ -9762,7 +9762,7 @@ static inline void MulByTypeEffectiveness(uq4_12_t *modifier, u32 move, u32 move if (moveType == TYPE_PSYCHIC && defType == TYPE_DARK && gStatuses3[battlerDef] & STATUS3_MIRACLE_EYED && mod == UQ_4_12(0.0)) mod = UQ_4_12(1.0); - if (gBattleMoves[move].effect == EFFECT_FREEZE_DRY && defType == TYPE_WATER) + if (gMovesInfo[move].effect == EFFECT_FREEZE_DRY && defType == TYPE_WATER) mod = UQ_4_12(2.0); if (moveType == TYPE_GROUND && defType == TYPE_FLYING && IsBattlerGrounded(battlerDef) && mod == UQ_4_12(0.0)) mod = UQ_4_12(1.0); @@ -9828,13 +9828,13 @@ static inline uq4_12_t CalcTypeEffectivenessMultiplierInternal(u32 move, u32 mov if (recordAbilities && (illusionSpecies = GetIllusionMonSpecies(battlerDef))) TryNoticeIllusionInTypeEffectiveness(move, moveType, battlerAtk, battlerDef, modifier, illusionSpecies); - if (gBattleMoves[move].category == BATTLE_CATEGORY_STATUS && move != MOVE_THUNDER_WAVE) + if (gMovesInfo[move].category == BATTLE_CATEGORY_STATUS && move != MOVE_THUNDER_WAVE) { modifier = UQ_4_12(1.0); if (B_GLARE_GHOST < GEN_4 && move == MOVE_GLARE && IS_BATTLER_OF_TYPE(battlerDef, TYPE_GHOST)) modifier = UQ_4_12(0.0); } - else if (moveType == TYPE_GROUND && !IsBattlerGrounded2(battlerDef, TRUE) && !(gBattleMoves[move].ignoreTypeIfFlyingAndUngrounded)) + else if (moveType == TYPE_GROUND && !IsBattlerGrounded2(battlerDef, TRUE) && !(gMovesInfo[move].ignoreTypeIfFlyingAndUngrounded)) { modifier = UQ_4_12(0.0); if (recordAbilities && defAbility == ABILITY_LEVITATE) @@ -9852,7 +9852,7 @@ static inline uq4_12_t CalcTypeEffectivenessMultiplierInternal(u32 move, u32 mov } // Thousand Arrows ignores type modifiers for flying mons - if (!IsBattlerGrounded(battlerDef) && (gBattleMoves[move].ignoreTypeIfFlyingAndUngrounded) + if (!IsBattlerGrounded(battlerDef) && (gMovesInfo[move].ignoreTypeIfFlyingAndUngrounded) && (gBattleMons[battlerDef].type1 == TYPE_FLYING || gBattleMons[battlerDef].type2 == TYPE_FLYING || gBattleMons[battlerDef].type3 == TYPE_FLYING)) { modifier = UQ_4_12(1.0); @@ -9860,7 +9860,7 @@ static inline uq4_12_t CalcTypeEffectivenessMultiplierInternal(u32 move, u32 mov if (((defAbility == ABILITY_WONDER_GUARD && modifier <= UQ_4_12(1.0)) || (defAbility == ABILITY_TELEPATHY && battlerDef == BATTLE_PARTNER(battlerAtk))) - && gBattleMoves[move].power) + && gMovesInfo[move].power) { modifier = UQ_4_12(0.0); if (recordAbilities) @@ -9887,8 +9887,8 @@ uq4_12_t CalcTypeEffectivenessMultiplier(u32 move, u32 moveType, u32 battlerAtk, if (move != MOVE_STRUGGLE && moveType != TYPE_MYSTERY) { modifier = CalcTypeEffectivenessMultiplierInternal(move, moveType, battlerAtk, battlerDef, recordAbilities, modifier, defAbility); - if (gBattleMoves[move].effect == EFFECT_TWO_TYPED_MOVE) - modifier = CalcTypeEffectivenessMultiplierInternal(move, gBattleMoves[move].argument, battlerAtk, battlerDef, recordAbilities, modifier, defAbility); + if (gMovesInfo[move].effect == EFFECT_TWO_TYPED_MOVE) + modifier = CalcTypeEffectivenessMultiplierInternal(move, gMovesInfo[move].argument, battlerAtk, battlerDef, recordAbilities, modifier, defAbility); } if (recordAbilities) @@ -9899,7 +9899,7 @@ uq4_12_t CalcTypeEffectivenessMultiplier(u32 move, u32 moveType, u32 battlerAtk, uq4_12_t CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 abilityDef) { uq4_12_t modifier = UQ_4_12(1.0); - u8 moveType = gBattleMoves[move].type; + u8 moveType = gMovesInfo[move].type; if (move != MOVE_STRUGGLE && moveType != TYPE_MYSTERY) { @@ -9909,7 +9909,7 @@ uq4_12_t CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 a if (moveType == TYPE_GROUND && abilityDef == ABILITY_LEVITATE && !(gFieldStatuses & STATUS_FIELD_GRAVITY)) modifier = UQ_4_12(0.0); - if (abilityDef == ABILITY_WONDER_GUARD && modifier <= UQ_4_12(1.0) && gBattleMoves[move].power) + if (abilityDef == ABILITY_WONDER_GUARD && modifier <= UQ_4_12(1.0) && gMovesInfo[move].power) modifier = UQ_4_12(0.0); } @@ -10470,11 +10470,11 @@ u8 GetBattleMoveCategory(u32 moveId) if (gBattleStruct != NULL && gBattleStruct->swapDamageCategory) // Photon Geyser, Shell Side Arm, Light That Burns the Sky return BATTLE_CATEGORY_PHYSICAL; if (B_PHYSICAL_SPECIAL_SPLIT >= GEN_4) - return gBattleMoves[moveId].category; + return gMovesInfo[moveId].category; if (IS_MOVE_STATUS(moveId)) return BATTLE_CATEGORY_STATUS; - else if (gBattleMoves[moveId].type < TYPE_MYSTERY) + else if (gMovesInfo[moveId].type < TYPE_MYSTERY) return BATTLE_CATEGORY_PHYSICAL; else return BATTLE_CATEGORY_SPECIAL; @@ -10540,7 +10540,7 @@ static u32 GetFlingPowerFromItemId(u32 itemId) { if (itemId >= ITEM_TM01 && itemId <= ITEM_HM08) { - u32 power = gBattleMoves[ItemIdToBattleMoveId(itemId)].power; + u32 power = gMovesInfo[ItemIdToBattleMoveId(itemId)].power; if (power > 1) return power; return 10; // Status moves and moves with variable power always return 10 power. @@ -10691,7 +10691,7 @@ bool32 IsBattlerAffectedByHazards(u32 battler, bool32 toxicSpikes) bool32 TestSheerForceFlag(u32 battler, u16 move) { - if (GetBattlerAbility(battler) == ABILITY_SHEER_FORCE && gBattleMoves[move].sheerForceBoost) + if (GetBattlerAbility(battler) == ABILITY_SHEER_FORCE && gMovesInfo[move].sheerForceBoost) return TRUE; else return FALSE; @@ -10832,16 +10832,16 @@ bool32 IsBattlerWeatherAffected(u32 battler, u32 weatherFlags) // Possible return values are defined in battle.h following MOVE_TARGET_SELECTED u32 GetBattlerMoveTargetType(u32 battler, u32 move) { - if (gBattleMoves[move].effect == EFFECT_EXPANDING_FORCE + if (gMovesInfo[move].effect == EFFECT_EXPANDING_FORCE && IsBattlerTerrainAffected(battler, STATUS_FIELD_PSYCHIC_TERRAIN)) return MOVE_TARGET_BOTH; else - return gBattleMoves[move].target; + return gMovesInfo[move].target; } bool32 CanTargetBattler(u32 battlerAtk, u32 battlerDef, u16 move) { - if (gBattleMoves[move].effect == EFFECT_HIT_ENEMY_HEAL_ALLY + if (gMovesInfo[move].effect == EFFECT_HIT_ENEMY_HEAL_ALLY && GetBattlerSide(battlerAtk) == GetBattlerSide(battlerDef) && gStatuses3[battlerAtk] & STATUS3_HEAL_BLOCK) return FALSE; // Pokémon affected by Heal Block cannot target allies with Pollen Puff @@ -10968,10 +10968,10 @@ bool32 IsGen6ExpShareEnabled(void) bool32 MoveHasMoveEffect(u32 move, u32 moveEffect) { u32 i; - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { - if (gBattleMoves[move].additionalEffects[i].moveEffect == moveEffect - && gBattleMoves[move].additionalEffects[i].self == FALSE) + if (gMovesInfo[move].additionalEffects[i].moveEffect == moveEffect + && gMovesInfo[move].additionalEffects[i].self == FALSE) return TRUE; } return FALSE; @@ -10980,10 +10980,10 @@ bool32 MoveHasMoveEffect(u32 move, u32 moveEffect) bool32 MoveHasMoveEffectWithChance(u32 move, u32 moveEffect, u32 chance) { u32 i; - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { - if (gBattleMoves[move].additionalEffects[i].moveEffect == moveEffect - && gBattleMoves[move].additionalEffects[i].chance == chance) + if (gMovesInfo[move].additionalEffects[i].moveEffect == moveEffect + && gMovesInfo[move].additionalEffects[i].chance == chance) return TRUE; } return FALSE; @@ -10992,10 +10992,10 @@ bool32 MoveHasMoveEffectWithChance(u32 move, u32 moveEffect, u32 chance) bool32 MoveHasMoveEffectSelf(u32 move, u32 moveEffect) { u32 i; - for (i = 0; i < gBattleMoves[move].numAdditionalEffects; i++) + for (i = 0; i < gMovesInfo[move].numAdditionalEffects; i++) { - if (gBattleMoves[move].additionalEffects[i].moveEffect == moveEffect - && gBattleMoves[move].additionalEffects[i].self == TRUE) + if (gMovesInfo[move].additionalEffects[i].moveEffect == moveEffect + && gMovesInfo[move].additionalEffects[i].self == TRUE) return TRUE; } return FALSE; @@ -11003,7 +11003,7 @@ bool32 MoveHasMoveEffectSelf(u32 move, u32 moveEffect) bool32 MoveHasMoveEffectSelfArg(u32 move, u32 moveEffect, u32 argument) { - return (gBattleMoves[move].argument == argument) && MoveHasMoveEffectSelf(move, moveEffect); + return (gMovesInfo[move].argument == argument) && MoveHasMoveEffectSelf(move, moveEffect); } bool8 CanMonParticipateInSkyBattle(struct Pokemon *mon) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index b2315b271959..8b5b9a2811b7 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -151,7 +151,7 @@ void QueueZMove(u8 battler, u16 baseMove) if (gBattleStruct->zmove.chosenZMove == MOVE_LIGHT_THAT_BURNS_THE_SKY) gBattleStruct->zmove.categories[battler] = GetCategoryBasedOnStats(battler); else - gBattleStruct->zmove.categories[battler] = gBattleMoves[baseMove].category; + gBattleStruct->zmove.categories[battler] = gMovesInfo[baseMove].category; } bool32 IsViableZMove(u8 battler, u16 move) @@ -192,7 +192,7 @@ bool32 IsViableZMove(u8 battler, u16 move) return TRUE; } - if (move != MOVE_NONE && zMove != MOVE_Z_STATUS && gBattleMoves[move].type == ItemId_GetSecondaryId(item)) + if (move != MOVE_NONE && zMove != MOVE_Z_STATUS && gMovesInfo[move].type == ItemId_GetSecondaryId(item)) { gBattleStruct->zmove.chosenZMove = GetTypeBasedZMove(move, battler); return TRUE; @@ -376,7 +376,7 @@ static u16 GetSignatureZMove(u16 move, u16 species, u16 item) static u16 GetTypeBasedZMove(u16 move, u8 battler) { - u8 moveType = gBattleMoves[move].type; + u8 moveType = gMovesInfo[move].type; // Get z move from type if (moveType < TYPE_FIRE) @@ -407,7 +407,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove, u32 battler) if (IS_MOVE_STATUS(move)) { - u8 zEffect = gBattleMoves[move].zMove.effect; + u8 zEffect = gMovesInfo[move].zMove.effect; gDisplayedStringBattle[0] = EOS; @@ -517,9 +517,9 @@ static void ZMoveSelectionDisplayPower(u16 move, u16 zMove) u16 power = GetZMovePower(move); if (zMove >= MOVE_CATASTROPIKA) - power = gBattleMoves[zMove].power; + power = gMovesInfo[zMove].power; - if (gBattleMoves[move].category != BATTLE_CATEGORY_STATUS) + if (gMovesInfo[move].category != BATTLE_CATEGORY_STATUS) { txtPtr = StringCopy(gDisplayedStringBattle, sText_PowerColon); ConvertIntToDecimalStringN(txtPtr, power, STR_CONV_MODE_LEFT_ALIGN, 3); @@ -680,32 +680,32 @@ static bool32 AreStatsMaxed(u8 battler, u8 n) u16 GetZMovePower(u16 move) { - if (gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) + if (gMovesInfo[move].category == BATTLE_CATEGORY_STATUS) return 0; - if (gBattleMoves[move].effect == EFFECT_OHKO) + if (gMovesInfo[move].effect == EFFECT_OHKO) return 180; - if (gBattleMoves[move].zMove.powerOverride > 0) - return gBattleMoves[move].zMove.powerOverride; + if (gMovesInfo[move].zMove.powerOverride > 0) + return gMovesInfo[move].zMove.powerOverride; else { - if (gBattleMoves[move].power >= 140) + if (gMovesInfo[move].power >= 140) return 200; - else if (gBattleMoves[move].power >= 130) + else if (gMovesInfo[move].power >= 130) return 195; - else if (gBattleMoves[move].power >= 120) + else if (gMovesInfo[move].power >= 120) return 190; - else if (gBattleMoves[move].power >= 110) + else if (gMovesInfo[move].power >= 110) return 185; - else if (gBattleMoves[move].power >= 100) + else if (gMovesInfo[move].power >= 100) return 180; - else if (gBattleMoves[move].power >= 90) + else if (gMovesInfo[move].power >= 90) return 175; - else if (gBattleMoves[move].power >= 80) + else if (gMovesInfo[move].power >= 80) return 160; - else if (gBattleMoves[move].power >= 70) + else if (gMovesInfo[move].power >= 70) return 140; - else if (gBattleMoves[move].power >= 60) + else if (gMovesInfo[move].power >= 60) return 120; else return 100; diff --git a/src/contest.c b/src/contest.c index 42a210d561bd..b4312231076a 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1537,7 +1537,7 @@ static void Task_ShowMoveSelectScreen(u8 taskId) } else if (move != MOVE_NONE && eContestantStatus[gContestPlayerMonIndex].prevMove == move - && gBattleMoves[move].contestEffect != CONTEST_EFFECT_REPETITION_NOT_BORING) + && gMovesInfo[move].contestEffect != CONTEST_EFFECT_REPETITION_NOT_BORING) { // Gray the text because it's a repeated move moveNameBuffer = StringCopy(moveName, gText_ColorBlue); @@ -2208,7 +2208,7 @@ static void Task_DoAppeals(u8 taskId) } else { - StringCopy(gStringVar3, sContestConditions[gBattleMoves[eContestantStatus[contestant].currMove].contestCategory]); + StringCopy(gStringVar3, sContestConditions[gMovesInfo[eContestantStatus[contestant].currMove].contestCategory]); } if (r3 > 0 && eContestantStatus[contestant].repeatedMove) @@ -3163,7 +3163,7 @@ static u16 GetMoveEffectSymbolTileOffset(u16 move, u8 contestant) { u16 offset; - switch (gContestEffects[gBattleMoves[move].contestEffect].effectType) + switch (gContestEffects[gMovesInfo[move].contestEffect].effectType) { case 0: case 1: @@ -3189,7 +3189,7 @@ static void PrintContestMoveDescription(u16 move) u8 numHearts; // The contest category icon is implemented as a 5x2 group of tiles. - category = gBattleMoves[move].contestCategory; + category = gMovesInfo[move].contestCategory; if (category == CONTEST_CATEGORY_COOL) categoryTile = 0x4040; else if (category == CONTEST_CATEGORY_BEAUTY) @@ -3205,27 +3205,27 @@ static void PrintContestMoveDescription(u16 move) ContestBG_FillBoxWithIncrementingTile(0, categoryTile + 0x10, 0x0b, 0x20, 0x05, 0x01, 0x11, 0x01); // Appeal hearts - if (gContestEffects[gBattleMoves[move].contestEffect].appeal == 0xFF) + if (gContestEffects[gMovesInfo[move].contestEffect].appeal == 0xFF) numHearts = 0; else - numHearts = gContestEffects[gBattleMoves[move].contestEffect].appeal / 10; + numHearts = gContestEffects[gMovesInfo[move].contestEffect].appeal / 10; if (numHearts > MAX_CONTEST_MOVE_HEARTS) numHearts = MAX_CONTEST_MOVE_HEARTS; ContestBG_FillBoxWithTile(0, TILE_EMPTY_APPEAL_HEART, 0x15, 0x1f, MAX_CONTEST_MOVE_HEARTS, 0x01, 0x11); ContestBG_FillBoxWithTile(0, TILE_FILLED_APPEAL_HEART, 0x15, 0x1f, numHearts, 0x01, 0x11); // Jam hearts - if (gContestEffects[gBattleMoves[move].contestEffect].jam == 0xFF) + if (gContestEffects[gMovesInfo[move].contestEffect].jam == 0xFF) numHearts = 0; else - numHearts = gContestEffects[gBattleMoves[move].contestEffect].jam / 10; + numHearts = gContestEffects[gMovesInfo[move].contestEffect].jam / 10; if (numHearts > MAX_CONTEST_MOVE_HEARTS) numHearts = MAX_CONTEST_MOVE_HEARTS; ContestBG_FillBoxWithTile(0, TILE_EMPTY_JAM_HEART, 0x15, 0x20, MAX_CONTEST_MOVE_HEARTS, 0x01, 0x11); ContestBG_FillBoxWithTile(0, TILE_FILLED_JAM_HEART, 0x15, 0x20, numHearts, 0x01, 0x11); FillWindowPixelBuffer(WIN_MOVE_DESCRIPTION, PIXEL_FILL(0)); - Contest_PrintTextToBg0WindowStd(WIN_MOVE_DESCRIPTION, gContestEffectDescriptionPointers[gBattleMoves[move].contestEffect]); + Contest_PrintTextToBg0WindowStd(WIN_MOVE_DESCRIPTION, gContestEffectDescriptionPointers[gMovesInfo[move].contestEffect]); Contest_PrintTextToBg0WindowStd(WIN_SLASH, gText_Slash); } @@ -4426,9 +4426,9 @@ static void CalculateAppealMoveImpact(u8 contestant) return; move = eContestantStatus[contestant].currMove; - effect = gBattleMoves[move].contestEffect; + effect = gMovesInfo[move].contestEffect; - eContestantStatus[contestant].moveCategory = gBattleMoves[eContestantStatus[contestant].currMove].contestCategory; + eContestantStatus[contestant].moveCategory = gMovesInfo[eContestantStatus[contestant].currMove].contestCategory; if (eContestantStatus[contestant].currMove == eContestantStatus[contestant].prevMove && eContestantStatus[contestant].currMove != MOVE_NONE) { eContestantStatus[contestant].repeatedMove = TRUE; @@ -4479,7 +4479,7 @@ static void CalculateAppealMoveImpact(u8 contestant) } else { - if (gBattleMoves[eContestantStatus[contestant].currMove].contestComboStarterId != 0) + if (gMovesInfo[eContestantStatus[contestant].currMove].contestComboStarterId != 0) { eContestantStatus[contestant].hasJudgesAttention = TRUE; eContestantStatus[contestant].usedComboMove = TRUE; @@ -4559,13 +4559,13 @@ static void PrintAppealMoveResultText(u8 contestant, u8 stringId) { StringCopy(gStringVar1, gContestMons[contestant].nickname); StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); - if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_COOL) + if (gMovesInfo[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_COOL) StringCopy(gStringVar3, gText_Contest_Shyness); - else if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) + else if (gMovesInfo[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) StringCopy(gStringVar3, gText_Contest_Anxiety); - else if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_CUTE) + else if (gMovesInfo[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_CUTE) StringCopy(gStringVar3, gText_Contest_Laziness); - else if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_SMART) + else if (gMovesInfo[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_SMART) StringCopy(gStringVar3, gText_Contest_Hesitancy); else StringCopy(gStringVar3, gText_Contest_Fear); @@ -4738,7 +4738,7 @@ static void UpdateApplauseMeter(void) s8 Contest_GetMoveExcitement(u16 move) { - return sContestExcitementTable[gSpecialVar_ContestCategory][gBattleMoves[move].contestCategory]; + return sContestExcitementTable[gSpecialVar_ContestCategory][gMovesInfo[move].contestCategory]; } static u8 StartApplauseOverflowAnimation(void) diff --git a/src/contest_ai.c b/src/contest_ai.c index d5eb1030e6f8..f131c709ac31 100644 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -758,7 +758,7 @@ static void ContestAICmd_get_move_effect(void) { u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - eContestAI.scriptResult = gBattleMoves[move].contestEffect; + eContestAI.scriptResult = gMovesInfo[move].contestEffect; gAIScriptPtr += 1; } @@ -786,7 +786,7 @@ static void ContestAICmd_get_move_effect_type(void) { u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - eContestAI.scriptResult = gContestEffects[gBattleMoves[move].contestEffect].effectType; + eContestAI.scriptResult = gContestEffects[gMovesInfo[move].contestEffect].effectType; gAIScriptPtr += 1; } @@ -814,12 +814,12 @@ static void ContestAICmd_check_most_appealing_move(void) { int i; u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - u8 appeal = gContestEffects[gBattleMoves[move].contestEffect].appeal; + u8 appeal = gContestEffects[gMovesInfo[move].contestEffect].appeal; for (i = 0; i < MAX_MON_MOVES; i++) { u16 newMove = gContestMons[eContestAI.contestantId].moves[i]; - if (newMove != 0 && appeal < gContestEffects[gBattleMoves[newMove].contestEffect].appeal) + if (newMove != 0 && appeal < gContestEffects[gMovesInfo[newMove].contestEffect].appeal) break; } @@ -845,12 +845,12 @@ static void ContestAICmd_check_most_jamming_move(void) { int i; u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - u8 jam = gContestEffects[gBattleMoves[move].contestEffect].jam; + u8 jam = gContestEffects[gMovesInfo[move].contestEffect].jam; for (i = 0; i < MAX_MON_MOVES; i++) { u16 newMove = gContestMons[eContestAI.contestantId].moves[i]; - if (newMove != MOVE_NONE && jam < gContestEffects[gBattleMoves[newMove].contestEffect].jam) + if (newMove != MOVE_NONE && jam < gContestEffects[gMovesInfo[newMove].contestEffect].jam) break; } @@ -876,7 +876,7 @@ static void ContestAICmd_get_num_move_hearts(void) { u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - eContestAI.scriptResult = gContestEffects[gBattleMoves[move].contestEffect].appeal / 10; + eContestAI.scriptResult = gContestEffects[gMovesInfo[move].contestEffect].appeal / 10; gAIScriptPtr += 1; } @@ -924,7 +924,7 @@ static void ContestAICmd_get_num_move_jam_hearts(void) { u16 move = gContestMons[eContestAI.contestantId].moves[eContestAI.nextMoveIndex]; - eContestAI.scriptResult = gContestEffects[gBattleMoves[move].contestEffect].jam / 10; + eContestAI.scriptResult = gContestEffects[gMovesInfo[move].contestEffect].jam / 10; gAIScriptPtr += 1; } @@ -1203,7 +1203,7 @@ static void ContestAICmd_get_used_combo_starter(void) u8 contestant = GetContestantIdByTurn(gAIScriptPtr[1]); if (IsContestantAllowedToCombo(contestant)) - result = gBattleMoves[eContestantStatus[contestant].prevMove].contestComboStarterId ? TRUE : FALSE; + result = gMovesInfo[eContestantStatus[contestant].prevMove].contestComboStarterId ? TRUE : FALSE; eContestAI.scriptResult = result; gAIScriptPtr += 2; @@ -1409,7 +1409,7 @@ static void ContestAICmd_get_used_moves_effect(void) u8 round = gAIScriptPtr[2]; u16 move = eContest.moveHistory[round][contestant]; - eContestAI.scriptResult = gBattleMoves[move].contestEffect; + eContestAI.scriptResult = gMovesInfo[move].contestEffect; gAIScriptPtr += 3; } @@ -1509,7 +1509,7 @@ static void ContestAICmd_get_used_moves_effect_type(void) u8 round = gAIScriptPtr[2]; u16 move = eContest.moveHistory[round][contestant]; - eContestAI.scriptResult = gContestEffects[gBattleMoves[move].contestEffect].effectType; + eContestAI.scriptResult = gContestEffects[gMovesInfo[move].contestEffect].effectType; gAIScriptPtr += 3; } @@ -1748,7 +1748,7 @@ static void ContestAICmd_check_user_has_move(void) for (i = 0; i < MAX_MON_MOVES; i++) { #ifdef BUGFIX - u16 move = gBattleMoves[gContestMons[eContestAI.contestantId].moves[i]].contestEffect; + u16 move = gMovesInfo[gContestMons[eContestAI.contestantId].moves[i]].contestEffect; #else u16 move = gContestMons[eContestAI.contestantId].moves[i]; #endif diff --git a/src/contest_effect.c b/src/contest_effect.c index 0e772b523954..1c27d5a490ec 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -60,7 +60,7 @@ static s16 RoundUp(s16); bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove) { int i; - u8 lastMoveComboStarterId = gBattleMoves[lastMove].contestComboStarterId; + u8 lastMoveComboStarterId = gMovesInfo[lastMove].contestComboStarterId; if (lastMoveComboStarterId == 0) { @@ -70,7 +70,7 @@ bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove) { for (i = 0; i < MAX_COMBO_MOVES; i++) { - if (lastMoveComboStarterId == gBattleMoves[nextMove].contestComboMoves[i]) + if (lastMoveComboStarterId == gMovesInfo[nextMove].contestComboMoves[i]) return TRUE; } return FALSE; @@ -314,7 +314,7 @@ static void ContestEffect_JamsOthersButMissOneTurn(void) static void ContestEffect_StartleMonsSameTypeAppeal(void) { u16 move = eContestantStatus[eContestAppealResults.contestant].currMove; - JamByMoveCategory(gBattleMoves[move].contestCategory); + JamByMoveCategory(gMovesInfo[move].contestCategory); SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } @@ -427,7 +427,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) for (i = 0; i < CONTESTANT_COUNT; i++) { if (eContestantStatus[i].hasJudgesAttention && IsContestantAllowedToCombo(i)) - oddsMod[i] = gBattleMoves[eContestantStatus[i].prevMove].contestComboStarterId == 0 ? 0 : 10; + oddsMod[i] = gMovesInfo[eContestantStatus[i].prevMove].contestComboStarterId == 0 ? 0 : 10; else oddsMod[i] = 0; oddsMod[i] -= (eContestantStatus[i].condition / 10) * 10; @@ -523,7 +523,7 @@ static void ContestEffect_BetterIfFirst(void) if (gContestantTurnOrder[eContestAppealResults.contestant] == 0) { u16 move = eContestantStatus[eContestAppealResults.contestant].currMove; - eContestantStatus[eContestAppealResults.contestant].appeal += 2 * gContestEffects[gBattleMoves[move].contestEffect].appeal; + eContestantStatus[eContestAppealResults.contestant].appeal += 2 * gContestEffects[gMovesInfo[move].contestEffect].appeal; SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_HUSTLE_STANDOUT); } } @@ -534,7 +534,7 @@ static void ContestEffect_BetterIfLast(void) if (gContestantTurnOrder[eContestAppealResults.contestant] == 3) { u16 move = eContestantStatus[eContestAppealResults.contestant].currMove; - eContestantStatus[eContestAppealResults.contestant].appeal += 2 * gContestEffects[gBattleMoves[move].contestEffect].appeal; + eContestantStatus[eContestAppealResults.contestant].appeal += 2 * gContestEffects[gMovesInfo[move].contestEffect].appeal; SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_WORK_HARD_UNNOTICED); } } @@ -667,9 +667,9 @@ static void ContestEffect_BetterIfSameType(void) } move = eContestantStatus[eContestAppealResults.contestant].currMove; - if (gBattleMoves[move].contestCategory == gBattleMoves[eContestantStatus[j].currMove].contestCategory) + if (gMovesInfo[move].contestCategory == gMovesInfo[eContestantStatus[j].currMove].contestCategory) { - eContestantStatus[eContestAppealResults.contestant].appeal += gContestEffects[gBattleMoves[move].contestEffect].appeal * 2; + eContestantStatus[eContestAppealResults.contestant].appeal += gContestEffects[gMovesInfo[move].contestEffect].appeal * 2; SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_SAME_TYPE_GOOD); } } @@ -685,9 +685,9 @@ static void ContestEffect_BetterIfDiffType(void) for (i = 0; i < CONTESTANT_COUNT; i++) { if (eContestAppealResults.turnOrder[eContestAppealResults.contestant] - 1 == eContestAppealResults.turnOrder[i] && - gBattleMoves[move].contestCategory != gBattleMoves[eContestantStatus[i].currMove].contestCategory) + gMovesInfo[move].contestCategory != gMovesInfo[eContestantStatus[i].currMove].contestCategory) { - eContestantStatus[eContestAppealResults.contestant].appeal += gContestEffects[gBattleMoves[move].contestEffect].appeal * 2; + eContestantStatus[eContestAppealResults.contestant].appeal += gContestEffects[gMovesInfo[move].contestEffect].appeal * 2; SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_DIFF_TYPE_GOOD); break; } @@ -885,7 +885,7 @@ static void ContestEffect_ScrambleNextTurnOrder(void) // An appeal that excites the audience in any CONTEST. static void ContestEffect_ExciteAudienceInAnyContest(void) { - if (gBattleMoves[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory != gSpecialVar_ContestCategory) + if (gMovesInfo[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory != gSpecialVar_ContestCategory) { eContestantStatus[eContestAppealResults.contestant].overrideCategoryExcitementMod = TRUE; } @@ -972,7 +972,7 @@ static void JamByMoveCategory(u8 category) { if (eContestAppealResults.turnOrder[eContestAppealResults.contestant] > eContestAppealResults.turnOrder[i]) { - if (category == gBattleMoves[eContestantStatus[i].currMove].contestCategory) + if (category == gMovesInfo[eContestantStatus[i].currMove].contestCategory) eContestAppealResults.jam = 40; else eContestAppealResults.jam = 10; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index bdf0428685ab..191b6e4af84e 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -104,7 +104,7 @@ static const u8 sFeintDescription[] = _( "An attack that hits foes\n" "using moves like Protect."); -const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = +const struct BattleMove gMovesInfo[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { diff --git a/src/data/party_menu.h b/src/data/party_menu.h index 0072afc890d4..25133d5a1be2 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -719,20 +719,20 @@ struct [MENU_CATALOG_MOWER] = {gText_LawnMower, CursorCb_CatalogMower}, [MENU_CHANGE_FORM] = {gText_ChangeForm, CursorCb_ChangeForm}, [MENU_CHANGE_ABILITY] = {gText_ChangeAbility, CursorCb_ChangeAbility}, - [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gBattleMoves[MOVE_CUT].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gBattleMoves[MOVE_FLASH].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gBattleMoves[MOVE_ROCK_SMASH].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gBattleMoves[MOVE_STRENGTH].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gBattleMoves[MOVE_SURF].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gBattleMoves[MOVE_FLY].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gBattleMoves[MOVE_DIVE].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gBattleMoves[MOVE_WATERFALL].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gBattleMoves[MOVE_TELEPORT].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gBattleMoves[MOVE_DIG].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gBattleMoves[MOVE_SECRET_POWER].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gBattleMoves[MOVE_MILK_DRINK].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gBattleMoves[MOVE_SOFT_BOILED].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gBattleMoves[MOVE_SWEET_SCENT].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gMovesInfo[MOVE_CUT].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gMovesInfo[MOVE_FLASH].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gMovesInfo[MOVE_ROCK_SMASH].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gMovesInfo[MOVE_STRENGTH].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gMovesInfo[MOVE_SURF].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gMovesInfo[MOVE_FLY].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gMovesInfo[MOVE_DIVE].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gMovesInfo[MOVE_WATERFALL].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gMovesInfo[MOVE_TELEPORT].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gMovesInfo[MOVE_DIG].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gMovesInfo[MOVE_SECRET_POWER].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gMovesInfo[MOVE_MILK_DRINK].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gMovesInfo[MOVE_SOFT_BOILED].name.moveName, CursorCb_FieldMove}, + [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gMovesInfo[MOVE_SWEET_SCENT].name.moveName, CursorCb_FieldMove}, }; static const u8 sPartyMenuAction_SummarySwitchCancel[] = {MENU_SUMMARY, MENU_SWITCH, MENU_CANCEL1}; diff --git a/src/frontier_util.c b/src/frontier_util.c index 1e7bd1118240..3e20ce5da16a 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -2478,7 +2478,7 @@ void CreateFrontierBrainPokemon(void) for (j = 0; j < MAX_MON_MOVES; j++) { SetMonMoveSlot(&gEnemyParty[monPartyId], sFrontierBrainsMons[facility][symbol][i].moves[j], j); - if (gBattleMoves[sFrontierBrainsMons[facility][symbol][i].moves[j]].effect == EFFECT_FRUSTRATION) + if (gMovesInfo[sFrontierBrainsMons[facility][symbol][i].moves[j]].effect == EFFECT_FRUSTRATION) friendship = 0; } SetMonData(&gEnemyParty[monPartyId], MON_DATA_FRIENDSHIP, &friendship); diff --git a/src/item_menu.c b/src/item_menu.c index cd049f784a8c..0f5c8ba4ee50 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2592,34 +2592,34 @@ static void PrintTMHMMoveData(u16 itemId) else { moveId = ItemIdToBattleMoveId(itemId); - BlitMenuInfoIcon(WIN_TMHM_INFO, gBattleMoves[moveId].type + 1, 0, 0); + BlitMenuInfoIcon(WIN_TMHM_INFO, gMovesInfo[moveId].type + 1, 0, 0); // Print TMHM power - if (gBattleMoves[moveId].power <= 1) + if (gMovesInfo[moveId].power <= 1) { text = gText_ThreeDashes; } else { - ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].power, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[moveId].power, STR_CONV_MODE_RIGHT_ALIGN, 3); text = gStringVar1; } BagMenu_Print(WIN_TMHM_INFO, FONT_NORMAL, text, 7, 12, 0, 0, TEXT_SKIP_DRAW, COLORID_TMHM_INFO); // Print TMHM accuracy - if (gBattleMoves[moveId].accuracy == 0) + if (gMovesInfo[moveId].accuracy == 0) { text = gText_ThreeDashes; } else { - ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[moveId].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3); text = gStringVar1; } BagMenu_Print(WIN_TMHM_INFO, FONT_NORMAL, text, 7, 24, 0, 0, TEXT_SKIP_DRAW, COLORID_TMHM_INFO); // Print TMHM pp - ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].pp, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[moveId].pp, STR_CONV_MODE_RIGHT_ALIGN, 3); BagMenu_Print(WIN_TMHM_INFO, FONT_NORMAL, gStringVar1, 7, 36, 0, 0, TEXT_SKIP_DRAW, COLORID_TMHM_INFO); CopyWindowToVram(WIN_TMHM_INFO, COPYWIN_GFX); diff --git a/src/menu_specialized.c b/src/menu_specialized.c index c9b83edb6e4e..8a0576b057e1 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -776,7 +776,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) CopyWindowToVram(RELEARNERWIN_DESC_BATTLE, COPYWIN_GFX); return; } - move = &gBattleMoves[chosenMove]; + move = &gMovesInfo[chosenMove]; str = gTypeNames[move->type]; AddTextPrinterParameterized(RELEARNERWIN_DESC_BATTLE, FONT_NORMAL, str, 4, 25, TEXT_SKIP_DRAW, NULL); @@ -807,7 +807,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) AddTextPrinterParameterized(RELEARNERWIN_DESC_BATTLE, FONT_NORMAL, str, 106, 41, TEXT_SKIP_DRAW, NULL); if (move->effect != EFFECT_PLACEHOLDER) - str = gBattleMoves[chosenMove].description; + str = gMovesInfo[chosenMove].description; else str = gNotDoneYetDescription; @@ -840,7 +840,7 @@ static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) return; } - move = &gBattleMoves[chosenMove]; + move = &gMovesInfo[chosenMove]; str = gContestMoveTypeTextPointers[move->contestCategory]; AddTextPrinterParameterized(RELEARNERWIN_DESC_CONTEST, FONT_NORMAL, str, 4, 25, TEXT_SKIP_DRAW, NULL); diff --git a/src/move_relearner.c b/src/move_relearner.c index 408a4a975e9e..c049f6b6325c 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -928,7 +928,7 @@ void MoveRelearnerShowHideHearts(s32 moveId) } else { - numHearts = (u8)(gContestEffects[gBattleMoves[moveId].contestEffect].appeal / 10); + numHearts = (u8)(gContestEffects[gMovesInfo[moveId].contestEffect].appeal / 10); if (numHearts == 0xFF) numHearts = 0; @@ -942,7 +942,7 @@ void MoveRelearnerShowHideHearts(s32 moveId) gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = FALSE; } - numHearts = (u8)(gContestEffects[gBattleMoves[moveId].contestEffect].jam / 10); + numHearts = (u8)(gContestEffects[gMovesInfo[moveId].contestEffect].jam / 10); if (numHearts == 0xFF) numHearts = 0; diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 14b323d1bb7d..6b9564ce08d7 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -5347,12 +5347,12 @@ static void PrintStatsScreen_Moves_Top(u8 taskId) //Draw move type icon if (gTasks[taskId].data[5] == 0) { - SetTypeIconPosAndPal(gBattleMoves[move].type, moves_x + 146, moves_y + 17, 0); + SetTypeIconPosAndPal(gMovesInfo[move].type, moves_x + 146, moves_y + 17, 0); SetSpriteInvisibility(1, TRUE); } else { - SetTypeIconPosAndPal(NUMBER_OF_MON_TYPES + gBattleMoves[move].contestCategory, moves_x + 146, moves_y + 17, 1); + SetTypeIconPosAndPal(NUMBER_OF_MON_TYPES + gMovesInfo[move].contestCategory, moves_x + 146, moves_y + 17, 1); SetSpriteInvisibility(0, TRUE); } @@ -5408,12 +5408,12 @@ static void PrintStatsScreen_Moves_Description(u8 taskId) //Move description if (gTasks[taskId].data[5] == 0) { - StringCopy(gStringVar4, gBattleMoves[move].description); + StringCopy(gStringVar4, gMovesInfo[move].description); PrintStatsScreenTextSmall(WIN_STATS_MOVES_DESCRIPTION, gStringVar4, moves_x, moves_y); } else { - StringCopy(gStringVar4, gContestEffectDescriptionPointers[gBattleMoves[move].contestEffect]); + StringCopy(gStringVar4, gContestEffectDescriptionPointers[gMovesInfo[move].contestEffect]); PrintStatsScreenTextSmall(WIN_STATS_MOVES_DESCRIPTION, gStringVar4, moves_x, moves_y); } } @@ -5452,19 +5452,19 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) if (gTasks[taskId].data[5] == 0) { //Power - if (gBattleMoves[move].power < 2) + if (gMovesInfo[move].power < 2) StringCopy(gStringVar1, gText_ThreeDashes); else - ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].power, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[move].power, STR_CONV_MODE_RIGHT_ALIGN, 3); PrintStatsScreenTextSmall(WIN_STATS_MOVES_BOTTOM, gStringVar1, moves_x + 45, moves_y); //Physical/Special/Status Category DestroyCategoryIcon(); ShowCategoryIcon(GetBattleMoveCategory(move)); //Accuracy - if (gBattleMoves[move].accuracy == 0) + if (gMovesInfo[move].accuracy == 0) StringCopy(gStringVar1, gText_ThreeDashes); else - ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[move].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3); PrintStatsScreenTextSmall(WIN_STATS_MOVES_BOTTOM, gStringVar1, moves_x + 114, moves_y); } else //Appeal + Jam @@ -5472,7 +5472,7 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) DestroyCategoryIcon(); gSprites[sPokedexView->categoryIconSpriteId].invisible = TRUE; //Appeal - contest_effectValue = gContestEffects[gBattleMoves[move].contestEffect].appeal; + contest_effectValue = gContestEffects[gMovesInfo[move].contestEffect].appeal; if (contest_effectValue != 0xFF) contest_appeal = contest_effectValue / 10; ConvertIntToDecimalStringN(gStringVar1, contest_appeal, STR_CONV_MODE_RIGHT_ALIGN, 1); @@ -5481,7 +5481,7 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) PrintStatsScreenTextSmall(WIN_STATS_MOVES_BOTTOM, gStringVar2, moves_x + 45, moves_y); //Jam - contest_effectValue = gContestEffects[gBattleMoves[move].contestEffect].jam; + contest_effectValue = gContestEffects[gMovesInfo[move].contestEffect].jam; if (contest_effectValue != 0xFF) contest_jam = contest_effectValue / 10; ConvertIntToDecimalStringN(gStringVar1, contest_jam, STR_CONV_MODE_RIGHT_ALIGN, 1); diff --git a/src/pokemon.c b/src/pokemon.c index 27abe325bfb0..95373d48e330 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1590,7 +1590,7 @@ u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move) if (existingMove == MOVE_NONE) { SetBoxMonData(boxMon, MON_DATA_MOVE1 + i, &move); - SetBoxMonData(boxMon, MON_DATA_PP1 + i, &gBattleMoves[move].pp); + SetBoxMonData(boxMon, MON_DATA_PP1 + i, &gMovesInfo[move].pp); return move; } if (existingMove == move) @@ -1608,7 +1608,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) if (mon->moves[i] == MOVE_NONE) { mon->moves[i] = move; - mon->pp[i] = gBattleMoves[move].pp; + mon->pp[i] = gMovesInfo[move].pp; return move; } } @@ -1619,7 +1619,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot) { SetMonData(mon, MON_DATA_MOVE1 + slot, &move); - SetMonData(mon, MON_DATA_PP1 + slot, &gBattleMoves[move].pp); + SetMonData(mon, MON_DATA_PP1 + slot, &gMovesInfo[move].pp); } static void SetMonMoveSlot_KeepPP(struct Pokemon *mon, u16 move, u8 slot) @@ -1636,7 +1636,7 @@ static void SetMonMoveSlot_KeepPP(struct Pokemon *mon, u16 move, u8 slot) void SetBattleMonMoveSlot(struct BattlePokemon *mon, u16 move, u8 slot) { mon->moves[slot] = move; - mon->pp[slot] = gBattleMoves[move].pp; + mon->pp[slot] = gMovesInfo[move].pp; } void GiveMonInitialMoveset(struct Pokemon *mon) @@ -1693,7 +1693,7 @@ void GiveBoxMonInitialMoveset_Fast(struct BoxPokemon *boxMon) //Credit: Asparagu for (i = MAX_MON_MOVES - 1; i >= 0; i--) { SetBoxMonData(boxMon, MON_DATA_MOVE1 + i, &moves[i]); - SetBoxMonData(boxMon, MON_DATA_PP1 + i, &gBattleMoves[moves[i]].pp); + SetBoxMonData(boxMon, MON_DATA_PP1 + i, &gMovesInfo[moves[i]].pp); } } @@ -1746,7 +1746,7 @@ void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move) ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES, NULL); ppBonuses >>= 2; moves[MAX_MON_MOVES - 1] = move; - pp[MAX_MON_MOVES - 1] = gBattleMoves[move].pp; + pp[MAX_MON_MOVES - 1] = gMovesInfo[move].pp; for (i = 0; i < MAX_MON_MOVES; i++) { @@ -1773,7 +1773,7 @@ void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move) ppBonuses = GetBoxMonData(boxMon, MON_DATA_PP_BONUSES, NULL); ppBonuses >>= 2; moves[MAX_MON_MOVES - 1] = move; - pp[MAX_MON_MOVES - 1] = gBattleMoves[move].pp; + pp[MAX_MON_MOVES - 1] = gMovesInfo[move].pp; for (i = 0; i < MAX_MON_MOVES; i++) { @@ -3157,7 +3157,7 @@ void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord) for (j = 0; j < MAX_MON_MOVES; j++) { SetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j, &gBattleResources->secretBase->party.moves[i * MAX_MON_MOVES + j]); - SetMonData(&gEnemyParty[i], MON_DATA_PP1 + j, &gBattleMoves[gBattleResources->secretBase->party.moves[i * MAX_MON_MOVES + j]].pp); + SetMonData(&gEnemyParty[i], MON_DATA_PP1 + j, &gMovesInfo[gBattleResources->secretBase->party.moves[i * MAX_MON_MOVES + j]].pp); } } } @@ -3274,7 +3274,7 @@ const struct FormChange *GetSpeciesFormChanges(u16 species) u8 CalculatePPWithBonus(u16 move, u8 ppBonuses, u8 moveIndex) { - u8 basePP = gBattleMoves[move].pp; + u8 basePP = gMovesInfo[move].pp; return basePP + ((basePP * 20 * ((gPPUpGetMask[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); } @@ -4206,7 +4206,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s { for (j = 0; j < MAX_MON_MOVES; j++) { - if (gBattleMoves[GetMonData(mon, MON_DATA_MOVE1 + j, NULL)].type == evolutions[i].param) + if (gMovesInfo[GetMonData(mon, MON_DATA_MOVE1 + j, NULL)].type == evolutions[i].param) { targetSpecies = evolutions[i].targetSpecies; break; @@ -6433,7 +6433,7 @@ u16 GetSpeciesPreEvolution(u16 species) const u8 *GetBattleMoveName(u16 moveId) { if (IsZMove(moveId) || IsMaxMove(moveId)) - return gBattleMoves[moveId].name.longMoveName; + return gMovesInfo[moveId].name.longMoveName; - return gBattleMoves[moveId].name.moveName; + return gMovesInfo[moveId].name.moveName; } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index b2caa815c3b3..d784c27c8c70 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2767,7 +2767,7 @@ static void DrawContestMoveHearts(u16 move) if (move != MOVE_NONE) { // Draw appeal hearts - u8 effectValue = gContestEffects[gBattleMoves[move].contestEffect].appeal; + u8 effectValue = gContestEffects[gMovesInfo[move].contestEffect].appeal; if (effectValue != 0xFF) effectValue /= 10; @@ -2780,7 +2780,7 @@ static void DrawContestMoveHearts(u16 move) } // Draw jam hearts - effectValue = gContestEffects[gBattleMoves[move].contestEffect].jam; + effectValue = gContestEffects[gMovesInfo[move].contestEffect].jam; if (effectValue != 0xFF) effectValue /= 10; @@ -3666,25 +3666,25 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex) { FillWindowPixelRect(PSS_LABEL_WINDOW_MOVES_POWER_ACC, PIXEL_FILL(0), 53, 0, 19, 32); - if (gBattleMoves[moveIndex].power < 2) + if (gMovesInfo[moveIndex].power < 2) { text = gText_ThreeDashes; } else { - ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveIndex].power, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[moveIndex].power, STR_CONV_MODE_RIGHT_ALIGN, 3); text = gStringVar1; } PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, text, 53, 1, 0, 0); - if (gBattleMoves[moveIndex].accuracy == 0) + if (gMovesInfo[moveIndex].accuracy == 0) { text = gText_ThreeDashes; } else { - ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveIndex].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[moveIndex].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3); text = gStringVar1; } @@ -3754,7 +3754,7 @@ static void PrintContestMoveDescription(u8 moveSlot) if (move != MOVE_NONE) { u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_DESCRIPTION); - PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gBattleMoves[move].contestEffect], 6, 1, 0, 0); + PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gMovesInfo[move].contestEffect], 6, 1, 0, 0); } } @@ -3767,19 +3767,19 @@ static void PrintMoveDetails(u16 move) { if (sMonSummaryScreen->currPageIndex == PSS_PAGE_BATTLE_MOVES) { - moveEffect = gBattleMoves[move].effect; + moveEffect = gMovesInfo[move].effect; if (B_SHOW_CATEGORY_ICON == TRUE) ShowCategoryIcon(GetBattleMoveCategory(move)); PrintMovePowerAndAccuracy(move); if (moveEffect != EFFECT_PLACEHOLDER) - PrintTextOnWindow(windowId, gBattleMoves[move].description, 6, 1, 0, 0); + PrintTextOnWindow(windowId, gMovesInfo[move].description, 6, 1, 0, 0); else PrintTextOnWindow(windowId, gNotDoneYetDescription, 6, 1, 0, 0); } else { - PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gBattleMoves[move].contestEffect], 6, 1, 0, 0); + PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gMovesInfo[move].contestEffect], 6, 1, 0, 0); } PutWindowTilemap(windowId); } @@ -3809,7 +3809,7 @@ static void PrintNewMoveDetailsOrCancelText(void) else PrintTextOnWindow(windowId1, GetBattleMoveName(move), 0, 65, 0, 5); - ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 2); + ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 2); DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1); @@ -3957,7 +3957,7 @@ static void SetMoveTypeIcons(void) { if (summary->moves[i] != MOVE_NONE) { - SetTypeSpritePosAndPal(gBattleMoves[summary->moves[i]].type, 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); + SetTypeSpritePosAndPal(gMovesInfo[summary->moves[i]].type, 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); } else SetSpriteInvisibility(i + SPRITE_ARR_ID_TYPE, TRUE); @@ -3971,7 +3971,7 @@ static void SetContestMoveTypeIcons(void) for (i = 0; i < MAX_MON_MOVES; i++) { if (summary->moves[i] != MOVE_NONE) - SetTypeSpritePosAndPal(NUMBER_OF_MON_TYPES + gBattleMoves[summary->moves[i]].contestCategory, 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); + SetTypeSpritePosAndPal(NUMBER_OF_MON_TYPES + gMovesInfo[summary->moves[i]].contestCategory, 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); else SetSpriteInvisibility(i + SPRITE_ARR_ID_TYPE, TRUE); } @@ -3986,9 +3986,9 @@ static void SetNewMoveTypeIcon(void) else { if (sMonSummaryScreen->currPageIndex == PSS_PAGE_BATTLE_MOVES) - SetTypeSpritePosAndPal(gBattleMoves[sMonSummaryScreen->newMove].type, 85, 96, SPRITE_ARR_ID_TYPE + 4); + SetTypeSpritePosAndPal(gMovesInfo[sMonSummaryScreen->newMove].type, 85, 96, SPRITE_ARR_ID_TYPE + 4); else - SetTypeSpritePosAndPal(NUMBER_OF_MON_TYPES + gBattleMoves[sMonSummaryScreen->newMove].contestCategory, 85, 96, SPRITE_ARR_ID_TYPE + 4); + SetTypeSpritePosAndPal(NUMBER_OF_MON_TYPES + gMovesInfo[sMonSummaryScreen->newMove].contestCategory, 85, 96, SPRITE_ARR_ID_TYPE + 4); } } diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c index 93939efadd3c..4d473b2b54a8 100644 --- a/src/rom_header_gf.c +++ b/src/rom_header_gf.c @@ -108,7 +108,7 @@ static const struct GFRomHeader sGFRomHeader = { //.monIconPaletteIds = gMonIconPaletteIndices, .monIconPalettes = gMonIconPaletteTable, //.monSpeciesNames = gSpeciesNames, // Handled in gSpeciesInfo - //.moveNames = gMoveNames, // Handled in gBattleMoves + //.moveNames = gMoveNames, // Handled in gMovesInfo .decorations = gDecorations, .flagsOffset = offsetof(struct SaveBlock1, flags), .varsOffset = offsetof(struct SaveBlock1, vars), @@ -154,7 +154,7 @@ static const struct GFRomHeader sGFRomHeader = { //.abilityNames = gAbilityNames, //handled in gAbilities //.abilityDescriptions = gAbilityDescriptionPointers, //handled in gAbilities .items = gItems, - .moves = gBattleMoves, + .moves = gMovesInfo, .ballGfx = gBallSpriteSheets, .ballPalettes = gBallSpritePalettes, .gcnLinkFlagsOffset = offsetof(struct SaveBlock2, gcnLinkFlags), diff --git a/test/battle/ability/anger_shell.c b/test/battle/ability/anger_shell.c index 4c784356746a..3591c4077f26 100644 --- a/test/battle/ability/anger_shell.c +++ b/test/battle/ability/anger_shell.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Anger Shell activates only if the target had more than 50% o PARAMETRIZE { hp = 254; activates = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); PLAYER(SPECIES_KLAWF) { Ability(ABILITY_ANGER_SHELL); MaxHP(maxHp); HP(hp); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Anger Shell lowers Def/Sp.Def by 1 and raises Atk/Sp.Atk/Spd { u16 maxHp = 500; GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_ANGER_SHELL); MaxHP(maxHp); HP(maxHp / 2 + 1); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -72,7 +72,7 @@ SINGLE_BATTLE_TEST("Anger Shell activates after all hits from a multi-hit move") u32 j; u16 maxHp = 500; GIVEN { - ASSUME(gBattleMoves[MOVE_DOUBLE_SLAP].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_DOUBLE_SLAP].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_ANGER_SHELL); MaxHP(maxHp); HP(maxHp / 2 + 1); } OPPONENT(SPECIES_SHELLDER) { Ability(ABILITY_SKILL_LINK); } // Always hits 5 times. } WHEN { diff --git a/test/battle/ability/battle_bond.c b/test/battle/ability/battle_bond.c index 77034f0e463c..5f2b66593af1 100644 --- a/test/battle/ability/battle_bond.c +++ b/test/battle/ability/battle_bond.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_WATER_GUN].power != 0); + ASSUME(gMovesInfo[MOVE_WATER_GUN].power != 0); } SINGLE_BATTLE_TEST("Battle Bond does not transform species other than Greninja") diff --git a/test/battle/ability/beads_of_ruin.c b/test/battle/ability/beads_of_ruin.c index 447a750883e3..807808db7ef5 100644 --- a/test/battle/ability/beads_of_ruin.c +++ b/test/battle/ability/beads_of_ruin.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_ROLE_PLAY].effect == EFFECT_ROLE_PLAY); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_ROLE_PLAY].effect == EFFECT_ROLE_PLAY); } SINGLE_BATTLE_TEST("Beads of Ruin reduces Sp. Def if opposing mon's ability doesn't match") diff --git a/test/battle/ability/blaze.c b/test/battle/ability/blaze.c index 12ccced937cf..a21d133359bf 100644 --- a/test/battle/ability/blaze.c +++ b/test/battle/ability/blaze.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Blaze boosts Fire-type moves in a pinch", s16 damage) PARAMETRIZE { hp = 99; } PARAMETRIZE { hp = 33; } GIVEN { - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); PLAYER(SPECIES_CHARMANDER) { Ability(ABILITY_BLAZE); MaxHP(99); HP(hp); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/cloud_nine.c b/test/battle/ability/cloud_nine.c index e8de0fd8a420..dfe5611fc4be 100644 --- a/test/battle/ability/cloud_nine.c +++ b/test/battle/ability/cloud_nine.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Cloud Nine prevents weather effects") { GIVEN { - ASSUME(gBattleMoves[MOVE_SANDSTORM].effect == EFFECT_SANDSTORM); + ASSUME(gMovesInfo[MOVE_SANDSTORM].effect == EFFECT_SANDSTORM); PLAYER(SPECIES_PSYDUCK) { Ability(ABILITY_CLOUD_NINE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/compound_eyes.c b/test/battle/ability/compound_eyes.c index cc005943bb8f..32fa1dda2edf 100644 --- a/test/battle/ability/compound_eyes.c +++ b/test/battle/ability/compound_eyes.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Compound Eyes raises accuracy") { PASSES_RANDOMLY(91, 100, RNG_ACCURACY); GIVEN { - ASSUME(gBattleMoves[MOVE_THUNDER].accuracy == 70); + ASSUME(gMovesInfo[MOVE_THUNDER].accuracy == 70); PLAYER(SPECIES_BUTTERFREE) { Ability(ABILITY_COMPOUND_EYES); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -20,8 +20,8 @@ SINGLE_BATTLE_TEST("Compound Eyes does not affect OHKO moves") { PASSES_RANDOMLY(30, 100, RNG_ACCURACY); GIVEN { - ASSUME(gBattleMoves[MOVE_FISSURE].accuracy == 30); - ASSUME(gBattleMoves[MOVE_FISSURE].effect == EFFECT_OHKO); + ASSUME(gMovesInfo[MOVE_FISSURE].accuracy == 30); + ASSUME(gMovesInfo[MOVE_FISSURE].effect == EFFECT_OHKO); PLAYER(SPECIES_BUTTERFREE) { Ability(ABILITY_COMPOUND_EYES); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/contrary.c b/test/battle/ability/contrary.c index dc2d2cffe751..ee9014d38c33 100644 --- a/test/battle/ability/contrary.c +++ b/test/battle/ability/contrary.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Contrary raises Attack when Intimidated in a single battle", s16 damage) @@ -83,7 +83,7 @@ SINGLE_BATTLE_TEST("Contrary raises stats after using a move which would normall PARAMETRIZE { ability = ABILITY_TANGLED_FEET; } GIVEN { ASSUME(MoveHasMoveEffectSelf(MOVE_OVERHEAT, MOVE_EFFECT_SP_ATK_TWO_DOWN) == TRUE); - ASSUME(gBattleMoves[MOVE_OVERHEAT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_OVERHEAT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_SPINDA) { Ability(ability); } } WHEN { @@ -126,7 +126,7 @@ SINGLE_BATTLE_TEST("Contrary lowers a stat after using a move which would normal PARAMETRIZE { ability = ABILITY_CONTRARY; } PARAMETRIZE { ability = ABILITY_TANGLED_FEET; } GIVEN { - ASSUME(gBattleMoves[MOVE_SWORDS_DANCE].effect == EFFECT_ATTACK_UP_2); + ASSUME(gMovesInfo[MOVE_SWORDS_DANCE].effect == EFFECT_ATTACK_UP_2); PLAYER(SPECIES_WOBBUFFET) { Defense(102); } OPPONENT(SPECIES_SPINDA) { Ability(ability); Attack(100); } } WHEN { @@ -163,7 +163,7 @@ SINGLE_BATTLE_TEST("Contrary raises a stat after using a move which would normal PARAMETRIZE { ability = ABILITY_CONTRARY; } PARAMETRIZE { ability = ABILITY_TANGLED_FEET; } GIVEN { - ASSUME(gBattleMoves[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); PLAYER(SPECIES_WOBBUFFET) { Speed(3); } OPPONENT(SPECIES_SPINDA) { Ability(ability); Speed(2); } } WHEN { @@ -194,7 +194,7 @@ SINGLE_BATTLE_TEST("Contrary lowers a stat after using a move which would normal PARAMETRIZE { ability = ABILITY_CONTRARY; } PARAMETRIZE { ability = ABILITY_TANGLED_FEET; } GIVEN { - ASSUME(gBattleMoves[MOVE_BELLY_DRUM].effect == EFFECT_BELLY_DRUM); + ASSUME(gMovesInfo[MOVE_BELLY_DRUM].effect == EFFECT_BELLY_DRUM); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_SPINDA) { Ability(ability); } } WHEN { diff --git a/test/battle/ability/corrosion.c b/test/battle/ability/corrosion.c index ba64f4d58bf4..54bd40d1c6fb 100644 --- a/test/battle/ability/corrosion.c +++ b/test/battle/ability/corrosion.c @@ -30,8 +30,8 @@ SINGLE_BATTLE_TEST("Corrosion can poison or badly poison a Steel type with a sta PARAMETRIZE { move = MOVE_TOXIC; } GIVEN { - ASSUME(gBattleMoves[MOVE_POISON_POWDER].effect == EFFECT_POISON); - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_POISON_POWDER].effect == EFFECT_POISON); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); } OPPONENT(SPECIES_BELDUM); } WHEN { @@ -72,7 +72,7 @@ SINGLE_BATTLE_TEST("Corrosion can poison Poison- and Steel-type targets if it us PARAMETRIZE { heldItem = ITEM_TOXIC_ORB; } GIVEN { - ASSUME(gBattleMoves[MOVE_FLING].effect == EFFECT_FLING); + ASSUME(gMovesInfo[MOVE_FLING].effect == EFFECT_FLING); ASSUME(gItems[ITEM_POISON_BARB].holdEffect == HOLD_EFFECT_POISON_POWER); ASSUME(gItems[ITEM_TOXIC_ORB].holdEffect == HOLD_EFFECT_TOXIC_ORB); PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); Item(heldItem); } @@ -107,7 +107,7 @@ SINGLE_BATTLE_TEST("If a Poison- or Steel-type Pokémon with Corrosion holds a T SINGLE_BATTLE_TEST("If a Poison- or Steel-type Pokémon with Corrosion poisons a target with Synchronize, Synchronize will not poison Poison- or Steel-type Pokémon") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); } OPPONENT(SPECIES_ABRA) { Ability(ABILITY_SYNCHRONIZE); } } WHEN { diff --git a/test/battle/ability/cute_charm.c b/test/battle/ability/cute_charm.c index 54ca0c2907fb..af9815e75081 100644 --- a/test/battle/ability/cute_charm.c +++ b/test/battle/ability/cute_charm.c @@ -7,15 +7,15 @@ SINGLE_BATTLE_TEST("Cute Charm inflicts infatuation on contact") PARAMETRIZE { move = MOVE_TACKLE; } PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(!gBattleMoves[MOVE_SWIFT].makesContact); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); + ASSUME(!gMovesInfo[MOVE_SWIFT].makesContact); PLAYER(SPECIES_WOBBUFFET) { Gender(MON_MALE); } OPPONENT(SPECIES_CLEFAIRY) { Gender(MON_FEMALE); Ability(ABILITY_CUTE_CHARM); } } WHEN { TURN { MOVE(player, move); } TURN { MOVE(player, move); } } SCENE { - if (gBattleMoves[move].makesContact) { + if (gMovesInfo[move].makesContact) { ABILITY_POPUP(opponent, ABILITY_CUTE_CHARM); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_INFATUATION, player); MESSAGE("Foe Clefairy's Cute Charm infatuated Wobbuffet!"); diff --git a/test/battle/ability/damp.c b/test/battle/ability/damp.c index 46e378c5fd40..9a3b795f2ae1 100644 --- a/test/battle/ability/damp.c +++ b/test/battle/ability/damp.c @@ -60,7 +60,7 @@ SINGLE_BATTLE_TEST("Damp prevents explosion-like moves from self") SINGLE_BATTLE_TEST("Damp prevents damage from aftermath") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); PLAYER(SPECIES_PARAS) { Ability(ABILITY_DAMP); } OPPONENT(SPECIES_VOLTORB) { Ability(ABILITY_AFTERMATH); HP(1); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/defeatist.c b/test/battle/ability/defeatist.c index 8c3c208b64f1..2fac6ecd2988 100644 --- a/test/battle/ability/defeatist.c +++ b/test/battle/ability/defeatist.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_ECHOED_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ECHOED_VOICE].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Defeatist halves Attack when HP <= 50%", s16 damage) diff --git a/test/battle/ability/desolate_land.c b/test/battle/ability/desolate_land.c index ca52c9cd6c32..a8c9f7749c46 100644 --- a/test/battle/ability/desolate_land.c +++ b/test/battle/ability/desolate_land.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_WATER_GUN].power != 0); - ASSUME(gBattleMoves[MOVE_WATER_GUN].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_WATER_GUN].power != 0); + ASSUME(gMovesInfo[MOVE_WATER_GUN].type == TYPE_WATER); } SINGLE_BATTLE_TEST("Desolate Land blocks damaging Water-type moves") @@ -32,9 +32,9 @@ SINGLE_BATTLE_TEST("Desolate Land blocks damaging Water-type moves") DOUBLE_BATTLE_TEST("Desolate Land blocks damaging Water-type moves and prints the message only once with moves hitting multiple targets") { GIVEN { - ASSUME(gBattleMoves[MOVE_SURF].power != 0); - ASSUME(gBattleMoves[MOVE_SURF].type == TYPE_WATER); - ASSUME(gBattleMoves[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gMovesInfo[MOVE_SURF].power != 0); + ASSUME(gMovesInfo[MOVE_SURF].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY); PLAYER(SPECIES_GROUDON) {Item(ITEM_RED_ORB); {Speed(5);}} PLAYER(SPECIES_WOBBUFFET) {Speed(5);} OPPONENT(SPECIES_WOBBUFFET) {Speed(10);} diff --git a/test/battle/ability/download.c b/test/battle/ability/download.c index 6546311a4a8f..1b2856ce133f 100644 --- a/test/battle/ability/download.c +++ b/test/battle/ability/download.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_TRI_ATTACK].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TRI_ATTACK].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Download raises Attack if player has lower Def than Sp. Def", s16 damage) @@ -59,7 +59,7 @@ SINGLE_BATTLE_TEST("Download doesn't activate if target hasn't been sent out yet PARAMETRIZE { ability = ABILITY_TRACE; } PARAMETRIZE { ability = ABILITY_DOWNLOAD; } GIVEN { - ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); + ASSUME(gMovesInfo[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET) { Speed(100); } PLAYER(SPECIES_PORYGON) { Ability(ability); Defense(400); SpDefense(300); Speed(300); Attack(100); } OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(100); } diff --git a/test/battle/ability/dragons_maw.c b/test/battle/ability/dragons_maw.c index e05c47bfd5db..fe1198e1eccc 100644 --- a/test/battle/ability/dragons_maw.c +++ b/test/battle/ability/dragons_maw.c @@ -14,11 +14,11 @@ SINGLE_BATTLE_TEST("Dragon's Maw increases Dragon-type move damage", s16 damage) PARAMETRIZE { move = MOVE_DRAGON_BREATH; ability = ABILITY_DRAGONS_MAW; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_DRAGON); - ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].type == TYPE_DRAGON); - ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].type == TYPE_DRAGON); - ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_DRAGON); + ASSUME(gMovesInfo[MOVE_DRAGON_CLAW].type == TYPE_DRAGON); + ASSUME(gMovesInfo[MOVE_DRAGON_BREATH].type == TYPE_DRAGON); + ASSUME(gMovesInfo[MOVE_DRAGON_CLAW].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_DRAGON_BREATH].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_REGIDRAGO) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/dry_skin.c b/test/battle/ability/dry_skin.c index db0b61f2d3b2..e91daa1641b1 100644 --- a/test/battle/ability/dry_skin.c +++ b/test/battle/ability/dry_skin.c @@ -35,8 +35,8 @@ SINGLE_BATTLE_TEST("Dry Skin increases damage taken from Fire-type moves by 25%" PARAMETRIZE { ability = ABILITY_EFFECT_SPORE; } PARAMETRIZE { ability = ABILITY_DRY_SKIN; } GIVEN { - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); - ASSUME(gBattleMoves[MOVE_EMBER].power == 40); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_EMBER].power == 40); ASSUME(gSpeciesInfo[SPECIES_PARASECT].types[0] == TYPE_BUG); ASSUME(gSpeciesInfo[SPECIES_PARASECT].types[1] == TYPE_GRASS); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[0] == TYPE_PSYCHIC); @@ -60,7 +60,7 @@ SINGLE_BATTLE_TEST("Dry Skin increases damage taken from Fire-type moves by 25%" SINGLE_BATTLE_TEST("Dry Skin heals 25% when hit by water type moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_BUBBLE].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_BUBBLE].type == TYPE_WATER); PLAYER(SPECIES_PARASECT) { Ability(ABILITY_DRY_SKIN); HP(100); MaxHP(200); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -75,7 +75,7 @@ SINGLE_BATTLE_TEST("Dry Skin heals 25% when hit by water type moves") SINGLE_BATTLE_TEST("Dry Skin does not activate if protected") { GIVEN { - ASSUME(gBattleMoves[MOVE_BUBBLE].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_BUBBLE].type == TYPE_WATER); PLAYER(SPECIES_PARASECT) { Ability(ABILITY_DRY_SKIN); HP(100); MaxHP(200); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -88,8 +88,8 @@ SINGLE_BATTLE_TEST("Dry Skin does not activate if protected") SINGLE_BATTLE_TEST("Dry Skin is only triggered once on multi strike moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_WATER_SHURIKEN].type == TYPE_WATER); - ASSUME(gBattleMoves[MOVE_WATER_SHURIKEN].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_WATER_SHURIKEN].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_WATER_SHURIKEN].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_PARASECT) { Ability(ABILITY_DRY_SKIN); HP(100); MaxHP(200); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -107,7 +107,7 @@ SINGLE_BATTLE_TEST("Dry Skin prevents Absorb Bulb and Luminous Moss from activat PARAMETRIZE { item = ITEM_ABSORB_BULB; } PARAMETRIZE { item = ITEM_LUMINOUS_MOSS; } GIVEN { - ASSUME(gBattleMoves[MOVE_BUBBLE].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_BUBBLE].type == TYPE_WATER); PLAYER(SPECIES_PARASECT) { Ability(ABILITY_DRY_SKIN); HP(100); MaxHP(200); Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/earth_eater.c b/test/battle/ability/earth_eater.c index fb0ddf620949..220a79df7325 100644 --- a/test/battle/ability/earth_eater.c +++ b/test/battle/ability/earth_eater.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Earth Eater heals 25% when hit by ground type moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_MUD_SLAP].type == TYPE_GROUND); + ASSUME(gMovesInfo[MOVE_MUD_SLAP].type == TYPE_GROUND); PLAYER(SPECIES_ORTHWORM) { Ability(ABILITY_EARTH_EATER); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -19,7 +19,7 @@ SINGLE_BATTLE_TEST("Earth Eater heals 25% when hit by ground type moves") SINGLE_BATTLE_TEST("Earth Eater does not activate if protected") { GIVEN { - ASSUME(gBattleMoves[MOVE_MUD_SLAP].type == TYPE_GROUND); + ASSUME(gMovesInfo[MOVE_MUD_SLAP].type == TYPE_GROUND); PLAYER(SPECIES_ORTHWORM) { Ability(ABILITY_EARTH_EATER); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -35,8 +35,8 @@ SINGLE_BATTLE_TEST("Earth Eater does not activate if protected") SINGLE_BATTLE_TEST("Earth Eater activates on status moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_SAND_ATTACK].type == TYPE_GROUND); - ASSUME(gBattleMoves[MOVE_SAND_ATTACK].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_SAND_ATTACK].type == TYPE_GROUND); + ASSUME(gMovesInfo[MOVE_SAND_ATTACK].category == BATTLE_CATEGORY_STATUS); PLAYER(SPECIES_ORTHWORM) { Ability(ABILITY_EARTH_EATER); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/electromorphosis.c b/test/battle/ability/electromorphosis.c index 58c9afbe994c..09a17dd55f44 100644 --- a/test/battle/ability/electromorphosis.c +++ b/test/battle/ability/electromorphosis.c @@ -10,12 +10,12 @@ SINGLE_BATTLE_TEST("Electromorphosis sets up Charge when hit by any move") PARAMETRIZE {move = MOVE_GUST; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].power != 0); - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_GUST].power != 0); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].power != 0); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); PLAYER(SPECIES_BELLIBOLT) { Ability(ABILITY_ELECTROMORPHOSIS); Speed(10); } OPPONENT(SPECIES_WOBBUFFET) {Ability(ABILITY_LIMBER); Speed(5) ;} // Limber, so it doesn't get paralyzed. diff --git a/test/battle/ability/flame_body.c b/test/battle/ability/flame_body.c index b275c20e1c4a..84d2cd48f254 100644 --- a/test/battle/ability/flame_body.c +++ b/test/battle/ability/flame_body.c @@ -7,14 +7,14 @@ SINGLE_BATTLE_TEST("Flame Body inflicts burn on contact") PARAMETRIZE { move = MOVE_TACKLE; } PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(!gBattleMoves[MOVE_SWIFT].makesContact); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); + ASSUME(!gMovesInfo[MOVE_SWIFT].makesContact); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_MAGMAR) { Ability(ABILITY_FLAME_BODY); } } WHEN { TURN { MOVE(player, move); } } SCENE { - if (gBattleMoves[move].makesContact) { + if (gMovesInfo[move].makesContact) { ABILITY_POPUP(opponent, ABILITY_FLAME_BODY); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_BRN, player); MESSAGE("Foe Magmar's Flame Body burned Wobbuffet!"); diff --git a/test/battle/ability/flower_gift.c b/test/battle/ability/flower_gift.c index 2ef144418bba..5dc6865fcde6 100644 --- a/test/battle/ability/flower_gift.c +++ b/test/battle/ability/flower_gift.c @@ -67,7 +67,7 @@ DOUBLE_BATTLE_TEST("Flower Gift increases the attack of Cherrim and its allies b PARAMETRIZE { sunny = FALSE; } PARAMETRIZE { sunny = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -102,7 +102,7 @@ DOUBLE_BATTLE_TEST("Flower Gift increases the Sp. Def of Cherrim and its allies PARAMETRIZE { sunny = FALSE; } PARAMETRIZE { sunny = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_HYPER_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_HYPER_VOICE].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/fluffy.c b/test/battle/ability/fluffy.c index 67e992d8afa9..30a8b83182d0 100644 --- a/test/battle/ability/fluffy.c +++ b/test/battle/ability/fluffy.c @@ -3,11 +3,11 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(gBattleMoves[MOVE_FIRE_PUNCH].makesContact); - ASSUME(gBattleMoves[MOVE_FIRE_PUNCH].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); + ASSUME(gMovesInfo[MOVE_FIRE_PUNCH].makesContact); + ASSUME(gMovesInfo[MOVE_FIRE_PUNCH].type == TYPE_FIRE); } SINGLE_BATTLE_TEST("Fluffy halves damage taken from moves that make direct contact", s16 damage) diff --git a/test/battle/ability/frisk.c b/test/battle/ability/frisk.c index 916a0eaa28c2..dd6d0f691f64 100644 --- a/test/battle/ability/frisk.c +++ b/test/battle/ability/frisk.c @@ -42,7 +42,7 @@ DOUBLE_BATTLE_TEST("Frisk triggers for player in a Double Battle after switching PARAMETRIZE { targetLeft = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_POUND].power != 0); + ASSUME(gMovesInfo[MOVE_POUND].power != 0); PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); }; @@ -65,7 +65,7 @@ DOUBLE_BATTLE_TEST("Frisk triggers for opponent in a Double Battle after switchi PARAMETRIZE { targetLeft = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_POUND].power != 0); + ASSUME(gMovesInfo[MOVE_POUND].power != 0); PLAYER(SPECIES_WYNAUT) { Item(ITEM_POTION); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET) { HP(1); } diff --git a/test/battle/ability/gale_wings.c b/test/battle/ability/gale_wings.c index d44bfb4d4ee0..d8a3873be81c 100644 --- a/test/battle/ability/gale_wings.c +++ b/test/battle/ability/gale_wings.c @@ -8,7 +8,7 @@ SINGLE_BATTLE_TEST("Gale Wings only grants priority at full HP") PARAMETRIZE { hp = 99; } GIVEN { ASSUME(B_GALE_WINGS >= GEN_7); - ASSUME(gBattleMoves[MOVE_AERIAL_ACE].type == TYPE_FLYING); + ASSUME(gMovesInfo[MOVE_AERIAL_ACE].type == TYPE_FLYING); PLAYER(SPECIES_TALONFLAME) { Ability(ABILITY_GALE_WINGS); HP(hp); MaxHP(100); Speed(1);} OPPONENT(SPECIES_WOBBUFFET) { Speed(100);}; } WHEN { @@ -32,8 +32,8 @@ SINGLE_BATTLE_TEST("Gale Wings only grants priority to Flying-type moves") PARAMETRIZE { move = MOVE_FLARE_BLITZ; } GIVEN { ASSUME(B_GALE_WINGS >= GEN_7); - ASSUME(gBattleMoves[MOVE_AERIAL_ACE].type == TYPE_FLYING); - ASSUME(gBattleMoves[MOVE_FLARE_BLITZ].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_AERIAL_ACE].type == TYPE_FLYING); + ASSUME(gMovesInfo[MOVE_FLARE_BLITZ].type == TYPE_FIRE); PLAYER(SPECIES_TALONFLAME) { Ability(ABILITY_GALE_WINGS); HP(100); MaxHP(100); Speed(1);} OPPONENT(SPECIES_WOBBUFFET) { Speed(100);}; } WHEN { diff --git a/test/battle/ability/hyper_cutter.c b/test/battle/ability/hyper_cutter.c index 90ba7aeb270f..c9ae17170af3 100644 --- a/test/battle/ability/hyper_cutter.c +++ b/test/battle/ability/hyper_cutter.c @@ -29,7 +29,7 @@ SINGLE_BATTLE_TEST("Hyper Cutter prevents intimidate") SINGLE_BATTLE_TEST("Hyper Cutter prevents Attack stage reduction from moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_KRABBY) { Ability(ABILITY_HYPER_CUTTER); } } WHEN { @@ -43,7 +43,7 @@ SINGLE_BATTLE_TEST("Hyper Cutter prevents Attack stage reduction from moves") SINGLE_BATTLE_TEST("Hyper Cutter doesn't prevent Attack reduction from burn") { GIVEN { - ASSUME(gBattleMoves[MOVE_WILL_O_WISP].effect == EFFECT_WILL_O_WISP); + ASSUME(gMovesInfo[MOVE_WILL_O_WISP].effect == EFFECT_WILL_O_WISP); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_KRABBY) { Ability(ABILITY_HYPER_CUTTER); } } WHEN { @@ -59,7 +59,7 @@ SINGLE_BATTLE_TEST("Hyper Cutter doesn't prevent Attack reduction from burn") SINGLE_BATTLE_TEST("Hyper Cutter is ignored by Mold Breaker") { GIVEN { - ASSUME(gBattleMoves[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); } OPPONENT(SPECIES_KRABBY) { Ability(ABILITY_HYPER_CUTTER); } } WHEN { @@ -97,8 +97,8 @@ SINGLE_BATTLE_TEST("Hyper Cutter doesn't prevent Attack stage reduction from mov SINGLE_BATTLE_TEST("Hyper Cutter doesn't prevent Topsy-Turvy") { GIVEN { - ASSUME(gBattleMoves[MOVE_SWORDS_DANCE].effect == EFFECT_ATTACK_UP_2); - ASSUME(gBattleMoves[MOVE_TOPSY_TURVY].effect == EFFECT_TOPSY_TURVY); + ASSUME(gMovesInfo[MOVE_SWORDS_DANCE].effect == EFFECT_ATTACK_UP_2); + ASSUME(gMovesInfo[MOVE_TOPSY_TURVY].effect == EFFECT_TOPSY_TURVY); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_KRABBY) { Ability(ABILITY_HYPER_CUTTER); } } WHEN { @@ -116,7 +116,7 @@ SINGLE_BATTLE_TEST("Hyper Cutter doesn't prevent Topsy-Turvy") SINGLE_BATTLE_TEST("Hyper Cutter doesn't prevent Spectral Thief from resetting positive Attack stage changes") { GIVEN { - ASSUME(gBattleMoves[MOVE_SWORDS_DANCE].effect == EFFECT_ATTACK_UP_2); + ASSUME(gMovesInfo[MOVE_SWORDS_DANCE].effect == EFFECT_ATTACK_UP_2); ASSUME(MoveHasMoveEffect(MOVE_SPECTRAL_THIEF, MOVE_EFFECT_SPECTRAL_THIEF)); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_KRABBY) { Ability(ABILITY_HYPER_CUTTER); } @@ -135,8 +135,8 @@ SINGLE_BATTLE_TEST("Hyper Cutter doesn't prevent Spectral Thief from resetting p SINGLE_BATTLE_TEST("Hyper Cutter doesn't prevent receiving negative Attack stage changes from Baton Pass") { GIVEN { - ASSUME(gBattleMoves[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); - ASSUME(gBattleMoves[MOVE_BATON_PASS].effect == EFFECT_BATON_PASS); + ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_BATON_PASS].effect == EFFECT_BATON_PASS); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_KRABBY) { Ability(ABILITY_HYPER_CUTTER); } diff --git a/test/battle/ability/ice_scales.c b/test/battle/ability/ice_scales.c index 5d1db524a234..6b950720386d 100644 --- a/test/battle/ability/ice_scales.c +++ b/test/battle/ability/ice_scales.c @@ -12,10 +12,10 @@ SINGLE_BATTLE_TEST("Ice Scales halves the damage from special moves", s16 damage PARAMETRIZE { ability = ABILITY_SHIELD_DUST; move = MOVE_TACKLE; } PARAMETRIZE { ability = ABILITY_ICE_SCALES; move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_PSYSHOCK].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_PSYSHOCK].effect == EFFECT_PSYSHOCK); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_PSYSHOCK].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_PSYSHOCK].effect == EFFECT_PSYSHOCK); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_FROSMOTH) { Ability(ability); } } WHEN { diff --git a/test/battle/ability/immunity.c b/test/battle/ability/immunity.c index c92e9041e1a1..8c9d4f8da864 100644 --- a/test/battle/ability/immunity.c +++ b/test/battle/ability/immunity.c @@ -18,7 +18,7 @@ SINGLE_BATTLE_TEST("Immunity prevents Poison Sting poison") SINGLE_BATTLE_TEST("Immunity prevents Toxic bad poison") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_SNORLAX) { Ability(ABILITY_IMMUNITY); } } WHEN { @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Immunity prevents Toxic bad poison") SINGLE_BATTLE_TEST("Immunity prevents Toxic Spikes poison") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); + ASSUME(gMovesInfo[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_SNORLAX) { Ability(ABILITY_IMMUNITY); } diff --git a/test/battle/ability/innards_out.c b/test/battle/ability/innards_out.c index f7b87d08e924..1577385cf1ca 100644 --- a/test/battle/ability/innards_out.c +++ b/test/battle/ability/innards_out.c @@ -14,8 +14,8 @@ SINGLE_BATTLE_TEST("Innards Out deal dmg on fainting equal to the amount of dmg PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { HP(70); SpAttack(1000); } OPPONENT(SPECIES_WOBBUFFET); - ASSUME(gBattleMoves[MOVE_PSYCHIC].power != 0); - ASSUME(gBattleMoves[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_PSYCHIC].power != 0); + ASSUME(gMovesInfo[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); } WHEN { TURN { MOVE(opponent, MOVE_PSYCHIC); SEND_OUT(player, 1); if (hp == 100) { SEND_OUT(opponent, 1); } } } SCENE { @@ -32,8 +32,8 @@ SINGLE_BATTLE_TEST("Innards Out does not trigger after Gastro Acid has been used PLAYER(SPECIES_PYUKUMUKU) { HP(1); Ability(ABILITY_INNARDS_OUT); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); - ASSUME(gBattleMoves[MOVE_PSYCHIC].power != 0); - ASSUME(gBattleMoves[MOVE_GASTRO_ACID].effect == EFFECT_GASTRO_ACID); + ASSUME(gMovesInfo[MOVE_PSYCHIC].power != 0); + ASSUME(gMovesInfo[MOVE_GASTRO_ACID].effect == EFFECT_GASTRO_ACID); } WHEN { TURN { MOVE(opponent, MOVE_GASTRO_ACID); } TURN { MOVE(opponent, MOVE_PSYCHIC); SEND_OUT(player, 1); } @@ -55,7 +55,7 @@ SINGLE_BATTLE_TEST("Innards Out does not damage Magic Guard Pokemon") PLAYER(SPECIES_PYUKUMUKU) { HP(1); Ability(ABILITY_INNARDS_OUT); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_CLEFABLE) { Ability(ABILITY_MAGIC_GUARD); } - ASSUME(gBattleMoves[MOVE_PSYCHIC].power != 0); + ASSUME(gMovesInfo[MOVE_PSYCHIC].power != 0); } WHEN { TURN { MOVE(opponent, MOVE_PSYCHIC); SEND_OUT(player, 1); } } SCENE { diff --git a/test/battle/ability/insomnia.c b/test/battle/ability/insomnia.c index cb22be925206..3098ce6d3f4b 100644 --- a/test/battle/ability/insomnia.c +++ b/test/battle/ability/insomnia.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Insomnia prevents sleep") { GIVEN { - ASSUME(gBattleMoves[MOVE_SPORE].effect == EFFECT_SLEEP); + ASSUME(gMovesInfo[MOVE_SPORE].effect == EFFECT_SLEEP); PLAYER(SPECIES_DROWZEE) { Ability(ABILITY_INSOMNIA); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -22,7 +22,7 @@ SINGLE_BATTLE_TEST("Insomnia prevents sleep") SINGLE_BATTLE_TEST("Insomnia prevents yawn") { GIVEN { - ASSUME(gBattleMoves[MOVE_YAWN].effect == EFFECT_YAWN); + ASSUME(gMovesInfo[MOVE_YAWN].effect == EFFECT_YAWN); PLAYER(SPECIES_DROWZEE) { Ability(ABILITY_INSOMNIA); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -42,7 +42,7 @@ SINGLE_BATTLE_TEST("Insomnia prevents yawn") SINGLE_BATTLE_TEST("Insomnia prevents rest") { GIVEN { - ASSUME(gBattleMoves[MOVE_REST].effect == EFFECT_REST); + ASSUME(gMovesInfo[MOVE_REST].effect == EFFECT_REST); PLAYER(SPECIES_DROWZEE) { Ability(ABILITY_INSOMNIA); HP(1); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/intimidate.c b/test/battle/ability/intimidate.c index c64bdaeebf20..38187f32c435 100644 --- a/test/battle/ability/intimidate.c +++ b/test/battle/ability/intimidate.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch out", s16 damage) @@ -60,7 +60,7 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after KO", s16 DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double battle") { GIVEN { - ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); + ASSUME(gMovesInfo[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } diff --git a/test/battle/ability/keen_eye.c b/test/battle/ability/keen_eye.c index 6f3e63c5b545..61515269b9af 100644 --- a/test/battle/ability/keen_eye.c +++ b/test/battle/ability/keen_eye.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].accuracy == 100); - ASSUME(gBattleMoves[MOVE_SAND_ATTACK].effect == EFFECT_ACCURACY_DOWN); + ASSUME(gMovesInfo[MOVE_TACKLE].accuracy == 100); + ASSUME(gMovesInfo[MOVE_SAND_ATTACK].effect == EFFECT_ACCURACY_DOWN); ASSUME(B_ILLUMINATE_EFFECT >= GEN_9); } @@ -47,7 +47,7 @@ SINGLE_BATTLE_TEST("Keen Eye, Gen9+ Illuminate & Minds Eye ignore target's evasi PASSES_RANDOMLY(100, 100, RNG_ACCURACY); GIVEN { - ASSUME(gBattleMoves[MOVE_DOUBLE_TEAM].effect == EFFECT_EVASION_UP); + ASSUME(gMovesInfo[MOVE_DOUBLE_TEAM].effect == EFFECT_EVASION_UP); PLAYER(SPECIES_WOBBUFFET); OPPONENT(species) { Ability(ability); } } WHEN { @@ -78,7 +78,7 @@ SINGLE_BATTLE_TEST("Keen Eye, Gen9+ Illuminate & Minds Eye are ignored by Mold B PARAMETRIZE { speciesOpponent = SPECIES_URSALUNA_BLOODMOON; abilityOpponent = ABILITY_MINDS_EYE; } } - PASSES_RANDOMLY(gBattleMoves[MOVE_TACKLE].accuracy * 3 / 4, 100, RNG_ACCURACY); + PASSES_RANDOMLY(gMovesInfo[MOVE_TACKLE].accuracy * 3 / 4, 100, RNG_ACCURACY); GIVEN { PLAYER(speciesPlayer) { Ability(abilityPlayer); } OPPONENT(speciesOpponent) { Ability(abilityOpponent); } @@ -102,8 +102,8 @@ SINGLE_BATTLE_TEST("Keen Eye, Gen9+ Illuminate & Minds Eye don't prevent Topsy-T PARAMETRIZE { species = SPECIES_URSALUNA_BLOODMOON; ability = ABILITY_MINDS_EYE; } GIVEN { - ASSUME(gBattleMoves[MOVE_HONE_CLAWS].effect == EFFECT_ATTACK_ACCURACY_UP); - ASSUME(gBattleMoves[MOVE_TOPSY_TURVY].effect == EFFECT_TOPSY_TURVY); + ASSUME(gMovesInfo[MOVE_HONE_CLAWS].effect == EFFECT_ATTACK_ACCURACY_UP); + ASSUME(gMovesInfo[MOVE_TOPSY_TURVY].effect == EFFECT_TOPSY_TURVY); PLAYER(SPECIES_WOBBUFFET); OPPONENT(species) { Ability(ability); } } WHEN { @@ -141,7 +141,7 @@ SINGLE_BATTLE_TEST("Keen Eye, Gen9+ Illuminate & Minds Eye don't prevent receivi PARAMETRIZE { species = SPECIES_URSALUNA_BLOODMOON; ability = ABILITY_MINDS_EYE; } GIVEN { - ASSUME(gBattleMoves[MOVE_BATON_PASS].effect == EFFECT_BATON_PASS); + ASSUME(gMovesInfo[MOVE_BATON_PASS].effect == EFFECT_BATON_PASS); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(species) { Ability(ability); } @@ -173,7 +173,7 @@ SINGLE_BATTLE_TEST("Keen Eye & Gen9+ Illuminate don't prevent Spectral Thief fro PARAMETRIZE { species = SPECIES_STARYU; ability = ABILITY_ILLUMINATE; } GIVEN { - ASSUME(gBattleMoves[MOVE_HONE_CLAWS].effect == EFFECT_ATTACK_ACCURACY_UP); + ASSUME(gMovesInfo[MOVE_HONE_CLAWS].effect == EFFECT_ATTACK_ACCURACY_UP); ASSUME(MoveHasMoveEffect(MOVE_SPECTRAL_THIEF, MOVE_EFFECT_SPECTRAL_THIEF) == TRUE); PLAYER(SPECIES_WOBBUFFET); OPPONENT(species) { Ability(ability); } diff --git a/test/battle/ability/leaf_guard.c b/test/battle/ability/leaf_guard.c index 9d9dd211f74b..315ed4130037 100644 --- a/test/battle/ability/leaf_guard.c +++ b/test/battle/ability/leaf_guard.c @@ -11,10 +11,10 @@ SINGLE_BATTLE_TEST("Leaf Guard prevents non-volatile status conditions in sun") PARAMETRIZE { move = MOVE_TOXIC; status = STATUS1_TOXIC_POISON; } // PARAMETRIZE { move = MOVE_POWDER_SNOW; status = STATUS1_FREEZE; } // Pointless since you can't freeze in sunlight anyway GIVEN { - ASSUME(gBattleMoves[MOVE_WILL_O_WISP].effect == EFFECT_WILL_O_WISP); - ASSUME(gBattleMoves[MOVE_HYPNOSIS].effect == EFFECT_SLEEP); - ASSUME(gBattleMoves[MOVE_THUNDER_WAVE].effect == EFFECT_PARALYZE); - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_WILL_O_WISP].effect == EFFECT_WILL_O_WISP); + ASSUME(gMovesInfo[MOVE_HYPNOSIS].effect == EFFECT_SLEEP); + ASSUME(gMovesInfo[MOVE_THUNDER_WAVE].effect == EFFECT_PARALYZE); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_LEAFEON) { Ability(ABILITY_LEAF_GUARD); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -53,7 +53,7 @@ SINGLE_BATTLE_TEST("Leaf Guard prevents Rest during sun") { GIVEN { ASSUME(B_LEAF_GUARD_PREVENTS_REST >= GEN_5); - ASSUME(gBattleMoves[MOVE_REST].effect == EFFECT_REST); + ASSUME(gMovesInfo[MOVE_REST].effect == EFFECT_REST); PLAYER(SPECIES_LEAFEON) { Ability(ABILITY_LEAF_GUARD); HP(100); MaxHP(200); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/magic_bounce.c b/test/battle/ability/magic_bounce.c index 80ff40f2e168..95eaf382e678 100644 --- a/test/battle/ability/magic_bounce.c +++ b/test/battle/ability/magic_bounce.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Magic Bounce bounces back status moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_ESPEON) { Ability(ABILITY_MAGIC_BOUNCE); } } WHEN { @@ -22,8 +22,8 @@ SINGLE_BATTLE_TEST("Magic Bounce bounces back status moves") SINGLE_BATTLE_TEST("Magic Bounce bounces back powder moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_STUN_SPORE].powderMove); - ASSUME(gBattleMoves[MOVE_STUN_SPORE].effect == EFFECT_PARALYZE); + ASSUME(gMovesInfo[MOVE_STUN_SPORE].powderMove); + ASSUME(gMovesInfo[MOVE_STUN_SPORE].effect == EFFECT_PARALYZE); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_ESPEON) { Ability(ABILITY_MAGIC_BOUNCE); } } WHEN { @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Magic Bounce bounces back powder moves") SINGLE_BATTLE_TEST("Magic Bounce cannot bounce back powder moves against Grass Types") { GIVEN { - ASSUME(gBattleMoves[MOVE_STUN_SPORE].powderMove); + ASSUME(gMovesInfo[MOVE_STUN_SPORE].powderMove); ASSUME(gSpeciesInfo[SPECIES_ODDISH].types[0] == TYPE_GRASS); PLAYER(SPECIES_ODDISH); OPPONENT(SPECIES_ESPEON) { Ability(ABILITY_MAGIC_BOUNCE); } @@ -59,8 +59,8 @@ SINGLE_BATTLE_TEST("Magic Bounce cannot bounce back powder moves against Grass T DOUBLE_BATTLE_TEST("Magic Bounce bounces back moves hitting both foes at two foes") { GIVEN { - ASSUME(gBattleMoves[MOVE_LEER].effect == EFFECT_DEFENSE_DOWN); - ASSUME(gBattleMoves[MOVE_LEER].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_LEER].effect == EFFECT_DEFENSE_DOWN); + ASSUME(gMovesInfo[MOVE_LEER].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_ABRA); PLAYER(SPECIES_KADABRA); OPPONENT(SPECIES_ESPEON) { Ability(ABILITY_MAGIC_BOUNCE); } diff --git a/test/battle/ability/magician.c b/test/battle/ability/magician.c index 388c91dccfad..2f56fa6268b2 100644 --- a/test/battle/ability/magician.c +++ b/test/battle/ability/magician.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Magician does not get self-damage recoil after stealing Life { GIVEN { ASSUME(gItems[ITEM_LIFE_ORB].holdEffect == HOLD_EFFECT_LIFE_ORB); - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); PLAYER(SPECIES_DELPHOX) { Ability(ABILITY_MAGICIAN); Item(ITEM_NONE); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LIFE_ORB); } } WHEN { diff --git a/test/battle/ability/minds_eye.c b/test/battle/ability/minds_eye.c index 52434c66708b..6498f9f098dc 100644 --- a/test/battle/ability/minds_eye.c +++ b/test/battle/ability/minds_eye.c @@ -48,7 +48,7 @@ AI_SINGLE_BATTLE_TEST("AI doesn't use accuracy-lowering moves if it knows that t for (j = MOVE_NONE + 1; j < MOVES_COUNT; j++) { - if (gBattleMoves[j].effect == EFFECT_ACCURACY_DOWN || gBattleMoves[j].effect == EFFECT_ACCURACY_DOWN_2) { + if (gMovesInfo[j].effect == EFFECT_ACCURACY_DOWN || gMovesInfo[j].effect == EFFECT_ACCURACY_DOWN_2) { PARAMETRIZE{ moveAI = j; abilityAI = ABILITY_SWIFT_SWIM; } PARAMETRIZE{ moveAI = j; abilityAI = ABILITY_MOLD_BREAKER; } } diff --git a/test/battle/ability/mirror_armor.c b/test/battle/ability/mirror_armor.c index 2c4d8d9a2752..c8c3c512ba59 100644 --- a/test/battle/ability/mirror_armor.c +++ b/test/battle/ability/mirror_armor.c @@ -171,8 +171,8 @@ DOUBLE_BATTLE_TEST("Mirror Armor lowers Speed of the partner Pokemon after Court { KNOWN_FAILING; GIVEN { - ASSUME(gBattleMoves[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); - ASSUME(gBattleMoves[MOVE_COURT_CHANGE].effect == EFFECT_COURT_CHANGE); + ASSUME(gMovesInfo[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); + ASSUME(gMovesInfo[MOVE_COURT_CHANGE].effect == EFFECT_COURT_CHANGE); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_CORVIKNIGHT) {Ability(ABILITY_MIRROR_ARMOR); Item(ITEM_IRON_BALL); } diff --git a/test/battle/ability/neuroforce.c b/test/battle/ability/neuroforce.c index 4aac565066c4..88af00b722d3 100644 --- a/test/battle/ability/neuroforce.c +++ b/test/battle/ability/neuroforce.c @@ -10,8 +10,8 @@ SINGLE_BATTLE_TEST("Neuroforce increases the strength of super-effective moves b PARAMETRIZE { ability = ABILITY_NEUROFORCE; move = MOVE_TACKLE; } PARAMETRIZE { ability = ABILITY_KLUTZ; move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SHADOW_BALL].type == TYPE_GHOST); - ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL); + ASSUME(gMovesInfo[MOVE_SHADOW_BALL].type == TYPE_GHOST); + ASSUME(gMovesInfo[MOVE_TACKLE].type == TYPE_NORMAL); PLAYER(SPECIES_NECROZMA_ULTRA) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/oblivious.c b/test/battle/ability/oblivious.c index b851256acc06..70bf94192370 100644 --- a/test/battle/ability/oblivious.c +++ b/test/battle/ability/oblivious.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Oblivious prevents Infatuation") { GIVEN { - ASSUME(gBattleMoves[MOVE_ATTRACT].effect == EFFECT_ATTRACT); + ASSUME(gMovesInfo[MOVE_ATTRACT].effect == EFFECT_ATTRACT); PLAYER(SPECIES_SLOWPOKE) { Ability(ABILITY_OBLIVIOUS); Gender(MON_MALE); } OPPONENT(SPECIES_WOBBUFFET) { Gender(MON_FEMALE); } } WHEN { @@ -19,7 +19,7 @@ SINGLE_BATTLE_TEST("Oblivious prevents Infatuation") SINGLE_BATTLE_TEST("Oblivious prevents Captivate") { GIVEN { - ASSUME(gBattleMoves[MOVE_CAPTIVATE].effect == EFFECT_CAPTIVATE); + ASSUME(gMovesInfo[MOVE_CAPTIVATE].effect == EFFECT_CAPTIVATE); PLAYER(SPECIES_SLOWPOKE) { Ability(ABILITY_OBLIVIOUS); Gender(MON_MALE); } OPPONENT(SPECIES_WOBBUFFET) { Gender(MON_FEMALE); } } WHEN { @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Oblivious prevents Captivate") SINGLE_BATTLE_TEST("Oblivious prevents Taunt") { GIVEN { - ASSUME(gBattleMoves[MOVE_TAUNT].effect == EFFECT_TAUNT); + ASSUME(gMovesInfo[MOVE_TAUNT].effect == EFFECT_TAUNT); ASSUME(B_OBLIVIOUS_TAUNT >= GEN_6); PLAYER(SPECIES_SLOWPOKE) { Ability(ABILITY_OBLIVIOUS); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/opportunist.c b/test/battle/ability/opportunist.c index ca1e28ceefbd..a63bd80dabc3 100644 --- a/test/battle/ability/opportunist.c +++ b/test/battle/ability/opportunist.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Opportunist only copies foe's positive stat changes in a turn", s16 damage) diff --git a/test/battle/ability/overcoat.c b/test/battle/ability/overcoat.c index 6673c0ceebfb..26eb90d66b1b 100644 --- a/test/battle/ability/overcoat.c +++ b/test/battle/ability/overcoat.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Overcoat blocks powder and spore moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_STUN_SPORE].powderMove); + ASSUME(gMovesInfo[MOVE_STUN_SPORE].powderMove); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_PINECO) { Ability(ABILITY_OVERCOAT); } } WHEN { diff --git a/test/battle/ability/overgrow.c b/test/battle/ability/overgrow.c index 548dc9bb3313..0bc2d7cdd597 100644 --- a/test/battle/ability/overgrow.c +++ b/test/battle/ability/overgrow.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Overgrow boosts Grass-type moves in a pinch", s16 damage) PARAMETRIZE { hp = 99; } PARAMETRIZE { hp = 33; } GIVEN { - ASSUME(gBattleMoves[MOVE_VINE_WHIP].type == TYPE_GRASS); + ASSUME(gMovesInfo[MOVE_VINE_WHIP].type == TYPE_GRASS); PLAYER(SPECIES_BULBASAUR) { Ability(ABILITY_OVERGROW); MaxHP(99); HP(hp); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/own_tempo.c b/test/battle/ability/own_tempo.c index 387d8860275d..0e89414ee9db 100644 --- a/test/battle/ability/own_tempo.c +++ b/test/battle/ability/own_tempo.c @@ -30,7 +30,7 @@ SINGLE_BATTLE_TEST("Own Tempo prevents intimidate") SINGLE_BATTLE_TEST("Own Tempo prevents confusion from moves by the opponent") { GIVEN { - ASSUME(gBattleMoves[MOVE_CONFUSE_RAY].effect == EFFECT_CONFUSE); + ASSUME(gMovesInfo[MOVE_CONFUSE_RAY].effect == EFFECT_CONFUSE); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; } WHEN { @@ -65,7 +65,7 @@ SINGLE_BATTLE_TEST("Own Tempo cures confusion obtained from an opponent with Mol { KNOWN_FAILING; GIVEN { - ASSUME(gBattleMoves[MOVE_CONFUSE_RAY].effect == EFFECT_CONFUSE); + ASSUME(gMovesInfo[MOVE_CONFUSE_RAY].effect == EFFECT_CONFUSE); PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); }; OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; } WHEN { @@ -84,8 +84,8 @@ SINGLE_BATTLE_TEST("Own Tempo cures confusion obtained from an opponent with Mol SINGLE_BATTLE_TEST("Own Tempo cures confusion if it's obtained via Skill Swap") { GIVEN { - ASSUME(gBattleMoves[MOVE_CONFUSE_RAY].effect == EFFECT_CONFUSE); - ASSUME(gBattleMoves[MOVE_SKILL_SWAP].effect == EFFECT_SKILL_SWAP); + ASSUME(gMovesInfo[MOVE_CONFUSE_RAY].effect == EFFECT_CONFUSE); + ASSUME(gMovesInfo[MOVE_SKILL_SWAP].effect == EFFECT_SKILL_SWAP); PLAYER(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/parental_bond.c b/test/battle/ability/parental_bond.c index 508345e065d7..b1d630a3133c 100644 --- a/test/battle/ability/parental_bond.c +++ b/test/battle/ability/parental_bond.c @@ -4,9 +4,9 @@ SINGLE_BATTLE_TEST("Parental Bond converts Tackle into a two-strike move") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category != BATTLE_CATEGORY_STATUS); - ASSUME(gBattleMoves[MOVE_TACKLE].strikeCount < 2); - ASSUME(gBattleMoves[MOVE_TACKLE].effect == EFFECT_HIT); + ASSUME(gMovesInfo[MOVE_TACKLE].category != BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_TACKLE].strikeCount < 2); + ASSUME(gMovesInfo[MOVE_TACKLE].effect == EFFECT_HIT); PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -27,8 +27,8 @@ SINGLE_BATTLE_TEST("Parental Bond converts Tackle into a two-strike move") SINGLE_BATTLE_TEST("Parental Bond does not convert a move with three or more strikes to a two-strike move") { GIVEN { - ASSUME(gBattleMoves[MOVE_TRIPLE_KICK].category != BATTLE_CATEGORY_STATUS); - ASSUME(gBattleMoves[MOVE_TRIPLE_KICK].strikeCount == 3); + ASSUME(gMovesInfo[MOVE_TRIPLE_KICK].category != BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_TRIPLE_KICK].strikeCount == 3); PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -54,10 +54,10 @@ SINGLE_BATTLE_TEST("Parental Bond converts multi-target moves into a two-strike PARAMETRIZE { move = MOVE_ICY_WIND; } GIVEN { - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].strikeCount < 2); - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].target == MOVE_TARGET_FOES_AND_ALLY); - ASSUME(gBattleMoves[MOVE_ICY_WIND].strikeCount < 2); - ASSUME(gBattleMoves[MOVE_ICY_WIND].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].strikeCount < 2); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gMovesInfo[MOVE_ICY_WIND].strikeCount < 2); + ASSUME(gMovesInfo[MOVE_ICY_WIND].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -78,8 +78,8 @@ SINGLE_BATTLE_TEST("Parental Bond converts multi-target moves into a two-strike DOUBLE_BATTLE_TEST("Parental Bond does not convert multi-target moves into a two-strike move in Double Battles, even if it only damages one") { GIVEN { - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].strikeCount < 2); - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].strikeCount < 2); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].target == MOVE_TARGET_FOES_AND_ALLY); ASSUME(gSpeciesInfo[SPECIES_PIDGEY].types[1] == TYPE_FLYING); PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } PLAYER(SPECIES_PIDGEY); @@ -109,8 +109,8 @@ SINGLE_BATTLE_TEST("Parental Bond-converted moves only hit once on Lightning Rod PARAMETRIZE { move = MOVE_THUNDERBOLT; ability = ABILITY_LIGHTNING_ROD; species = SPECIES_RAICHU; type = TYPE_ELECTRIC; } PARAMETRIZE { move = MOVE_SURF; ability = ABILITY_STORM_DRAIN; species = SPECIES_LILEEP; type = TYPE_WATER; } GIVEN { - ASSUME(gBattleMoves[move].strikeCount < 2); - ASSUME(gBattleMoves[move].type == type); + ASSUME(gMovesInfo[move].strikeCount < 2); + ASSUME(gMovesInfo[move].type == type); PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } OPPONENT(species) { Ability(ability); } } WHEN { diff --git a/test/battle/ability/pastel_veil.c b/test/battle/ability/pastel_veil.c index 8e6c8d5c1274..67bfd5831e5c 100644 --- a/test/battle/ability/pastel_veil.c +++ b/test/battle/ability/pastel_veil.c @@ -35,7 +35,7 @@ SINGLE_BATTLE_TEST("Pastel Veil immediately cures Mold Breaker poison") { KNOWN_FAILING; GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); } OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); } } WHEN { @@ -53,7 +53,7 @@ SINGLE_BATTLE_TEST("Pastel Veil immediately cures Mold Breaker poison") DOUBLE_BATTLE_TEST("Pastel Veil does not cure Mold Breaker poison on partner") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); } @@ -70,7 +70,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil does not cure Mold Breaker poison on partner") SINGLE_BATTLE_TEST("Pastel Veil prevents Toxic bad poison") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); } } WHEN { @@ -86,7 +86,7 @@ SINGLE_BATTLE_TEST("Pastel Veil prevents Toxic bad poison") DOUBLE_BATTLE_TEST("Pastel Veil prevents Toxic bad poison on partner") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); } @@ -104,7 +104,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil prevents Toxic bad poison on partner") SINGLE_BATTLE_TEST("Pastel Veil prevents Toxic Spikes poison") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); + ASSUME(gMovesInfo[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); } @@ -120,7 +120,7 @@ SINGLE_BATTLE_TEST("Pastel Veil prevents Toxic Spikes poison") DOUBLE_BATTLE_TEST("Pastel Veil prevents Toxic Spikes poison on partner") { GIVEN { - ASSUME(gBattleMoves[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); + ASSUME(gMovesInfo[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); } diff --git a/test/battle/ability/poison_point.c b/test/battle/ability/poison_point.c index 0df125508183..bd713fa2fc7b 100644 --- a/test/battle/ability/poison_point.c +++ b/test/battle/ability/poison_point.c @@ -7,15 +7,15 @@ SINGLE_BATTLE_TEST("Poison Point inflicts poison on contact") PARAMETRIZE { move = MOVE_TACKLE; } PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(!gBattleMoves[MOVE_SWIFT].makesContact); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); + ASSUME(!gMovesInfo[MOVE_SWIFT].makesContact); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_NIDORAN_M) { Ability(ABILITY_POISON_POINT); } } WHEN { TURN { MOVE(player, move); } TURN {} } SCENE { - if (gBattleMoves[move].makesContact) { + if (gMovesInfo[move].makesContact) { ABILITY_POPUP(opponent, ABILITY_POISON_POINT); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PSN, player); MESSAGE("Wobbuffet was poisoned by Foe Nidoran♂'s Poison Point!"); diff --git a/test/battle/ability/prankster.c b/test/battle/ability/prankster.c index bcff336789ca..be03e8f2e214 100644 --- a/test/battle/ability/prankster.c +++ b/test/battle/ability/prankster.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gSpeciesInfo[SPECIES_UMBREON].types[0] == TYPE_DARK); - ASSUME(gBattleMoves[MOVE_CONFUSE_RAY].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_CONFUSE_RAY].category == BATTLE_CATEGORY_STATUS); } SINGLE_BATTLE_TEST("Prankster-affected moves don't affect Dark-type Pokémon") @@ -135,7 +135,7 @@ SINGLE_BATTLE_TEST("Prankster is blocked by Quick Guard in Gen5+") DOUBLE_BATTLE_TEST("Prankster-affected moves that target all Pokémon are successful regardless of the presence of Dark-type Pokémon") { GIVEN { - ASSUME(gBattleMoves[MOVE_CAPTIVATE].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_CAPTIVATE].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_UMBREON); diff --git a/test/battle/ability/primordial_sea.c b/test/battle/ability/primordial_sea.c index 37fbb1b236ac..4fd01613b03e 100644 --- a/test/battle/ability/primordial_sea.c +++ b/test/battle/ability/primordial_sea.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_EMBER].power != 0); - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_EMBER].power != 0); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); } SINGLE_BATTLE_TEST("Primordial Sea blocks damaging Fire-type moves") @@ -32,9 +32,9 @@ SINGLE_BATTLE_TEST("Primordial Sea blocks damaging Fire-type moves") DOUBLE_BATTLE_TEST("Primordial Sea blocks damaging Fire-type moves and prints the message only once with moves hitting multiple targets") { GIVEN { - ASSUME(gBattleMoves[MOVE_ERUPTION].power != 0); - ASSUME(gBattleMoves[MOVE_ERUPTION].type == TYPE_FIRE); - ASSUME(gBattleMoves[MOVE_ERUPTION].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_ERUPTION].power != 0); + ASSUME(gMovesInfo[MOVE_ERUPTION].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_ERUPTION].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_KYOGRE) {Item(ITEM_BLUE_ORB); {Speed(5);}} PLAYER(SPECIES_WOBBUFFET) {Speed(5);} OPPONENT(SPECIES_WOBBUFFET) {Speed(10);} diff --git a/test/battle/ability/protosynthesis.c b/test/battle/ability/protosynthesis.c index 976ac363858b..761960f88dd6 100644 --- a/test/battle/ability/protosynthesis.c +++ b/test/battle/ability/protosynthesis.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_ROUND].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ROUND].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Protosynthesis boosts the highest stat") diff --git a/test/battle/ability/purifying_salt.c b/test/battle/ability/purifying_salt.c index 4f62140f60e5..d1ab82d10407 100644 --- a/test/battle/ability/purifying_salt.c +++ b/test/battle/ability/purifying_salt.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Purifying Salt halves damage from Ghost-type moves", s16 dam PARAMETRIZE { ability = ABILITY_STURDY; } PARAMETRIZE { ability = ABILITY_PURIFYING_SALT; } GIVEN { - ASSUME(gBattleMoves[MOVE_SHADOW_BALL].type == TYPE_GHOST); + ASSUME(gMovesInfo[MOVE_SHADOW_BALL].type == TYPE_GHOST); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_GARGANACL) { Ability(ability); } } WHEN { @@ -43,10 +43,10 @@ SINGLE_BATTLE_TEST("Purifying Salt grants immunity to status effects") PARAMETRIZE { move = MOVE_TOXIC; status = STATUS1_TOXIC_POISON; } PARAMETRIZE { move = MOVE_POWDER_SNOW; status = STATUS1_FREEZE; } GIVEN { - ASSUME(gBattleMoves[MOVE_WILL_O_WISP].effect == EFFECT_WILL_O_WISP); - ASSUME(gBattleMoves[MOVE_HYPNOSIS].effect == EFFECT_SLEEP); - ASSUME(gBattleMoves[MOVE_THUNDER_WAVE].effect == EFFECT_PARALYZE); - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_WILL_O_WISP].effect == EFFECT_WILL_O_WISP); + ASSUME(gMovesInfo[MOVE_HYPNOSIS].effect == EFFECT_SLEEP); + ASSUME(gMovesInfo[MOVE_THUNDER_WAVE].effect == EFFECT_PARALYZE); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); ASSUME(MoveHasMoveEffect(MOVE_POWDER_SNOW, MOVE_EFFECT_FREEZE_OR_FROSTBITE) == TRUE); PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_PURIFYING_SALT); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/quark_drive.c b/test/battle/ability/quark_drive.c index c17819510590..4e58b5e14ccc 100644 --- a/test/battle/ability/quark_drive.c +++ b/test/battle/ability/quark_drive.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_ROUND].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ROUND].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Quark Drive boosts the highest stat") diff --git a/test/battle/ability/rattled.c b/test/battle/ability/rattled.c index e936ed7de869..c63e24557564 100644 --- a/test/battle/ability/rattled.c +++ b/test/battle/ability/rattled.c @@ -3,14 +3,14 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_FURY_CUTTER].type == TYPE_BUG); - ASSUME(gBattleMoves[MOVE_FURY_CUTTER].power != 0); - ASSUME(gBattleMoves[MOVE_FEINT_ATTACK].type == TYPE_DARK); - ASSUME(gBattleMoves[MOVE_FEINT_ATTACK].power != 0); - ASSUME(gBattleMoves[MOVE_SHADOW_PUNCH].type == TYPE_GHOST); - ASSUME(gBattleMoves[MOVE_SHADOW_PUNCH].power != 0); - ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL); - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_FURY_CUTTER].type == TYPE_BUG); + ASSUME(gMovesInfo[MOVE_FURY_CUTTER].power != 0); + ASSUME(gMovesInfo[MOVE_FEINT_ATTACK].type == TYPE_DARK); + ASSUME(gMovesInfo[MOVE_FEINT_ATTACK].power != 0); + ASSUME(gMovesInfo[MOVE_SHADOW_PUNCH].type == TYPE_GHOST); + ASSUME(gMovesInfo[MOVE_SHADOW_PUNCH].power != 0); + ASSUME(gMovesInfo[MOVE_TACKLE].type == TYPE_NORMAL); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); } SINGLE_BATTLE_TEST("Rattled boosts speed by 1 when hit by Bug, Dark or Ghost type move") @@ -73,8 +73,8 @@ SINGLE_BATTLE_TEST("Rattled boosts speed by 1 when affected by Intimidate") SINGLE_BATTLE_TEST("Rattled triggers correctly when hit by U-Turn") // Specific test here, because of #3124 { GIVEN { - ASSUME(gBattleMoves[MOVE_U_TURN].effect == EFFECT_HIT_ESCAPE); - ASSUME(gBattleMoves[MOVE_U_TURN].type == TYPE_BUG); + ASSUME(gMovesInfo[MOVE_U_TURN].effect == EFFECT_HIT_ESCAPE); + ASSUME(gMovesInfo[MOVE_U_TURN].type == TYPE_BUG); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_SUDOWOODO) {Ability(ABILITY_RATTLED); } diff --git a/test/battle/ability/rocky_payload.c b/test/battle/ability/rocky_payload.c index 39ca5249e6f5..ff6629e1783b 100644 --- a/test/battle/ability/rocky_payload.c +++ b/test/battle/ability/rocky_payload.c @@ -14,11 +14,11 @@ SINGLE_BATTLE_TEST("Rocky Payload increases Rock-type move damage", s16 damage) PARAMETRIZE { move = MOVE_POWER_GEM; ability = ABILITY_ROCKY_PAYLOAD; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_ROCK); - ASSUME(gBattleMoves[MOVE_ROCK_THROW].type == TYPE_ROCK); - ASSUME(gBattleMoves[MOVE_POWER_GEM].type == TYPE_ROCK); - ASSUME(gBattleMoves[MOVE_ROCK_THROW].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_POWER_GEM].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_ROCK); + ASSUME(gMovesInfo[MOVE_ROCK_THROW].type == TYPE_ROCK); + ASSUME(gMovesInfo[MOVE_POWER_GEM].type == TYPE_ROCK); + ASSUME(gMovesInfo[MOVE_ROCK_THROW].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_POWER_GEM].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_BOMBIRDIER) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/sand_veil.c b/test/battle/ability/sand_veil.c index c2f6440c327b..9e4a634de25f 100644 --- a/test/battle/ability/sand_veil.c +++ b/test/battle/ability/sand_veil.c @@ -18,7 +18,7 @@ SINGLE_BATTLE_TEST("Sand Veil increases evasion during sandstorm") { PASSES_RANDOMLY(4, 5, RNG_ACCURACY); GIVEN { - ASSUME(gBattleMoves[MOVE_POUND].accuracy == 100); + ASSUME(gMovesInfo[MOVE_POUND].accuracy == 100); PLAYER(SPECIES_SANDSHREW) { Ability(ABILITY_SAND_VEIL); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/sap_sipper.c b/test/battle/ability/sap_sipper.c index 903427fcc5e5..b253bfaa8458 100644 --- a/test/battle/ability/sap_sipper.c +++ b/test/battle/ability/sap_sipper.c @@ -61,7 +61,7 @@ SINGLE_BATTLE_TEST("Sap Sipper does not increase Attack if already maxed") SINGLE_BATTLE_TEST("Sap Sipper blocks multi-hit grass type moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_MARILL) { Ability(ABILITY_SAP_SIPPER); } OPPONENT(SPECIES_SHELLDER) { Ability(ABILITY_SKILL_LINK); } } WHEN { diff --git a/test/battle/ability/seed_sower.c b/test/battle/ability/seed_sower.c index 9c56095004fb..64c21dbdba08 100644 --- a/test/battle/ability/seed_sower.c +++ b/test/battle/ability/seed_sower.c @@ -50,8 +50,8 @@ DOUBLE_BATTLE_TEST("Multi-target moves hit correct battlers after Seed Sower is } GIVEN { - ASSUME(gBattleMoves[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); - ASSUME(gBattleMoves[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gMovesInfo[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY); PLAYER(SPECIES_ARBOLIVA) { Ability(abilities[B_POSITION_PLAYER_LEFT]); } PLAYER(SPECIES_ARBOLIVA) { Ability(abilities[B_POSITION_PLAYER_RIGHT]); } OPPONENT(SPECIES_ARBOLIVA) { Ability(abilities[B_POSITION_OPPONENT_LEFT]); } diff --git a/test/battle/ability/sharpness.c b/test/battle/ability/sharpness.c index e018cce234a7..8ecb07671db1 100644 --- a/test/battle/ability/sharpness.c +++ b/test/battle/ability/sharpness.c @@ -11,8 +11,8 @@ SINGLE_BATTLE_TEST("Sharpness increases the power of slicing moves", s16 damage) PARAMETRIZE { move = MOVE_SCRATCH; ability = ABILITY_STEADFAST; } GIVEN { - ASSUME(gBattleMoves[MOVE_AERIAL_ACE].slicingMove); - ASSUME(!gBattleMoves[MOVE_SCRATCH].slicingMove); + ASSUME(gMovesInfo[MOVE_AERIAL_ACE].slicingMove); + ASSUME(!gMovesInfo[MOVE_SCRATCH].slicingMove); PLAYER(SPECIES_GALLADE) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/sheer_force.c b/test/battle/ability/sheer_force.c index e2cd06d52405..14b22f3e8cf8 100644 --- a/test/battle/ability/sheer_force.c +++ b/test/battle/ability/sheer_force.c @@ -8,10 +8,10 @@ SINGLE_BATTLE_TEST("Sheer Force boosts power, but removes secondary effects of m for (j = 1; j < MOVES_COUNT; j++) { - if (gBattleMoves[j].sheerForceBoost - //&& gBattleMoves[j].effect != EFFECT_ORDER_UP - && gBattleMoves[j].effect != EFFECT_AURA_WHEEL - && gBattleMoves[j].effect != EFFECT_PLACEHOLDER) + if (gMovesInfo[j].sheerForceBoost + //&& gMovesInfo[j].effect != EFFECT_ORDER_UP + && gMovesInfo[j].effect != EFFECT_AURA_WHEEL + && gMovesInfo[j].effect != EFFECT_PLACEHOLDER) { PARAMETRIZE { ability = ABILITY_ANGER_POINT; move = j; } PARAMETRIZE { ability = ABILITY_SHEER_FORCE; move = j; } @@ -26,8 +26,8 @@ SINGLE_BATTLE_TEST("Sheer Force boosts power, but removes secondary effects of m TURN { MOVE(opponent, MOVE_AGILITY); MOVE(player, move); } else TURN { MOVE(player, move); } - if (gBattleMoves[move].effect == EFFECT_TWO_TURNS_ATTACK || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE - || gBattleMoves[move].effect == EFFECT_METEOR_BEAM) { + if (gMovesInfo[move].effect == EFFECT_TWO_TURNS_ATTACK || gMovesInfo[move].effect == EFFECT_SEMI_INVULNERABLE + || gMovesInfo[move].effect == EFFECT_METEOR_BEAM) { TURN { SKIP_TURN(player); } TURN { ; } } @@ -47,7 +47,7 @@ SINGLE_BATTLE_TEST("Sheer Force boosts power, but removes secondary effects of m MESSAGE("Wobbuffet flinched!"); } // Volt Tackle/Flare Blitz edge case: recoil happens, but target isn't statused - if (gBattleMoves[move].recoil > 0) + if (gMovesInfo[move].recoil > 0) { HP_BAR(player); MESSAGE("Tauros is hit with recoil!"); diff --git a/test/battle/ability/snow_cloak.c b/test/battle/ability/snow_cloak.c index 88fe6e5098cb..f1bfbcb9b056 100644 --- a/test/battle/ability/snow_cloak.c +++ b/test/battle/ability/snow_cloak.c @@ -17,7 +17,7 @@ SINGLE_BATTLE_TEST("Snow Cloak increases evasion during hail") { PASSES_RANDOMLY(4, 5, RNG_ACCURACY); GIVEN { - ASSUME(gBattleMoves[MOVE_POUND].accuracy == 100); + ASSUME(gMovesInfo[MOVE_POUND].accuracy == 100); PLAYER(SPECIES_GLACEON) { Ability(ABILITY_SNOW_CLOAK); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/stamina.c b/test/battle/ability/stamina.c index bf1713c73d2c..b3e974d14076 100644 --- a/test/battle/ability/stamina.c +++ b/test/battle/ability/stamina.c @@ -24,10 +24,10 @@ SINGLE_BATTLE_TEST("Stamina raises Defense by 1 when hit by a move") PARAMETRIZE {move = MOVE_GUST; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_GUST].power != 0); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_STAMINA); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -56,7 +56,7 @@ DOUBLE_BATTLE_TEST("Stamina activates correctly for every battler with the abili PARAMETRIZE {abilityLeft = ABILITY_STAMINA, abilityRight = ABILITY_STAMINA; } GIVEN { - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].target == MOVE_TARGET_FOES_AND_ALLY); PLAYER(SPECIES_WOBBUFFET) { Ability(abilityLeft); Speed(10); } PLAYER(SPECIES_WOBBUFFET) { Ability(abilityRight); Speed(5); } OPPONENT(SPECIES_WOBBUFFET) {Speed(20); } diff --git a/test/battle/ability/static.c b/test/battle/ability/static.c index 51224da944ec..0f1b4f816fe6 100644 --- a/test/battle/ability/static.c +++ b/test/battle/ability/static.c @@ -7,14 +7,14 @@ SINGLE_BATTLE_TEST("Static inflicts paralysis on contact") PARAMETRIZE { move = MOVE_TACKLE; } PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(!gBattleMoves[MOVE_SWIFT].makesContact); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); + ASSUME(!gMovesInfo[MOVE_SWIFT].makesContact); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_PIKACHU) { Ability(ABILITY_STATIC); } } WHEN { TURN { MOVE(player, move); } } SCENE { - if (gBattleMoves[move].makesContact) { + if (gMovesInfo[move].makesContact) { ABILITY_POPUP(opponent, ABILITY_STATIC); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PRZ, player); MESSAGE("Foe Pikachu's Static paralyzed Wobbuffet! It may be unable to move!"); diff --git a/test/battle/ability/steelworker.c b/test/battle/ability/steelworker.c index af36053664af..30bed971c2fe 100644 --- a/test/battle/ability/steelworker.c +++ b/test/battle/ability/steelworker.c @@ -14,11 +14,11 @@ SINGLE_BATTLE_TEST("Steelworker increases Steel-type move damage", s16 damage) PARAMETRIZE { move = MOVE_FLASH_CANNON; ability = ABILITY_STEELWORKER; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_STEEL); - ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].type == TYPE_STEEL); - ASSUME(gBattleMoves[MOVE_FLASH_CANNON].type == TYPE_STEEL); - ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_FLASH_CANNON].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_STEEL); + ASSUME(gMovesInfo[MOVE_ANCHOR_SHOT].type == TYPE_STEEL); + ASSUME(gMovesInfo[MOVE_FLASH_CANNON].type == TYPE_STEEL); + ASSUME(gMovesInfo[MOVE_ANCHOR_SHOT].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_FLASH_CANNON].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_DHELMISE) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/stench.c b/test/battle/ability/stench.c index 4153e6b15503..9721d893cb11 100644 --- a/test/battle/ability/stench.c +++ b/test/battle/ability/stench.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Stench has a 10% chance to flinch") { PASSES_RANDOMLY(1, 10, RNG_STENCH); GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].power > 0); + ASSUME(gMovesInfo[MOVE_TACKLE].power > 0); PLAYER(SPECIES_GRIMER) { Ability(ABILITY_STENCH); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -20,7 +20,7 @@ SINGLE_BATTLE_TEST("Stench does not stack with King's Rock") PASSES_RANDOMLY(1, 10, RNG_STENCH); GIVEN { ASSUME(gItems[ITEM_KINGS_ROCK].holdEffect == HOLD_EFFECT_FLINCH); - ASSUME(gBattleMoves[MOVE_TACKLE].power > 0); + ASSUME(gMovesInfo[MOVE_TACKLE].power > 0); PLAYER(SPECIES_GRIMER) { Ability(ABILITY_STENCH); Item(ITEM_KINGS_ROCK); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/sturdy.c b/test/battle/ability/sturdy.c index 7a7fdf39f4e7..b90be8209883 100644 --- a/test/battle/ability/sturdy.c +++ b/test/battle/ability/sturdy.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Sturdy prevents OHKO moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_FISSURE].effect == EFFECT_OHKO); + ASSUME(gMovesInfo[MOVE_FISSURE].effect == EFFECT_OHKO); PLAYER(SPECIES_GEODUDE) { Ability(ABILITY_STURDY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/swarm.c b/test/battle/ability/swarm.c index 2a6bef06d641..63e9ee23673d 100644 --- a/test/battle/ability/swarm.c +++ b/test/battle/ability/swarm.c @@ -7,9 +7,9 @@ SINGLE_BATTLE_TEST("Swarm boosts Bug-type moves in a pinch", s16 damage) PARAMETRIZE { hp = 99; } PARAMETRIZE { hp = 33; } GIVEN { - ASSUME(gBattleMoves[MOVE_BUG_BITE].type == TYPE_BUG); - ASSUME(gBattleMoves[MOVE_BUG_BITE].power == 60); - ASSUME(gBattleMoves[MOVE_BUG_BITE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_BUG_BITE].type == TYPE_BUG); + ASSUME(gMovesInfo[MOVE_BUG_BITE].power == 60); + ASSUME(gMovesInfo[MOVE_BUG_BITE].category == BATTLE_CATEGORY_PHYSICAL); ASSUME(gSpeciesInfo[SPECIES_LEDYBA].types[0] == TYPE_BUG); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[0] == TYPE_PSYCHIC); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[1] == TYPE_PSYCHIC); diff --git a/test/battle/ability/sword_of_ruin.c b/test/battle/ability/sword_of_ruin.c index 0cfc9211f15a..3d95d1e31f64 100644 --- a/test/battle/ability/sword_of_ruin.c +++ b/test/battle/ability/sword_of_ruin.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_ROLE_PLAY].effect == EFFECT_ROLE_PLAY); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ROLE_PLAY].effect == EFFECT_ROLE_PLAY); } SINGLE_BATTLE_TEST("Sword of Ruin reduces Defense if opposing mon's ability doesn't match") diff --git a/test/battle/ability/tablets_of_ruin.c b/test/battle/ability/tablets_of_ruin.c index 72c97cd82843..f8ef74ece6c1 100644 --- a/test/battle/ability/tablets_of_ruin.c +++ b/test/battle/ability/tablets_of_ruin.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_ENTRAINMENT].effect == EFFECT_ENTRAINMENT); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ENTRAINMENT].effect == EFFECT_ENTRAINMENT); } SINGLE_BATTLE_TEST("Tablets of Ruin reduces Attack if opposing mon's ability doesn't match") diff --git a/test/battle/ability/torrent.c b/test/battle/ability/torrent.c index 673e21b79f7e..df27d8e99670 100644 --- a/test/battle/ability/torrent.c +++ b/test/battle/ability/torrent.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Torrent boosts Water-type moves in a pinch", s16 damage) PARAMETRIZE { hp = 99; } PARAMETRIZE { hp = 33; } GIVEN { - ASSUME(gBattleMoves[MOVE_BUBBLE].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_BUBBLE].type == TYPE_WATER); PLAYER(SPECIES_SQUIRTLE) { Ability(ABILITY_TORRENT); MaxHP(99); HP(hp); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/toxic_debris.c b/test/battle/ability/toxic_debris.c index 72a247613dca..f21c7c5a7835 100644 --- a/test/battle/ability/toxic_debris.c +++ b/test/battle/ability/toxic_debris.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Toxic Debris sets Toxic Spikes on the opposing side if hit by a physical attack") diff --git a/test/battle/ability/transistor.c b/test/battle/ability/transistor.c index 9f204bfe1ed9..0f5e3069c491 100644 --- a/test/battle/ability/transistor.c +++ b/test/battle/ability/transistor.c @@ -14,11 +14,11 @@ SINGLE_BATTLE_TEST("Transistor increases Electric-type move damage", s16 damage) PARAMETRIZE { move = MOVE_THUNDER_SHOCK; ability = ABILITY_TRANSISTOR; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_ELECTRIC); - ASSUME(gBattleMoves[MOVE_WILD_CHARGE].type == TYPE_ELECTRIC); - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); - ASSUME(gBattleMoves[MOVE_WILD_CHARGE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_WILD_CHARGE].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_WILD_CHARGE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_REGIELEKI) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/vessel_of_ruin.c b/test/battle/ability/vessel_of_ruin.c index 446ba505bcde..515d0e65b16f 100644 --- a/test/battle/ability/vessel_of_ruin.c +++ b/test/battle/ability/vessel_of_ruin.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_ENTRAINMENT].effect == EFFECT_ENTRAINMENT); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_ENTRAINMENT].effect == EFFECT_ENTRAINMENT); } SINGLE_BATTLE_TEST("Vessel of Ruin reduces Sp. Atk if opposing mon's ability doesn't match") diff --git a/test/battle/ability/volt_absorb.c b/test/battle/ability/volt_absorb.c index 265346f2d7ea..0faa255f9cd7 100644 --- a/test/battle/ability/volt_absorb.c +++ b/test/battle/ability/volt_absorb.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Volt Absorb heals 25% when hit by electric type moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -19,7 +19,7 @@ SINGLE_BATTLE_TEST("Volt Absorb heals 25% when hit by electric type moves") SINGLE_BATTLE_TEST("Volt Absorb does not activate if protected") { GIVEN { - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -32,8 +32,8 @@ SINGLE_BATTLE_TEST("Volt Absorb does not activate if protected") SINGLE_BATTLE_TEST("Volt Absorb activates on status moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_THUNDER_WAVE].type == TYPE_ELECTRIC); - ASSUME(gBattleMoves[MOVE_THUNDER_WAVE].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_THUNDER_WAVE].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_THUNDER_WAVE].category == BATTLE_CATEGORY_STATUS); PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -48,8 +48,8 @@ SINGLE_BATTLE_TEST("Volt Absorb activates on status moves") SINGLE_BATTLE_TEST("Volt Absorb is only triggered once on multi strike moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_FURY_SWIPES].type == TYPE_NORMAL); - ASSUME(gBattleMoves[MOVE_FURY_SWIPES].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_FURY_SWIPES].type == TYPE_NORMAL); + ASSUME(gMovesInfo[MOVE_FURY_SWIPES].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_GRAVELER_ALOLAN) { Ability(ABILITY_GALVANIZE); } } WHEN { @@ -65,8 +65,8 @@ DOUBLE_BATTLE_TEST("Volt Absorb does not stop Electric Typed Explosion from dama { s16 damage1, damage2; GIVEN { - ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); - ASSUME(gBattleMoves[MOVE_EXPLOSION].type == TYPE_NORMAL); + ASSUME(gMovesInfo[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); + ASSUME(gMovesInfo[MOVE_EXPLOSION].type == TYPE_NORMAL); PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); } PLAYER(SPECIES_ABRA); OPPONENT(SPECIES_GRAVELER_ALOLAN) { Ability(ABILITY_GALVANIZE); } @@ -88,7 +88,7 @@ DOUBLE_BATTLE_TEST("Volt Absorb does not stop Electric Typed Explosion from dama SINGLE_BATTLE_TEST("Volt Absorb prevents Cell Battery from activating") { GIVEN { - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); Item(ITEM_CELL_BATTERY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/water_absorb.c b/test/battle/ability/water_absorb.c index 2a811657e3ad..11ca6fe6df3c 100644 --- a/test/battle/ability/water_absorb.c +++ b/test/battle/ability/water_absorb.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Water Absorb heals 25% when hit by water type moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_BUBBLE].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_BUBBLE].type == TYPE_WATER); PLAYER(SPECIES_POLIWAG) { Ability(ABILITY_WATER_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -19,7 +19,7 @@ SINGLE_BATTLE_TEST("Water Absorb heals 25% when hit by water type moves") SINGLE_BATTLE_TEST("Water Absorb does not activate if protected") { GIVEN { - ASSUME(gBattleMoves[MOVE_BUBBLE].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_BUBBLE].type == TYPE_WATER); PLAYER(SPECIES_POLIWAG) { Ability(ABILITY_WATER_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -32,8 +32,8 @@ SINGLE_BATTLE_TEST("Water Absorb does not activate if protected") SINGLE_BATTLE_TEST("Water Absorb activates on status moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_SOAK].type == TYPE_WATER); - ASSUME(gBattleMoves[MOVE_SOAK].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_SOAK].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_SOAK].category == BATTLE_CATEGORY_STATUS); PLAYER(SPECIES_POLIWAG) { Ability(ABILITY_WATER_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -48,8 +48,8 @@ SINGLE_BATTLE_TEST("Water Absorb activates on status moves") SINGLE_BATTLE_TEST("Water Absorb is only triggered once on multi strike moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_WATER_SHURIKEN].type == TYPE_WATER); - ASSUME(gBattleMoves[MOVE_WATER_SHURIKEN].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_WATER_SHURIKEN].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_WATER_SHURIKEN].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_POLIWAG) { Ability(ABILITY_WATER_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -67,7 +67,7 @@ SINGLE_BATTLE_TEST("Water Absorb prevents Absorb Bulb and Luminous Moss from act PARAMETRIZE { item = ITEM_ABSORB_BULB; } PARAMETRIZE { item = ITEM_LUMINOUS_MOSS; } GIVEN { - ASSUME(gBattleMoves[MOVE_BUBBLE].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_BUBBLE].type == TYPE_WATER); PLAYER(SPECIES_POLIWAG) { Ability(ABILITY_WATER_ABSORB); HP(1); MaxHP(100); Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/weak_armor.c b/test/battle/ability/weak_armor.c index 207448049f6a..cd324a1e7d99 100644 --- a/test/battle/ability/weak_armor.c +++ b/test/battle/ability/weak_armor.c @@ -3,10 +3,10 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_GUST].power != 0); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); ASSUME(B_WEAK_ARMOR_SPEED >= GEN_7); } @@ -50,8 +50,8 @@ SINGLE_BATTLE_TEST("Weak Armor lowers Defense by 1 and boosts Speed by 2 when hi SINGLE_BATTLE_TEST("Weak Armor does not trigger when brought in by Dragon Tail and taking Stealth Rock damage") { GIVEN { - ASSUME(gBattleMoves[MOVE_STEALTH_ROCK].effect == EFFECT_STEALTH_ROCK); - ASSUME(gBattleMoves[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); + ASSUME(gMovesInfo[MOVE_STEALTH_ROCK].effect == EFFECT_STEALTH_ROCK); + ASSUME(gMovesInfo[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/wind_power.c b/test/battle/ability/wind_power.c index ab332f1c68ce..bbf76cd6fb66 100644 --- a/test/battle/ability/wind_power.c +++ b/test/battle/ability/wind_power.c @@ -3,16 +3,16 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_THUNDERBOLT].power != 0); - ASSUME(gBattleMoves[MOVE_THUNDERBOLT].type == TYPE_ELECTRIC); - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); - ASSUME(gBattleMoves[MOVE_AIR_CUTTER].power != 0); - ASSUME(gBattleMoves[MOVE_AIR_CUTTER].target == MOVE_TARGET_BOTH); - ASSUME(gBattleMoves[MOVE_AIR_CUTTER].windMove == TRUE); - ASSUME(gBattleMoves[MOVE_PETAL_BLIZZARD].power != 0); - ASSUME(gBattleMoves[MOVE_PETAL_BLIZZARD].target == MOVE_TARGET_FOES_AND_ALLY); - ASSUME(gBattleMoves[MOVE_PETAL_BLIZZARD].windMove == TRUE); - ASSUME(gBattleMoves[MOVE_TACKLE].windMove == FALSE); + ASSUME(gMovesInfo[MOVE_THUNDERBOLT].power != 0); + ASSUME(gMovesInfo[MOVE_THUNDERBOLT].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_AIR_CUTTER].power != 0); + ASSUME(gMovesInfo[MOVE_AIR_CUTTER].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_AIR_CUTTER].windMove == TRUE); + ASSUME(gMovesInfo[MOVE_PETAL_BLIZZARD].power != 0); + ASSUME(gMovesInfo[MOVE_PETAL_BLIZZARD].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gMovesInfo[MOVE_PETAL_BLIZZARD].windMove == TRUE); + ASSUME(gMovesInfo[MOVE_TACKLE].windMove == FALSE); } SINGLE_BATTLE_TEST("Wind Power sets up Charge for player when hit by a wind move") @@ -193,7 +193,7 @@ DOUBLE_BATTLE_TEST("Wind Power activates correctly when Tailwind is used") PARAMETRIZE {opponentSide = FALSE;} GIVEN { - ASSUME(gBattleMoves[MOVE_TAILWIND].effect == EFFECT_TAILWIND); + ASSUME(gMovesInfo[MOVE_TAILWIND].effect == EFFECT_TAILWIND); PLAYER(SPECIES_WATTREL) { Ability(ABILITY_WIND_POWER); Speed(10); } PLAYER(SPECIES_WATTREL) { Ability(ABILITY_WIND_POWER); Speed(5); } OPPONENT(SPECIES_WATTREL) { Ability(ABILITY_WIND_POWER); Speed(20); } diff --git a/test/battle/ability/zero_to_hero.c b/test/battle/ability/zero_to_hero.c index 72309f6fb955..8fb901c1c357 100644 --- a/test/battle/ability/zero_to_hero.c +++ b/test/battle/ability/zero_to_hero.c @@ -60,7 +60,7 @@ SINGLE_BATTLE_TEST("Zero to Hero transforms both player and opponent") SINGLE_BATTLE_TEST("Zero to Hero will activate if a switch move is used") { GIVEN { - ASSUME(gBattleMoves[MOVE_FLIP_TURN].effect == EFFECT_HIT_ESCAPE); + ASSUME(gMovesInfo[MOVE_FLIP_TURN].effect == EFFECT_HIT_ESCAPE); PLAYER(SPECIES_PALAFIN_ZERO) { Ability(ABILITY_ZERO_TO_HERO); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -83,9 +83,9 @@ SINGLE_BATTLE_TEST("Gastro Acid, Worry Seed, and Simple Beam fail if the target PARAMETRIZE { move = MOVE_SIMPLE_BEAM; } GIVEN { - ASSUME(gBattleMoves[MOVE_GASTRO_ACID].effect == EFFECT_GASTRO_ACID); - ASSUME(gBattleMoves[MOVE_WORRY_SEED].effect == EFFECT_WORRY_SEED); - ASSUME(gBattleMoves[MOVE_SIMPLE_BEAM].effect == EFFECT_SIMPLE_BEAM); + ASSUME(gMovesInfo[MOVE_GASTRO_ACID].effect == EFFECT_GASTRO_ACID); + ASSUME(gMovesInfo[MOVE_WORRY_SEED].effect == EFFECT_WORRY_SEED); + ASSUME(gMovesInfo[MOVE_SIMPLE_BEAM].effect == EFFECT_SIMPLE_BEAM); PLAYER(SPECIES_PALAFIN_ZERO) { Ability(ABILITY_ZERO_TO_HERO); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -105,9 +105,9 @@ SINGLE_BATTLE_TEST("Role Play, Skill Swap, and Entrainment fail if either Pokém PARAMETRIZE { move = MOVE_ENTRAINMENT; } GIVEN { - ASSUME(gBattleMoves[MOVE_ROLE_PLAY].effect == EFFECT_ROLE_PLAY); - ASSUME(gBattleMoves[MOVE_SKILL_SWAP].effect == EFFECT_SKILL_SWAP); - ASSUME(gBattleMoves[MOVE_ENTRAINMENT].effect == EFFECT_ENTRAINMENT); + ASSUME(gMovesInfo[MOVE_ROLE_PLAY].effect == EFFECT_ROLE_PLAY); + ASSUME(gMovesInfo[MOVE_SKILL_SWAP].effect == EFFECT_SKILL_SWAP); + ASSUME(gMovesInfo[MOVE_ENTRAINMENT].effect == EFFECT_ENTRAINMENT); PLAYER(SPECIES_PALAFIN_ZERO) { Ability(ABILITY_ZERO_TO_HERO); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ai.c b/test/battle/ai.c index 6590fce65728..dff33dd1c1c2 100644 --- a/test/battle/ai.c +++ b/test/battle/ai.c @@ -100,25 +100,25 @@ AI_SINGLE_BATTLE_TEST("AI prefers moves with better accuracy, but only if they b AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(hp); } PLAYER(SPECIES_WOBBUFFET); - ASSUME(gBattleMoves[MOVE_SWIFT].accuracy == 0); - ASSUME(gBattleMoves[MOVE_SLAM].power == gBattleMoves[MOVE_STRENGTH].power); - ASSUME(gBattleMoves[MOVE_MEGA_KICK].power > gBattleMoves[MOVE_STRENGTH].power); - ASSUME(gBattleMoves[MOVE_SLAM].accuracy < gBattleMoves[MOVE_STRENGTH].accuracy); - ASSUME(gBattleMoves[MOVE_MEGA_KICK].accuracy < gBattleMoves[MOVE_STRENGTH].accuracy); - ASSUME(gBattleMoves[MOVE_TACKLE].accuracy == 100); - ASSUME(gBattleMoves[MOVE_GUST].accuracy == 100); - ASSUME(gBattleMoves[MOVE_SHOCK_WAVE].accuracy == 0); - ASSUME(gBattleMoves[MOVE_THUNDERBOLT].accuracy == 100); - ASSUME(gBattleMoves[MOVE_ICY_WIND].accuracy != 100); - ASSUME(gBattleMoves[MOVE_SLAM].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_MEGA_KICK].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_SHOCK_WAVE].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_ICY_WIND].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_THUNDERBOLT].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].accuracy == 0); + ASSUME(gMovesInfo[MOVE_SLAM].power == gMovesInfo[MOVE_STRENGTH].power); + ASSUME(gMovesInfo[MOVE_MEGA_KICK].power > gMovesInfo[MOVE_STRENGTH].power); + ASSUME(gMovesInfo[MOVE_SLAM].accuracy < gMovesInfo[MOVE_STRENGTH].accuracy); + ASSUME(gMovesInfo[MOVE_MEGA_KICK].accuracy < gMovesInfo[MOVE_STRENGTH].accuracy); + ASSUME(gMovesInfo[MOVE_TACKLE].accuracy == 100); + ASSUME(gMovesInfo[MOVE_GUST].accuracy == 100); + ASSUME(gMovesInfo[MOVE_SHOCK_WAVE].accuracy == 0); + ASSUME(gMovesInfo[MOVE_THUNDERBOLT].accuracy == 100); + ASSUME(gMovesInfo[MOVE_ICY_WIND].accuracy != 100); + ASSUME(gMovesInfo[MOVE_SLAM].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_MEGA_KICK].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SHOCK_WAVE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_ICY_WIND].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_THUNDERBOLT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); OPPONENT(SPECIES_EXPLOUD) { Moves(move1, move2, move3, move4); Ability(abilityAtk); SpAttack(50); } // Low Sp.Atk, so Swift deals less damage than Strength. } WHEN { switch (turns) @@ -166,10 +166,10 @@ AI_SINGLE_BATTLE_TEST("AI prefers moves which deal more damage instead of moves PARAMETRIZE { move1 = MOVE_POISON_JAB; move2 = MOVE_WATER_GUN; expectedMove = MOVE_POISON_JAB; abilityDef = ABILITY_IMMUNITY; turns = 3; } GIVEN { - ASSUME(gBattleMoves[MOVE_WATERFALL].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_SCALD].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_POISON_JAB].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_WATERFALL].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SCALD].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_POISON_JAB].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_TYPHLOSION) { Ability(abilityDef); } PLAYER(SPECIES_WOBBUFFET); @@ -196,8 +196,8 @@ AI_SINGLE_BATTLE_TEST("AI prefers Earthquake over Drill Run if both require the { // Drill Run has less accuracy than E-quake, but can score a higher crit. However the chance is too small, so AI should ignore it. GIVEN { - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); // Added because Geodude has to KO Typhlosion - ASSUME(gBattleMoves[MOVE_DRILL_RUN].category == BATTLE_CATEGORY_PHYSICAL); // Added because Geodude has to KO Typhlosion + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); // Added because Geodude has to KO Typhlosion + ASSUME(gMovesInfo[MOVE_DRILL_RUN].category == BATTLE_CATEGORY_PHYSICAL); // Added because Geodude has to KO Typhlosion AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_TYPHLOSION); PLAYER(SPECIES_WOBBUFFET); @@ -222,8 +222,8 @@ AI_SINGLE_BATTLE_TEST("AI prefers a weaker move over a one with a downside effec PARAMETRIZE { move1 = MOVE_OVERHEAT; move2 = MOVE_FLAMETHROWER; hp = 250; expectedMove = MOVE_OVERHEAT; turns = 1; } GIVEN { - ASSUME(gBattleMoves[MOVE_FLAMETHROWER].category == BATTLE_CATEGORY_SPECIAL); // Added because Typhlosion has to KO Wobbuffet - ASSUME(gBattleMoves[MOVE_OVERHEAT].category == BATTLE_CATEGORY_SPECIAL); // Added because Typhlosion has to KO Wobbuffet + ASSUME(gMovesInfo[MOVE_FLAMETHROWER].category == BATTLE_CATEGORY_SPECIAL); // Added because Typhlosion has to KO Wobbuffet + ASSUME(gMovesInfo[MOVE_OVERHEAT].category == BATTLE_CATEGORY_SPECIAL); // Added because Typhlosion has to KO Wobbuffet AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(hp); } PLAYER(SPECIES_WOBBUFFET); @@ -262,8 +262,8 @@ AI_SINGLE_BATTLE_TEST("AI prefers moves with the best possible score, chosen ran AI_SINGLE_BATTLE_TEST("AI can choose a status move that boosts the attack by two") { GIVEN { - ASSUME(gBattleMoves[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_HORN_ATTACK].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_HORN_ATTACK].category == BATTLE_CATEGORY_PHYSICAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(277); }; PLAYER(SPECIES_WOBBUFFET); @@ -327,8 +327,8 @@ AI_SINGLE_BATTLE_TEST("AI won't use Solar Beam if there is no Sun up or the user PARAMETRIZE { } GIVEN { - ASSUME(gBattleMoves[MOVE_SOLAR_BEAM].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_GRASS_PLEDGE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SOLAR_BEAM].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GRASS_PLEDGE].category == BATTLE_CATEGORY_SPECIAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(211); } PLAYER(SPECIES_WOBBUFFET); @@ -352,7 +352,7 @@ AI_SINGLE_BATTLE_TEST("AI won't use Solar Beam if there is no Sun up or the user AI_SINGLE_BATTLE_TEST("AI won't use ground type attacks against flying type Pokemon unless Gravity is in effect") { GIVEN { - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); // Otherwise, it doesn't KO Crobat + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); // Otherwise, it doesn't KO Crobat AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_CROBAT); PLAYER(SPECIES_WOBBUFFET); @@ -427,7 +427,7 @@ AI_DOUBLE_BATTLE_TEST("AI will not use a status move if partner already chose He for (j = MOVE_NONE + 1; j < MOVES_COUNT; j++) { - if (gBattleMoves[j].category == BATTLE_CATEGORY_STATUS) { + if (gMovesInfo[j].category == BATTLE_CATEGORY_STATUS) { PARAMETRIZE{ statusMove = j; } } } @@ -514,11 +514,11 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: AI will not switch in a Pokemo PARAMETRIZE{ speedAlakazm = 400; alakazamFirst = TRUE; aiSmartSwitchFlags = AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES; } // AI_FLAG_SMART_MON_CHOICES recognizes that Alakazam is faster and can KO, and will switch it in GIVEN { - ASSUME(gBattleMoves[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_FOCUS_BLAST].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_BUBBLE_BEAM].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_FOCUS_BLAST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_BUBBLE_BEAM].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | aiSmartSwitchFlags); PLAYER(SPECIES_WEAVILE) { Speed(300); Ability(ABILITY_SHADOW_TAG); } // Weavile has Shadow Tag, so AI can't switch on the first turn, but has to do it after fainting. OPPONENT(SPECIES_KADABRA) { Speed(200); Moves(MOVE_PSYCHIC, MOVE_DISABLE, MOVE_TAUNT, MOVE_CALM_MIND); } @@ -644,10 +644,10 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will not switch out if Pokemo PARAMETRIZE{move1 = MOVE_RAPID_SPIN; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_RAPID_SPIN].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_HEADBUTT].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_RAPID_SPIN].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_HEADBUTT].category == BATTLE_CATEGORY_PHYSICAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SMART_SWITCHING); PLAYER(SPECIES_HITMONTOP) { Level(30); Moves(MOVE_CHARM, MOVE_TACKLE, MOVE_STEALTH_ROCK, MOVE_EARTHQUAKE); Ability(ABILITY_INTIMIDATE); Speed(5); } OPPONENT(SPECIES_GRIMER) { Level(30); Moves(MOVE_TACKLE); Item(ITEM_FOCUS_SASH); Speed(4); } diff --git a/test/battle/ai_check_viability.c b/test/battle/ai_check_viability.c index 4e18dbe26674..493febbf28f4 100644 --- a/test/battle/ai_check_viability.c +++ b/test/battle/ai_check_viability.c @@ -15,7 +15,7 @@ AI_SINGLE_BATTLE_TEST("AI sees increased base power of Facade") PARAMETRIZE { status1 = STATUS1_BURN; expectedMove = MOVE_FACADE; } GIVEN { - ASSUME(gBattleMoves[MOVE_FACADE].effect == EFFECT_FACADE); + ASSUME(gMovesInfo[MOVE_FACADE].effect == EFFECT_FACADE); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(60); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_BODY_SLAM, MOVE_FACADE); Status1(status1); } @@ -36,8 +36,8 @@ AI_SINGLE_BATTLE_TEST("AI sees increased base power of Smelling Salt") GIVEN { ASSUME(B_UPDATED_MOVE_DATA >= GEN_6); - ASSUME(gBattleMoves[MOVE_SMELLING_SALTS].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); - ASSUME(gBattleMoves[MOVE_SMELLING_SALTS].argument == STATUS1_PARALYSIS); + ASSUME(gMovesInfo[MOVE_SMELLING_SALTS].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); + ASSUME(gMovesInfo[MOVE_SMELLING_SALTS].argument == STATUS1_PARALYSIS); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(60); Status1(status1); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_BODY_SLAM, MOVE_SMELLING_SALTS); } @@ -58,8 +58,8 @@ AI_SINGLE_BATTLE_TEST("AI sees increased base power of Wake Up Slap") GIVEN { ASSUME(B_UPDATED_MOVE_DATA >= GEN_6); - ASSUME(gBattleMoves[MOVE_WAKE_UP_SLAP].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); - ASSUME(gBattleMoves[MOVE_WAKE_UP_SLAP].argument == STATUS1_SLEEP); + ASSUME(gMovesInfo[MOVE_WAKE_UP_SLAP].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); + ASSUME(gMovesInfo[MOVE_WAKE_UP_SLAP].argument == STATUS1_SLEEP); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_MEGANIUM) { HP(35); Status1(status1); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_BODY_SLAM, MOVE_WAKE_UP_SLAP); } @@ -80,8 +80,8 @@ AI_SINGLE_BATTLE_TEST("AI sees increased base power of Grav Apple") PARAMETRIZE { movePlayer = MOVE_GRAVITY; expectedMove = MOVE_GRAV_APPLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_GRAV_APPLE].effect == EFFECT_GRAV_APPLE); - ASSUME(gBattleMoves[MOVE_GRAV_APPLE].power == gBattleMoves[MOVE_DRUM_BEATING].power); + ASSUME(gMovesInfo[MOVE_GRAV_APPLE].effect == EFFECT_GRAV_APPLE); + ASSUME(gMovesInfo[MOVE_GRAV_APPLE].power == gMovesInfo[MOVE_DRUM_BEATING].power); ASSUME(MoveHasMoveEffect(MOVE_DRUM_BEATING, MOVE_EFFECT_SPD_MINUS_1) == TRUE); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(81); Speed(20); } @@ -103,7 +103,7 @@ AI_SINGLE_BATTLE_TEST("AI sees increased base power of Flail") PARAMETRIZE { hp = 5; expectedMove = MOVE_FLAIL; } GIVEN { - ASSUME(gBattleMoves[MOVE_FLAIL].effect == EFFECT_FLAIL); + ASSUME(gMovesInfo[MOVE_FLAIL].effect == EFFECT_FLAIL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { Speed(10); } OPPONENT(SPECIES_WOBBUFFET) { HP(hp); MaxHP(490); Speed(20); Moves(MOVE_BODY_SLAM, MOVE_FLAIL); } @@ -134,8 +134,8 @@ AI_SINGLE_BATTLE_TEST("AI will only use Dream Eater if target is asleep") AI_SINGLE_BATTLE_TEST("AI sees increased base power of Spit Up") { GIVEN { - ASSUME(gBattleMoves[MOVE_STOCKPILE].effect == EFFECT_STOCKPILE); - ASSUME(gBattleMoves[MOVE_SPIT_UP].effect == EFFECT_SPIT_UP); + ASSUME(gMovesInfo[MOVE_STOCKPILE].effect == EFFECT_STOCKPILE); + ASSUME(gMovesInfo[MOVE_SPIT_UP].effect == EFFECT_SPIT_UP); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(43); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_STOCKPILE, MOVE_SPIT_UP, MOVE_TACKLE); } @@ -155,10 +155,10 @@ AI_SINGLE_BATTLE_TEST("AI can choose Counter or Mirror Coat if the predicted mov PARAMETRIZE { playerMove = MOVE_POWER_GEM; opponentMove = MOVE_MIRROR_COAT; } GIVEN { - ASSUME(gBattleMoves[MOVE_COUNTER].effect == EFFECT_COUNTER); - ASSUME(gBattleMoves[MOVE_MIRROR_COAT].effect == EFFECT_MIRROR_COAT); - ASSUME(gBattleMoves[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_POWER_GEM].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_COUNTER].effect == EFFECT_COUNTER); + ASSUME(gMovesInfo[MOVE_MIRROR_COAT].effect == EFFECT_MIRROR_COAT); + ASSUME(gMovesInfo[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_POWER_GEM].category == BATTLE_CATEGORY_SPECIAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_WOBBUFFET) { HP(102); Speed(100); Moves(opponentMove, MOVE_STRENGTH); } diff --git a/test/battle/ai_trytofaint.c b/test/battle/ai_trytofaint.c index bbfbee19d114..9e7d7e3ba89f 100644 --- a/test/battle/ai_trytofaint.c +++ b/test/battle/ai_trytofaint.c @@ -5,7 +5,7 @@ AI_SINGLE_BATTLE_TEST("AI prefers priority moves if it's slower and can kill target") { GIVEN { - ASSUME(gBattleMoves[MOVE_QUICK_ATTACK].priority == 1); + ASSUME(gMovesInfo[MOVE_QUICK_ATTACK].priority == 1); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(1); Speed(100); } PLAYER(SPECIES_WOBBUFFET) { Speed(100); } @@ -20,7 +20,7 @@ AI_SINGLE_BATTLE_TEST("AI prefers priority moves if it's slower and can kill tar AI_SINGLE_BATTLE_TEST("AI will choose a random move if it's faster and can kill target") { GIVEN { - ASSUME(gBattleMoves[MOVE_QUICK_ATTACK].priority == 1); + ASSUME(gMovesInfo[MOVE_QUICK_ATTACK].priority == 1); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(1); Speed(1); } PLAYER(SPECIES_WOBBUFFET) { Speed(1); } @@ -35,7 +35,7 @@ AI_SINGLE_BATTLE_TEST("AI will choose a random move if it's faster and can kill AI_SINGLE_BATTLE_TEST("AI will choose a priority move if it is slower then the target and will be killed") { GIVEN { - ASSUME(gBattleMoves[MOVE_QUICK_ATTACK].priority == 1); + ASSUME(gMovesInfo[MOVE_QUICK_ATTACK].priority == 1); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { Speed(100); } OPPONENT(SPECIES_WOBBUFFET) { HP(60); Speed(1); Moves(MOVE_QUICK_ATTACK, MOVE_STRENGTH); } diff --git a/test/battle/crit_chance.c b/test/battle/crit_chance.c index 7763058e4bdb..06a27caedcca 100644 --- a/test/battle/crit_chance.c +++ b/test/battle/crit_chance.c @@ -9,7 +9,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Side effected by Lucky Chant blocks critical hits") { GIVEN { - ASSUME(gBattleMoves[MOVE_LUCKY_CHANT].effect == EFFECT_LUCKY_CHANT); + ASSUME(gMovesInfo[MOVE_LUCKY_CHANT].effect == EFFECT_LUCKY_CHANT); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -48,7 +48,7 @@ SINGLE_BATTLE_TEST("Flag ignoresTargetAbility ignores Battle Armor and Shell Arm PARAMETRIZE { species = SPECIES_ARMALDO; ability = ABILITY_BATTLE_ARMOR; } GIVEN { - ASSUME(gBattleMoves[MOVE_SUNSTEEL_STRIKE].ignoresTargetAbility == TRUE); + ASSUME(gMovesInfo[MOVE_SUNSTEEL_STRIKE].ignoresTargetAbility == TRUE); PLAYER(SPECIES_WOBBUFFET); OPPONENT(species) { Ability(ability); } } WHEN { @@ -105,7 +105,7 @@ SINGLE_BATTLE_TEST("Mold Breaker, Teravolt and Turboblaze ignore Battle Armor an SINGLE_BATTLE_TEST("User effected by Laser Focus causes moves to result in a critical hit") { GIVEN { - ASSUME(gBattleMoves[MOVE_LASER_FOCUS].effect == EFFECT_LASER_FOCUS); + ASSUME(gMovesInfo[MOVE_LASER_FOCUS].effect == EFFECT_LASER_FOCUS); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -135,7 +135,7 @@ SINGLE_BATTLE_TEST("Focus Energy increases the user's critical hit ratio by two { PASSES_RANDOMLY(1, 2, RNG_CRITICAL_HIT); GIVEN { - ASSUME(gBattleMoves[MOVE_FOCUS_ENERGY].effect == EFFECT_FOCUS_ENERGY); + ASSUME(gMovesInfo[MOVE_FOCUS_ENERGY].effect == EFFECT_FOCUS_ENERGY); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -152,7 +152,7 @@ SINGLE_BATTLE_TEST("High crit rate increases the critical hit ratio by one stage { PASSES_RANDOMLY(1, 8, RNG_CRITICAL_HIT); GIVEN { - ASSUME(gBattleMoves[MOVE_SLASH].criticalHitStage == 1); + ASSUME(gMovesInfo[MOVE_SLASH].criticalHitStage == 1); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -195,7 +195,7 @@ SINGLE_BATTLE_TEST("Scope Lens increases the critical hit ratio by one stage") SINGLE_BATTLE_TEST("High crit rate, Super Luck and Scope Lens cause the move to result in a critical hit") { GIVEN { - ASSUME(gBattleMoves[MOVE_SLASH].criticalHitStage == 1); + ASSUME(gMovesInfo[MOVE_SLASH].criticalHitStage == 1); ASSUME(gItems[ITEM_SCOPE_LENS].holdEffect == HOLD_EFFECT_SCOPE_LENS); PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SUPER_LUCK); Item(ITEM_SCOPE_LENS); }; OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/damage_formula.c b/test/battle/damage_formula.c index 9d68c2f9fe36..8240926c3b47 100644 --- a/test/battle/damage_formula.c +++ b/test/battle/damage_formula.c @@ -24,7 +24,7 @@ SINGLE_BATTLE_TEST("Damage calculation matches Gen5+") PARAMETRIZE { expectedDamage = 168; } PARAMETRIZE { expectedDamage = 168; } GIVEN { - ASSUME(gBattleMoves[MOVE_ICE_FANG].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ICE_FANG].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_GLACEON) { Level(75); Attack(123); } OPPONENT(SPECIES_GARCHOMP) { Defense(163); } } WHEN { @@ -62,7 +62,7 @@ SINGLE_BATTLE_TEST("Damage calculation matches Gen5+ (Muscle Band, crit)") PARAMETRIZE { expectedDamage = 276; } PARAMETRIZE { expectedDamage = 268; } GIVEN { - ASSUME(gBattleMoves[MOVE_ICE_FANG].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ICE_FANG].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_GLACEON) { Level(75); Attack(123); Item(ITEM_MUSCLE_BAND); } OPPONENT(SPECIES_GARCHOMP) { Defense(163); } } WHEN { @@ -100,7 +100,7 @@ SINGLE_BATTLE_TEST("Damage calculation matches Gen5+ (Marshadow vs Mawile)") PARAMETRIZE { expectedDamage = 124; } PARAMETRIZE { expectedDamage = 123; } GIVEN { - ASSUME(gBattleMoves[MOVE_SPECTRAL_THIEF].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SPECTRAL_THIEF].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_MARSHADOW) { Level(100); Attack(286); } OPPONENT(SPECIES_MAWILE) { Level(100); Defense(226); HP(241); } } WHEN { diff --git a/test/battle/form_change/mega_evolution.c b/test/battle/form_change/mega_evolution.c index 51037e77c74b..b2426933f767 100644 --- a/test/battle/form_change/mega_evolution.c +++ b/test/battle/form_change/mega_evolution.c @@ -108,7 +108,7 @@ SINGLE_BATTLE_TEST("Abilities replaced by Mega Evolution do not affect turn orde DOUBLE_BATTLE_TEST("Mega Evolution happens after switching, but before Focus Punch-like Moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_FOCUS_PUNCH].effect == EFFECT_FOCUS_PUNCH); + ASSUME(gMovesInfo[MOVE_FOCUS_PUNCH].effect == EFFECT_FOCUS_PUNCH); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_VENUSAUR) { Item(ITEM_VENUSAURITE); } OPPONENT(SPECIES_WYNAUT); diff --git a/test/battle/form_change/primal_reversion.c b/test/battle/form_change/primal_reversion.c index 3e271f67c26a..a7a39411091e 100644 --- a/test/battle/form_change/primal_reversion.c +++ b/test/battle/form_change/primal_reversion.c @@ -120,7 +120,7 @@ DOUBLE_BATTLE_TEST("Primal reversion's order is determined by Speed - player fas SINGLE_BATTLE_TEST("Primal reversion happens after a mon is sent out after a mon is fainted") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); PLAYER(SPECIES_WOBBUFFET) {HP(1); } PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } OPPONENT(SPECIES_WOBBUFFET); @@ -156,7 +156,7 @@ SINGLE_BATTLE_TEST("Primal reversion happens after a mon is switched in") SINGLE_BATTLE_TEST("Primal reversion happens after a switch-in caused by Eject Button") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); ASSUME(gItems[ITEM_EJECT_BUTTON].holdEffect == HOLD_EFFECT_EJECT_BUTTON); PLAYER(SPECIES_WOBBUFFET) {Item(ITEM_EJECT_BUTTON); } PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } @@ -177,7 +177,7 @@ SINGLE_BATTLE_TEST("Primal reversion happens after a switch-in caused by Eject B SINGLE_BATTLE_TEST("Primal reversion happens after a switch-in caused by Red Card") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); + ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); ASSUME(gItems[ITEM_RED_CARD].holdEffect == HOLD_EFFECT_RED_CARD); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } @@ -197,7 +197,7 @@ SINGLE_BATTLE_TEST("Primal reversion happens after a switch-in caused by Red Car SINGLE_BATTLE_TEST("Primal reversion happens after the entry hazards damage") { GIVEN { - ASSUME(gBattleMoves[MOVE_SPIKES].effect == EFFECT_SPIKES); + ASSUME(gMovesInfo[MOVE_SPIKES].effect == EFFECT_SPIKES); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/form_change/ultra_burst.c b/test/battle/form_change/ultra_burst.c index e0566c941460..f2c7b1da2ba6 100644 --- a/test/battle/form_change/ultra_burst.c +++ b/test/battle/form_change/ultra_burst.c @@ -74,7 +74,7 @@ SINGLE_BATTLE_TEST("Ultra Burst affects turn order") DOUBLE_BATTLE_TEST("Ultra Burst happens after switching, but before Focus Punch-like Moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_FOCUS_PUNCH].effect == EFFECT_FOCUS_PUNCH); + ASSUME(gMovesInfo[MOVE_FOCUS_PUNCH].effect == EFFECT_FOCUS_PUNCH); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_NECROZMA_DUSK_MANE) { Item(ITEM_ULTRANECROZIUM_Z); } OPPONENT(SPECIES_WYNAUT); diff --git a/test/battle/hold_effect/air_balloon.c b/test/battle/hold_effect/air_balloon.c index cb16972d5cf9..32eab32db415 100644 --- a/test/battle/hold_effect/air_balloon.c +++ b/test/battle/hold_effect/air_balloon.c @@ -4,9 +4,9 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_AIR_BALLOON].holdEffect == HOLD_EFFECT_AIR_BALLOON); - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].type == TYPE_GROUND); - ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_GROUND); - ASSUME(gBattleMoves[MOVE_RECYCLE].effect == EFFECT_RECYCLE); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].type == TYPE_GROUND); + ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_GROUND); + ASSUME(gMovesInfo[MOVE_RECYCLE].effect == EFFECT_RECYCLE); } SINGLE_BATTLE_TEST("Air Balloon prevents the holder from taking damage from ground type moves") diff --git a/test/battle/hold_effect/attack_up.c b/test/battle/hold_effect/attack_up.c index afdee8adf859..76c128c71edf 100644 --- a/test/battle/hold_effect/attack_up.c +++ b/test/battle/hold_effect/attack_up.c @@ -4,8 +4,8 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_LIECHI_BERRY].holdEffect == HOLD_EFFECT_ATTACK_UP); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].argument == 40); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].argument == 40); } SINGLE_BATTLE_TEST("Liechi Berry raises the holder's Attack by one stage when HP drops to 1/4 or below") diff --git a/test/battle/hold_effect/berserk_gene.c b/test/battle/hold_effect/berserk_gene.c index 4f7253c4fe83..0a4d12b9dfc5 100644 --- a/test/battle/hold_effect/berserk_gene.c +++ b/test/battle/hold_effect/berserk_gene.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Berserk Gene sharply raises attack at the start of a single PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -37,7 +37,7 @@ DOUBLE_BATTLE_TEST("Berserk Gene sharply raises attack at the start of a double PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WYNAUT); PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); @@ -64,7 +64,7 @@ SINGLE_BATTLE_TEST("Berserk Gene activates on switch in", s16 damage) PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WYNAUT); PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); @@ -91,7 +91,7 @@ SINGLE_BATTLE_TEST("Berserk Gene does not confuse a Pokemon with Own Tempo but s PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_SLOWBRO) { Ability(ABILITY_OWN_TEMPO); Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -122,7 +122,7 @@ DOUBLE_BATTLE_TEST("Berserk Gene does not confuse a Pokemon with Own Tempo but s PARAMETRIZE { item = ITEM_BERSERK_GENE; positionLeft = TRUE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; positionLeft = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); if (positionLeft) { PLAYER(SPECIES_SLOWBRO) { Ability(ABILITY_OWN_TEMPO); Item(item); } PLAYER(SPECIES_WOBBUFFET); @@ -156,7 +156,7 @@ DOUBLE_BATTLE_TEST("Berserk Gene does not confuse a Pokemon with Own Tempo but s SINGLE_BATTLE_TEST("Berserk Gene does not confuse on Misty Terrain but still raises attack sharply") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_TAPU_FINI) { Ability(ABILITY_MISTY_SURGE); Item(ITEM_BERSERK_GENE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/hold_effect/clear_amulet.c b/test/battle/hold_effect/clear_amulet.c index 39e5b3344fd3..488d0ee9e01d 100644 --- a/test/battle/hold_effect/clear_amulet.c +++ b/test/battle/hold_effect/clear_amulet.c @@ -42,14 +42,14 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents stat reducing effects") PARAMETRIZE { move = MOVE_SAND_ATTACK; } GIVEN { - ASSUME(gBattleMoves[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); - ASSUME(gBattleMoves[MOVE_LEER].effect == EFFECT_DEFENSE_DOWN); - ASSUME(gBattleMoves[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN); - ASSUME(gBattleMoves[MOVE_FAKE_TEARS].effect == EFFECT_SPECIAL_DEFENSE_DOWN_2); - ASSUME(gBattleMoves[MOVE_SCARY_FACE].effect == EFFECT_SPEED_DOWN_2); + ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_LEER].effect == EFFECT_DEFENSE_DOWN); + ASSUME(gMovesInfo[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_FAKE_TEARS].effect == EFFECT_SPECIAL_DEFENSE_DOWN_2); + ASSUME(gMovesInfo[MOVE_SCARY_FACE].effect == EFFECT_SPEED_DOWN_2); ASSUME(B_UPDATED_MOVE_DATA >= GEN_6); - ASSUME(gBattleMoves[MOVE_SWEET_SCENT].effect == EFFECT_EVASION_DOWN_2); - ASSUME(gBattleMoves[MOVE_SAND_ATTACK].effect == EFFECT_ACCURACY_DOWN); + ASSUME(gMovesInfo[MOVE_SWEET_SCENT].effect == EFFECT_EVASION_DOWN_2); + ASSUME(gMovesInfo[MOVE_SAND_ATTACK].effect == EFFECT_ACCURACY_DOWN); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_CLEAR_AMULET); }; } WHEN { diff --git a/test/battle/hold_effect/critical_hit_up.c b/test/battle/hold_effect/critical_hit_up.c index c302311de57f..e518f70e3a91 100644 --- a/test/battle/hold_effect/critical_hit_up.c +++ b/test/battle/hold_effect/critical_hit_up.c @@ -4,8 +4,8 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_LANSAT_BERRY].holdEffect == HOLD_EFFECT_CRITICAL_UP); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].argument == 40); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].argument == 40); } SINGLE_BATTLE_TEST("Lansat Berry raises the holder's critical-hit-ratio by two stages when HP drops to 1/4 or below") @@ -52,7 +52,7 @@ SINGLE_BATTLE_TEST("Lansat Berry raises the holder's critical-hit-ratio by two s { PASSES_RANDOMLY(1, 2, RNG_CRITICAL_HIT); GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].criticalHitStage == 0); + ASSUME(gMovesInfo[MOVE_TACKLE].criticalHitStage == 0); ASSUME(B_CRIT_CHANCE >= GEN_6); PLAYER(SPECIES_WOBBUFFET) { MaxHP(160); HP(80); Item(ITEM_LANSAT_BERRY); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/hold_effect/defense_up.c b/test/battle/hold_effect/defense_up.c index 030c1ba999ab..4041630c1556 100644 --- a/test/battle/hold_effect/defense_up.c +++ b/test/battle/hold_effect/defense_up.c @@ -4,8 +4,8 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_GANLON_BERRY].holdEffect == HOLD_EFFECT_DEFENSE_UP); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].argument == 40); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].argument == 40); } SINGLE_BATTLE_TEST("Ganlon Berry raises the holder's Defense by one stage when HP drops to 1/4 or below") diff --git a/test/battle/hold_effect/jaboca_berry.c b/test/battle/hold_effect/jaboca_berry.c index 19c9f7ce7317..637d40cb8a35 100644 --- a/test/battle/hold_effect/jaboca_berry.c +++ b/test/battle/hold_effect/jaboca_berry.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_JABOCA_BERRY].holdEffect == HOLD_EFFECT_JABOCA_BERRY); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Jaboca Berry causes the attacker to lose 1/8 of its max HP if a physical move was used") @@ -16,7 +16,7 @@ SINGLE_BATTLE_TEST("Jaboca Berry causes the attacker to lose 1/8 of its max HP i PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_JABOCA_BERRY); } } WHEN { @@ -44,7 +44,7 @@ SINGLE_BATTLE_TEST("Jaboca Berry tirggers before Bug Bite can steal it") { KNOWN_FAILING; GIVEN { - ASSUME(gBattleMoves[MOVE_BUG_BITE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_BUG_BITE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_JABOCA_BERRY); } } WHEN { diff --git a/test/battle/hold_effect/kee_berry.c b/test/battle/hold_effect/kee_berry.c index 820cb60467a5..51075ee3c966 100644 --- a/test/battle/hold_effect/kee_berry.c +++ b/test/battle/hold_effect/kee_berry.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_KEE_BERRY].holdEffect == HOLD_EFFECT_KEE_BERRY); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by one stage when hit by a physical move") @@ -15,7 +15,7 @@ SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by one stage when hit PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_KEE_BERRY); } } WHEN { @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by two stages with Rip SINGLE_BATTLE_TEST("Kee Berry is not triggered by a special move") { GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_KEE_BERRY); } } WHEN { diff --git a/test/battle/hold_effect/maranga_berry.c b/test/battle/hold_effect/maranga_berry.c index 779d602d6a67..57be4bc6b793 100644 --- a/test/battle/hold_effect/maranga_berry.c +++ b/test/battle/hold_effect/maranga_berry.c @@ -12,8 +12,8 @@ SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by one stage when PARAMETRIZE { move = MOVE_TACKLE; } PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_MARANGA_BERRY); } } WHEN { @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by one stage when SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by two stages with Ripen when hit by a special move") { GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_APPLIN) { Item(ITEM_MARANGA_BERRY); Ability(ABILITY_RIPEN); } } WHEN { diff --git a/test/battle/hold_effect/metronome.c b/test/battle/hold_effect/metronome.c index 5b089703e9d3..de35af84ee14 100644 --- a/test/battle/hold_effect/metronome.c +++ b/test/battle/hold_effect/metronome.c @@ -112,7 +112,7 @@ SINGLE_BATTLE_TEST("Metronome Item counts charging turn of moves for its attacki PARAMETRIZE {item = ITEM_NONE; } PARAMETRIZE {item = ITEM_METRONOME; } GIVEN { - ASSUME(gBattleMoves[MOVE_SOLAR_BEAM].effect == EFFECT_SOLAR_BEAM); + ASSUME(gMovesInfo[MOVE_SOLAR_BEAM].effect == EFFECT_SOLAR_BEAM); PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -134,7 +134,7 @@ SINGLE_BATTLE_TEST("Metronome Item doesn't increase damage per hit of multi-hit { s16 damage[3]; GIVEN { - ASSUME(gBattleMoves[MOVE_FURY_ATTACK].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_FURY_ATTACK].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_METRONOME); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/hold_effect/micle_berry.c b/test/battle/hold_effect/micle_berry.c index e81b3de655f5..60415381eded 100644 --- a/test/battle/hold_effect/micle_berry.c +++ b/test/battle/hold_effect/micle_berry.c @@ -4,8 +4,8 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_MICLE_BERRY].holdEffect == HOLD_EFFECT_MICLE_BERRY); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].argument == 40); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].argument == 40); } SINGLE_BATTLE_TEST("Micle Berry raises the holder's accuracy by 1.2 when HP drops to 1/4 or below") @@ -52,7 +52,7 @@ SINGLE_BATTLE_TEST("Micle Berry raises the holder's accuracy by 1.2") { PASSES_RANDOMLY(24, 25, RNG_ACCURACY); GIVEN { - ASSUME(gBattleMoves[MOVE_SUBMISSION].accuracy == 80); + ASSUME(gMovesInfo[MOVE_SUBMISSION].accuracy == 80); PLAYER(SPECIES_WOBBUFFET) { MaxHP(160); HP(80); Item(ITEM_MICLE_BERRY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/hold_effect/mirror_herb.c b/test/battle/hold_effect/mirror_herb.c index 6b7ce2ec0353..2bc37451365b 100644 --- a/test/battle/hold_effect/mirror_herb.c +++ b/test/battle/hold_effect/mirror_herb.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Mirror Herb copies all of foe's positive stat changes in a t PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_MIRROR_HERB; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Speed(4); } OPPONENT(SPECIES_WOBBUFFET) { Speed(5); Item(item); } } WHEN { diff --git a/test/battle/hold_effect/red_card.c b/test/battle/hold_effect/red_card.c index 23d7e10b204e..787319ead832 100644 --- a/test/battle/hold_effect/red_card.c +++ b/test/battle/hold_effect/red_card.c @@ -401,7 +401,7 @@ SINGLE_BATTLE_TEST("Red Card activates before Emergency Exit") SINGLE_BATTLE_TEST("Red Card is consumed after dragged out replacement has its Speed lowered by Sticky Web") { GIVEN { - ASSUME(gBattleMoves[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); + ASSUME(gMovesInfo[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT) { Moves(MOVE_TACKLE); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } diff --git a/test/battle/hold_effect/rowap_berry.c b/test/battle/hold_effect/rowap_berry.c index 5e4d603f5d99..135f26ead11d 100644 --- a/test/battle/hold_effect/rowap_berry.c +++ b/test/battle/hold_effect/rowap_berry.c @@ -15,8 +15,8 @@ SINGLE_BATTLE_TEST("Rowap Berry causes the attacker to lose 1/8 of its max HP if PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ROWAP_BERRY); } } WHEN { @@ -43,7 +43,7 @@ SINGLE_BATTLE_TEST("Rowap Berry causes the attacker to lose 1/8 of its max HP if SINGLE_BATTLE_TEST("Rowap Berry is not triggered by a physical move") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ROWAP_BERRY); } } WHEN { diff --git a/test/battle/hold_effect/safety_goggles.c b/test/battle/hold_effect/safety_goggles.c index 1b8c47de70f0..f8b89c8de0aa 100644 --- a/test/battle/hold_effect/safety_goggles.c +++ b/test/battle/hold_effect/safety_goggles.c @@ -9,7 +9,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Safety Goggles block powder and spore moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_STUN_SPORE].powderMove); + ASSUME(gMovesInfo[MOVE_STUN_SPORE].powderMove); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_ABRA) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { diff --git a/test/battle/hold_effect/special_attack_up.c b/test/battle/hold_effect/special_attack_up.c index 9a7ebfe7054e..06e246ff2f27 100644 --- a/test/battle/hold_effect/special_attack_up.c +++ b/test/battle/hold_effect/special_attack_up.c @@ -4,8 +4,8 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_PETAYA_BERRY].holdEffect == HOLD_EFFECT_SP_ATTACK_UP); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].argument == 40); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].argument == 40); } SINGLE_BATTLE_TEST("Petaya Berry raises the holder's Sp. Atk by one stage when HP drops to 1/4 or below") diff --git a/test/battle/hold_effect/special_defense_up.c b/test/battle/hold_effect/special_defense_up.c index 0225588dca6a..ec4abad397f0 100644 --- a/test/battle/hold_effect/special_defense_up.c +++ b/test/battle/hold_effect/special_defense_up.c @@ -4,8 +4,8 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_APICOT_BERRY].holdEffect == HOLD_EFFECT_SP_DEFENSE_UP); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].argument == 40); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].argument == 40); } SINGLE_BATTLE_TEST("Apicot Berry raises the holder's Sp. Def by one stage when HP drops to 1/4 or below") diff --git a/test/battle/hold_effect/speed_up.c b/test/battle/hold_effect/speed_up.c index a11ad43444c4..d39458aefedf 100644 --- a/test/battle/hold_effect/speed_up.c +++ b/test/battle/hold_effect/speed_up.c @@ -4,8 +4,8 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_SALAC_BERRY].holdEffect == HOLD_EFFECT_SPEED_UP); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); - ASSUME(gBattleMoves[MOVE_DRAGON_RAGE].argument == 40); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG); + ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].argument == 40); } SINGLE_BATTLE_TEST("Salac Berry raises the holder's Speed by one stage when HP drops to 1/4 or below") diff --git a/test/battle/hold_effect/utility_umbrella.c b/test/battle/hold_effect/utility_umbrella.c index 837bacc90113..097cb9d6d320 100644 --- a/test/battle/hold_effect/utility_umbrella.c +++ b/test/battle/hold_effect/utility_umbrella.c @@ -5,8 +5,8 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_UTILITY_UMBRELLA].holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA); - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); - ASSUME(gBattleMoves[MOVE_WATER_GUN].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_WATER_GUN].type == TYPE_WATER); } SINGLE_BATTLE_TEST("Utility Umbrella blocks Sun damage modifiers", s16 damage) diff --git a/test/battle/hold_effect/white_herb.c b/test/battle/hold_effect/white_herb.c index 010c5c3bb21a..a3775ab953a4 100644 --- a/test/battle/hold_effect/white_herb.c +++ b/test/battle/hold_effect/white_herb.c @@ -9,7 +9,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("White Herb restores stats when they're lowered") { GIVEN { - ASSUME(gBattleMoves[MOVE_LEER].effect == EFFECT_DEFENSE_DOWN); + ASSUME(gMovesInfo[MOVE_LEER].effect == EFFECT_DEFENSE_DOWN); PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -106,7 +106,7 @@ SINGLE_BATTLE_TEST("White Herb restores stats after all hits of a multi hit move KNOWN_FAILING; GIVEN { - ASSUME(gBattleMoves[MOVE_DUAL_WINGBEAT].strikeCount == 2); + ASSUME(gMovesInfo[MOVE_DUAL_WINGBEAT].strikeCount == 2); PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); } OPPONENT(species) { Ability(ability); } } WHEN { @@ -136,7 +136,7 @@ SINGLE_BATTLE_TEST("White Herb wont have time to activate if it is knocked off o KNOWN_FAILING; // Knock off fails, Thief is fine GIVEN { ASSUME(MoveHasMoveEffect(MOVE_THIEF, MOVE_EFFECT_STEAL_ITEM) == TRUE); - ASSUME(gBattleMoves[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF); + ASSUME(gMovesInfo[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF); PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/item_effect/escape.c b/test/battle/item_effect/escape.c index 0947a4ff9a51..b1a118fb2176 100644 --- a/test/battle/item_effect/escape.c +++ b/test/battle/item_effect/escape.c @@ -21,7 +21,7 @@ WILD_BATTLE_TEST("Poke Toy lets the player escape from a wild battle") WILD_BATTLE_TEST("Poke Toy lets the player escape from a wild battle even if a move forbid them to") { GIVEN { - ASSUME(gBattleMoves[MOVE_MEAN_LOOK].effect == EFFECT_MEAN_LOOK); + ASSUME(gMovesInfo[MOVE_MEAN_LOOK].effect == EFFECT_MEAN_LOOK); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/item_effect/increase_stat.c b/test/battle/item_effect/increase_stat.c index d8fdd042c9a1..aeb291b9d82f 100644 --- a/test/battle/item_effect/increase_stat.c +++ b/test/battle/item_effect/increase_stat.c @@ -8,7 +8,7 @@ SINGLE_BATTLE_TEST("X Attack sharply raises battler's Attack stat", s16 damage) PARAMETRIZE { useItem = TRUE; } GIVEN { ASSUME(gItems[ITEM_X_ATTACK].battleUsage == EFFECT_ITEM_INCREASE_STAT); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -32,7 +32,7 @@ SINGLE_BATTLE_TEST("X Defense sharply raises battler's Defense stat", s16 damage PARAMETRIZE { useItem = TRUE; } GIVEN { ASSUME(gItems[ITEM_X_DEFENSE].battleUsage == EFFECT_ITEM_INCREASE_STAT); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -56,7 +56,7 @@ SINGLE_BATTLE_TEST("X Sp. Atk sharply raises battler's Sp. Attack stat", s16 dam PARAMETRIZE { useItem = TRUE; } GIVEN { ASSUME(gItems[ITEM_X_SP_ATK].battleUsage == EFFECT_ITEM_INCREASE_STAT); - ASSUME(gBattleMoves[MOVE_DISARMING_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_DISARMING_VOICE].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -80,7 +80,7 @@ SINGLE_BATTLE_TEST("X Sp. Def sharply raises battler's Sp. Defense stat", s16 da PARAMETRIZE { useItem = TRUE; } GIVEN { ASSUME(gItems[ITEM_X_SP_DEF].battleUsage == EFFECT_ITEM_INCREASE_STAT); - ASSUME(gBattleMoves[MOVE_DISARMING_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_DISARMING_VOICE].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -134,11 +134,11 @@ SINGLE_BATTLE_TEST("X Speed sharply raises battler's Speed stat", s16 damage) SINGLE_BATTLE_TEST("X Accuracy sharply raises battler's Accuracy stat") { - ASSUME(gBattleMoves[MOVE_SING].accuracy == 55); + ASSUME(gMovesInfo[MOVE_SING].accuracy == 55); if (B_X_ITEMS_BUFF >= GEN_7) - PASSES_RANDOMLY(gBattleMoves[MOVE_SING].accuracy * 5 / 3, 100, RNG_ACCURACY); + PASSES_RANDOMLY(gMovesInfo[MOVE_SING].accuracy * 5 / 3, 100, RNG_ACCURACY); else - PASSES_RANDOMLY(gBattleMoves[MOVE_SING].accuracy * 4 / 3, 100, RNG_ACCURACY); + PASSES_RANDOMLY(gMovesInfo[MOVE_SING].accuracy * 4 / 3, 100, RNG_ACCURACY); GIVEN { ASSUME(gItems[ITEM_X_ACCURACY].battleUsage == EFFECT_ITEM_INCREASE_STAT); PLAYER(SPECIES_WOBBUFFET); diff --git a/test/battle/move.c b/test/battle/move.c index 594161099ba1..f9f363b42b02 100644 --- a/test/battle/move.c +++ b/test/battle/move.c @@ -9,8 +9,8 @@ SINGLE_BATTLE_TEST("Accuracy controls the proportion of misses") PARAMETRIZE { move = MOVE_HYDRO_PUMP; } PARAMETRIZE { move = MOVE_RAZOR_LEAF; } PARAMETRIZE { move = MOVE_SCRATCH; } - ASSUME(0 < gBattleMoves[move].accuracy && gBattleMoves[move].accuracy <= 100); - PASSES_RANDOMLY(gBattleMoves[move].accuracy, 100, RNG_ACCURACY); + ASSUME(0 < gMovesInfo[move].accuracy && gMovesInfo[move].accuracy <= 100); + PASSES_RANDOMLY(gMovesInfo[move].accuracy, 100, RNG_ACCURACY); GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -28,8 +28,8 @@ SINGLE_BATTLE_TEST("AdditionalEffect.chance controls the proportion of secondary PARAMETRIZE { move = MOVE_DISCHARGE; } PARAMETRIZE { move = MOVE_NUZZLE; } ASSUME(MoveHasMoveEffect(move, MOVE_EFFECT_PARALYSIS) == TRUE); - ASSUME(0 < gBattleMoves[move].additionalEffects[0].chance && gBattleMoves[move].additionalEffects[0].chance <= 100); - PASSES_RANDOMLY(gBattleMoves[move].additionalEffects[0].chance, 100, RNG_SECONDARY_EFFECT); + ASSUME(0 < gMovesInfo[move].additionalEffects[0].chance && gMovesInfo[move].additionalEffects[0].chance <= 100); + PASSES_RANDOMLY(gMovesInfo[move].additionalEffects[0].chance, 100, RNG_SECONDARY_EFFECT); GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -43,7 +43,7 @@ SINGLE_BATTLE_TEST("AdditionalEffect.chance controls the proportion of secondary SINGLE_BATTLE_TEST("Turn order is determined by priority") { GIVEN { - ASSUME(gBattleMoves[MOVE_QUICK_ATTACK].priority > gBattleMoves[MOVE_TACKLE].priority); + ASSUME(gMovesInfo[MOVE_QUICK_ATTACK].priority > gMovesInfo[MOVE_TACKLE].priority); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -99,7 +99,7 @@ SINGLE_BATTLE_TEST("Critical hits occur at a 1/24 rate") SINGLE_BATTLE_TEST("Slash's critical hits occur at a 1/8 rate") { ASSUME(B_CRIT_CHANCE >= GEN_7); - ASSUME(gBattleMoves[MOVE_SLASH].criticalHitStage == 1); + ASSUME(gMovesInfo[MOVE_SLASH].criticalHitStage == 1); PASSES_RANDOMLY(1, 8, RNG_CRITICAL_HIT); GIVEN { PLAYER(SPECIES_WOBBUFFET); @@ -136,7 +136,7 @@ SINGLE_BATTLE_TEST("Critical hits do not ignore positive stat stages", s16 damag PARAMETRIZE { move = MOVE_HOWL; } PARAMETRIZE { move = MOVE_TAIL_WHIP; } GIVEN { - ASSUME(gBattleMoves[MOVE_SCRATCH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SCRATCH].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -157,7 +157,7 @@ SINGLE_BATTLE_TEST("Critical hits ignore negative stat stages", s16 damage) PARAMETRIZE { move = MOVE_HARDEN; } PARAMETRIZE { move = MOVE_GROWL; } GIVEN { - ASSUME(gBattleMoves[MOVE_SCRATCH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SCRATCH].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/absorb.c b/test/battle/move_effect/absorb.c index b645387b9b1b..9ef63079f3f1 100644 --- a/test/battle/move_effect/absorb.c +++ b/test/battle/move_effect/absorb.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ABSORB].effect == EFFECT_ABSORB); + ASSUME(gMovesInfo[MOVE_ABSORB].effect == EFFECT_ABSORB); } SINGLE_BATTLE_TEST("Absorb recovers 50% of the damage dealt") @@ -50,7 +50,7 @@ DOUBLE_BATTLE_TEST("Matcha Gatcha recovers 50% of the damage dealt from both tar s16 healedRight; GIVEN { - ASSUME(gBattleMoves[MOVE_MATCHA_GOTCHA].effect == EFFECT_ABSORB); + ASSUME(gMovesInfo[MOVE_MATCHA_GOTCHA].effect == EFFECT_ABSORB); PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/accuracy_down.c b/test/battle/move_effect/accuracy_down.c index a30430a28fc0..0eccd65f22e8 100644 --- a/test/battle/move_effect/accuracy_down.c +++ b/test/battle/move_effect/accuracy_down.c @@ -3,13 +3,13 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SAND_ATTACK].effect == EFFECT_ACCURACY_DOWN); + ASSUME(gMovesInfo[MOVE_SAND_ATTACK].effect == EFFECT_ACCURACY_DOWN); } SINGLE_BATTLE_TEST("Sand Attack lowers Accuracy") { - ASSUME(gBattleMoves[MOVE_SCRATCH].accuracy == 100); - PASSES_RANDOMLY(gBattleMoves[MOVE_SCRATCH].accuracy * 3 / 4, 100, RNG_ACCURACY); + ASSUME(gMovesInfo[MOVE_SCRATCH].accuracy == 100); + PASSES_RANDOMLY(gMovesInfo[MOVE_SCRATCH].accuracy * 3 / 4, 100, RNG_ACCURACY); GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/after_you.c b/test/battle/move_effect/after_you.c index 576267cb4d55..91830abffdc7 100644 --- a/test/battle/move_effect/after_you.c +++ b/test/battle/move_effect/after_you.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_AFTER_YOU].effect == EFFECT_AFTER_YOU); + ASSUME(gMovesInfo[MOVE_AFTER_YOU].effect == EFFECT_AFTER_YOU); } DOUBLE_BATTLE_TEST("After You makes the target move after user") diff --git a/test/battle/move_effect/ally_switch.c b/test/battle/move_effect/ally_switch.c index bbfb774539be..1f07859c829b 100644 --- a/test/battle/move_effect/ally_switch.c +++ b/test/battle/move_effect/ally_switch.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ALLY_SWITCH].effect == EFFECT_ALLY_SWITCH); + ASSUME(gMovesInfo[MOVE_ALLY_SWITCH].effect == EFFECT_ALLY_SWITCH); } SINGLE_BATTLE_TEST("Ally Switch fails in a single battle") @@ -41,8 +41,8 @@ DOUBLE_BATTLE_TEST("Ally Switch fails if there is no partner") DOUBLE_BATTLE_TEST("Ally Switch changes the position of battlers") { GIVEN { - ASSUME(gBattleMoves[MOVE_SCREECH].effect == EFFECT_DEFENSE_DOWN_2); - ASSUME(gBattleMoves[MOVE_SCREECH].target == MOVE_TARGET_SELECTED); + ASSUME(gMovesInfo[MOVE_SCREECH].effect == EFFECT_DEFENSE_DOWN_2); + ASSUME(gMovesInfo[MOVE_SCREECH].target == MOVE_TARGET_SELECTED); PLAYER(SPECIES_WOBBUFFET) { Speed(5); } // Wobb is playerLeft, but it'll be Wynaut after Ally Switch PLAYER(SPECIES_WYNAUT) { Speed(4); } OPPONENT(SPECIES_KADABRA) { Speed(3); } @@ -72,7 +72,7 @@ DOUBLE_BATTLE_TEST("Ally Switch changes the position of battlers") DOUBLE_BATTLE_TEST("Ally Switch does not redirect the target of Snipe Shot") { GIVEN { - ASSUME(gBattleMoves[MOVE_SNIPE_SHOT].effect == EFFECT_SNIPE_SHOT); + ASSUME(gMovesInfo[MOVE_SNIPE_SHOT].effect == EFFECT_SNIPE_SHOT); PLAYER(SPECIES_WOBBUFFET); // Wobb is playerLeft, but it'll be Wynaut after Ally Switch PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_KADABRA); diff --git a/test/battle/move_effect/assist.c b/test/battle/move_effect/assist.c index ed2f43dc13a6..cbd73b285798 100644 --- a/test/battle/move_effect/assist.c +++ b/test/battle/move_effect/assist.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ASSIST].effect == EFFECT_ASSIST); + ASSUME(gMovesInfo[MOVE_ASSIST].effect == EFFECT_ASSIST); } SINGLE_BATTLE_TEST("Assist fails if there are no valid moves to choose from") diff --git a/test/battle/move_effect/attack_down.c b/test/battle/move_effect/attack_down.c index 7f32b9f47bb2..a9861cbcc126 100644 --- a/test/battle/move_effect/attack_down.c +++ b/test/battle/move_effect/attack_down.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); } SINGLE_BATTLE_TEST("Growl lowers Attack", s16 damage) @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Growl lowers Attack", s16 damage) PARAMETRIZE { lowerAttack = FALSE; } PARAMETRIZE { lowerAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/attack_up.c b/test/battle/move_effect/attack_up.c index 967c850c1262..ef6063ce6a00 100644 --- a/test/battle/move_effect/attack_up.c +++ b/test/battle/move_effect/attack_up.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_MEDITATE].effect == EFFECT_ATTACK_UP); + ASSUME(gMovesInfo[MOVE_MEDITATE].effect == EFFECT_ATTACK_UP); } SINGLE_BATTLE_TEST("Meditate raises Attack", s16 damage) @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Meditate raises Attack", s16 damage) PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/attack_up_user_ally.c b/test/battle/move_effect/attack_up_user_ally.c index 4317040bc21b..dfcf3fb6436a 100644 --- a/test/battle/move_effect/attack_up_user_ally.c +++ b/test/battle/move_effect/attack_up_user_ally.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HOWL].effect == EFFECT_ATTACK_UP_USER_ALLY); + ASSUME(gMovesInfo[MOVE_HOWL].effect == EFFECT_ATTACK_UP_USER_ALLY); } SINGLE_BATTLE_TEST("Howl raises user's Attack", s16 damage) @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Howl raises user's Attack", s16 damage) PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -37,7 +37,7 @@ DOUBLE_BATTLE_TEST("Howl raises user's and partner's Attack", s16 damageLeft, s1 PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Speed(15); } PLAYER(SPECIES_WYNAUT) { Speed(10); } OPPONENT(SPECIES_WOBBUFFET) { Speed(13); } @@ -69,7 +69,7 @@ DOUBLE_BATTLE_TEST("Howl does not work on partner if it has Soundproof") s16 damage[2]; GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Speed(15); } PLAYER(SPECIES_VOLTORB) { Speed(10); Ability(ABILITY_SOUNDPROOF); } OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } diff --git a/test/battle/move_effect/aura_wheel.c b/test/battle/move_effect/aura_wheel.c index 7052cf9e7cc1..f4932895e298 100644 --- a/test/battle/move_effect/aura_wheel.c +++ b/test/battle/move_effect/aura_wheel.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(MoveHasMoveEffectSelf(MOVE_AURA_WHEEL, MOVE_EFFECT_SPD_PLUS_1) == TRUE); - ASSUME(gBattleMoves[MOVE_AURA_WHEEL].effect == EFFECT_AURA_WHEEL); + ASSUME(gMovesInfo[MOVE_AURA_WHEEL].effect == EFFECT_AURA_WHEEL); } SINGLE_BATTLE_TEST("Aura Wheel raises Speed; fails if the user is not Morpeko") diff --git a/test/battle/move_effect/aurora_veil.c b/test/battle/move_effect/aurora_veil.c index ff255d9ae460..f681e965d7ec 100644 --- a/test/battle/move_effect/aurora_veil.c +++ b/test/battle/move_effect/aurora_veil.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_AURORA_VEIL].effect == EFFECT_AURORA_VEIL); + ASSUME(gMovesInfo[MOVE_AURORA_VEIL].effect == EFFECT_AURORA_VEIL); } SINGLE_BATTLE_TEST("Aurora Veil can only be used in Hail and Snow") diff --git a/test/battle/move_effect/axe_kick.c b/test/battle/move_effect/axe_kick.c index ee68f04adb3e..9915040c7865 100644 --- a/test/battle/move_effect/axe_kick.c +++ b/test/battle/move_effect/axe_kick.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_AXE_KICK].effect == EFFECT_RECOIL_IF_MISS); + ASSUME(gMovesInfo[MOVE_AXE_KICK].effect == EFFECT_RECOIL_IF_MISS); ASSUME(MoveHasMoveEffect(MOVE_AXE_KICK, MOVE_EFFECT_CONFUSION) == TRUE); } diff --git a/test/battle/move_effect/barb_barrage.c b/test/battle/move_effect/barb_barrage.c index 61ac2101b6f7..5f966c6e0e3b 100644 --- a/test/battle/move_effect/barb_barrage.c +++ b/test/battle/move_effect/barb_barrage.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_BARB_BARRAGE].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); - ASSUME(gBattleMoves[MOVE_BARB_BARRAGE].argument == STATUS1_PSN_ANY); + ASSUME(gMovesInfo[MOVE_BARB_BARRAGE].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); + ASSUME(gMovesInfo[MOVE_BARB_BARRAGE].argument == STATUS1_PSN_ANY); ASSUME(MoveHasMoveEffect(MOVE_BARB_BARRAGE, MOVE_EFFECT_POISON) == TRUE); } diff --git a/test/battle/move_effect/beak_blast.c b/test/battle/move_effect/beak_blast.c index 8ecf1961189d..eeb3d59bf0ef 100644 --- a/test/battle/move_effect/beak_blast.c +++ b/test/battle/move_effect/beak_blast.c @@ -3,13 +3,13 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_BEAK_BLAST].effect == EFFECT_BEAK_BLAST); + ASSUME(gMovesInfo[MOVE_BEAK_BLAST].effect == EFFECT_BEAK_BLAST); } DOUBLE_BATTLE_TEST("Beak Blast's charging message is shown before other moves are used") { GIVEN { - ASSUME(gBattleMoves[MOVE_BEAK_BLAST].priority < 0); + ASSUME(gMovesInfo[MOVE_BEAK_BLAST].priority < 0); PLAYER(SPECIES_WYNAUT) { Speed(10); } PLAYER(SPECIES_WOBBUFFET) { Speed(5); } OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } @@ -36,8 +36,8 @@ DOUBLE_BATTLE_TEST("Beak Blast's charging message is shown before other moves ar DOUBLE_BATTLE_TEST("Beak Blast burns all who make contact with the pokemon") { GIVEN { - ASSUME(gBattleMoves[MOVE_BEAK_BLAST].priority < 0); - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); + ASSUME(gMovesInfo[MOVE_BEAK_BLAST].priority < 0); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); PLAYER(SPECIES_WYNAUT) { Speed(10); } PLAYER(SPECIES_WOBBUFFET) { Speed(5); } OPPONENT(SPECIES_WOBBUFFET) { Speed(3); } @@ -80,9 +80,9 @@ SINGLE_BATTLE_TEST("Beak Blast burns only when contact moves are used") PARAMETRIZE { move = MOVE_LEER; burn = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(!gBattleMoves[MOVE_WATER_GUN].makesContact); - ASSUME(!gBattleMoves[MOVE_LEER].makesContact); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); + ASSUME(!gMovesInfo[MOVE_WATER_GUN].makesContact); + ASSUME(!gMovesInfo[MOVE_LEER].makesContact); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/belly_drum.c b/test/battle/move_effect/belly_drum.c index b3f02f7a1911..90f1dac5653f 100644 --- a/test/battle/move_effect/belly_drum.c +++ b/test/battle/move_effect/belly_drum.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_BELLY_DRUM].effect == EFFECT_BELLY_DRUM); + ASSUME(gMovesInfo[MOVE_BELLY_DRUM].effect == EFFECT_BELLY_DRUM); } SINGLE_BATTLE_TEST("Belly Drum cuts the user's HP in half") @@ -25,7 +25,7 @@ SINGLE_BATTLE_TEST("Belly Drum maximizes the user's Attack stat", s16 damage) PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -64,7 +64,7 @@ SINGLE_BATTLE_TEST("Belly Drum fails if user's current HP is half or less than h SINGLE_BATTLE_TEST("Belly Drum fails if the user's Attack is already at +6") { GIVEN { - ASSUME(gBattleMoves[MOVE_SWORDS_DANCE].effect == EFFECT_ATTACK_UP_2); + ASSUME(gMovesInfo[MOVE_SWORDS_DANCE].effect == EFFECT_ATTACK_UP_2); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/bide.c b/test/battle/move_effect/bide.c index 4dfdc3430ef1..39efe281ec7a 100644 --- a/test/battle/move_effect/bide.c +++ b/test/battle/move_effect/bide.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_BIDE].effect == EFFECT_BIDE); + ASSUME(gMovesInfo[MOVE_BIDE].effect == EFFECT_BIDE); } SINGLE_BATTLE_TEST("Bide deals twice the taken damage over two turns") diff --git a/test/battle/move_effect/brick_break.c b/test/battle/move_effect/brick_break.c index 8bc05c0eea7a..4fbc65a4d5a9 100644 --- a/test/battle/move_effect/brick_break.c +++ b/test/battle/move_effect/brick_break.c @@ -3,11 +3,11 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_BRICK_BREAK].effect == EFFECT_BRICK_BREAK); - ASSUME(gBattleMoves[MOVE_SNOWSCAPE].effect == EFFECT_SNOWSCAPE); - ASSUME(gBattleMoves[MOVE_LIGHT_SCREEN].effect == EFFECT_LIGHT_SCREEN); - ASSUME(gBattleMoves[MOVE_REFLECT].effect == EFFECT_REFLECT); - ASSUME(gBattleMoves[MOVE_AURORA_VEIL].effect == EFFECT_AURORA_VEIL); + ASSUME(gMovesInfo[MOVE_BRICK_BREAK].effect == EFFECT_BRICK_BREAK); + ASSUME(gMovesInfo[MOVE_SNOWSCAPE].effect == EFFECT_SNOWSCAPE); + ASSUME(gMovesInfo[MOVE_LIGHT_SCREEN].effect == EFFECT_LIGHT_SCREEN); + ASSUME(gMovesInfo[MOVE_REFLECT].effect == EFFECT_REFLECT); + ASSUME(gMovesInfo[MOVE_AURORA_VEIL].effect == EFFECT_AURORA_VEIL); } SINGLE_BATTLE_TEST("Brick Break removes Light Screen, Reflect and Aurora Veil from the target's side of the field") diff --git a/test/battle/move_effect/bug_bite.c b/test/battle/move_effect/bug_bite.c index deb3f77da872..cb22911fb652 100644 --- a/test/battle/move_effect/bug_bite.c +++ b/test/battle/move_effect/bug_bite.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(MoveHasMoveEffect(MOVE_BUG_BITE, MOVE_EFFECT_BUG_BITE)); - ASSUME(gBattleMoves[MOVE_BUG_BITE].pp == 20); + ASSUME(gMovesInfo[MOVE_BUG_BITE].pp == 20); } // Pretty much copy/paste of the Berry Fling Test. diff --git a/test/battle/move_effect/burn_hit.c b/test/battle/move_effect/burn_hit.c index 6a03e99b75c7..7ffd362620f2 100644 --- a/test/battle/move_effect/burn_hit.c +++ b/test/battle/move_effect/burn_hit.c @@ -43,7 +43,7 @@ DOUBLE_BATTLE_TEST("Lava Plume inflicts burn to all adjacent battlers") { GIVEN { ASSUME(MoveHasMoveEffect(MOVE_LAVA_PLUME, MOVE_EFFECT_BURN) == TRUE); - ASSUME(gBattleMoves[MOVE_LAVA_PLUME].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gMovesInfo[MOVE_LAVA_PLUME].target == MOVE_TARGET_FOES_AND_ALLY); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -111,7 +111,7 @@ SINGLE_BATTLE_TEST("Scald shouldn't burn a Water-type Pokémon") GIVEN { ASSUME(gSpeciesInfo[SPECIES_SQUIRTLE].types[0] == TYPE_WATER); ASSUME(MoveHasMoveEffect(MOVE_SCALD, MOVE_EFFECT_BURN) == TRUE); - ASSUME(gBattleMoves[MOVE_SCALD].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_SCALD].type == TYPE_WATER); PLAYER(SPECIES_SQUIRTLE); OPPONENT(SPECIES_SQUIRTLE); } WHEN { diff --git a/test/battle/move_effect/burn_up.c b/test/battle/move_effect/burn_up.c index cffddf604826..02238ba2f85d 100644 --- a/test/battle/move_effect/burn_up.c +++ b/test/battle/move_effect/burn_up.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_BURN_UP].effect == EFFECT_FAIL_IF_NOT_ARG_TYPE); + ASSUME(gMovesInfo[MOVE_BURN_UP].effect == EFFECT_FAIL_IF_NOT_ARG_TYPE); ASSUME(MoveHasMoveEffectSelfArg(MOVE_BURN_UP, MOVE_EFFECT_REMOVE_ARG_TYPE, TYPE_FIRE) == TRUE); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[0] != TYPE_FIRE || gSpeciesInfo[SPECIES_WOBBUFFET].types[1] != TYPE_FIRE); ASSUME(gSpeciesInfo[SPECIES_CYNDAQUIL].types[0] == TYPE_FIRE || gSpeciesInfo[SPECIES_CYNDAQUIL].types[1] == TYPE_FIRE); diff --git a/test/battle/move_effect/chilly_reception.c b/test/battle/move_effect/chilly_reception.c index 6f731f4b6ff7..e3ce16c49653 100644 --- a/test/battle/move_effect/chilly_reception.c +++ b/test/battle/move_effect/chilly_reception.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_CHILLY_RECEPTION].effect == EFFECT_CHILLY_RECEPTION); + ASSUME(gMovesInfo[MOVE_CHILLY_RECEPTION].effect == EFFECT_CHILLY_RECEPTION); } SINGLE_BATTLE_TEST("Chilly Reception sets up snow and switches the user out") diff --git a/test/battle/move_effect/collision_course.c b/test/battle/move_effect/collision_course.c index 734095038b6a..9eeeda5b1e76 100644 --- a/test/battle/move_effect/collision_course.c +++ b/test/battle/move_effect/collision_course.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_COLLISION_COURSE].effect == EFFECT_COLLISION_COURSE); + ASSUME(gMovesInfo[MOVE_COLLISION_COURSE].effect == EFFECT_COLLISION_COURSE); } SINGLE_BATTLE_TEST("Collision Course damage is increased by 33 Percent if super effective", s16 damage) diff --git a/test/battle/move_effect/corrosive_gas.c b/test/battle/move_effect/corrosive_gas.c index e4b6a958e7ea..c2c921cf742f 100644 --- a/test/battle/move_effect/corrosive_gas.c +++ b/test/battle/move_effect/corrosive_gas.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_CORROSIVE_GAS].effect == EFFECT_CORROSIVE_GAS); + ASSUME(gMovesInfo[MOVE_CORROSIVE_GAS].effect == EFFECT_CORROSIVE_GAS); } SINGLE_BATTLE_TEST("Corrosive Gas destroys the target's item or fails if the target has no item") @@ -53,7 +53,7 @@ SINGLE_BATTLE_TEST("Corrosive Gas doesn't destroy the item of a Pokemon with the SINGLE_BATTLE_TEST("Items lost to Corrosive Gas cannot be restored by Recycle") { GIVEN { - ASSUME(gBattleMoves[MOVE_RECYCLE].effect == EFFECT_RECYCLE); + ASSUME(gMovesInfo[MOVE_RECYCLE].effect == EFFECT_RECYCLE); PLAYER(SPECIES_WOBBUFFET) {Speed(15); } OPPONENT(SPECIES_WOBBUFFET) {Item(ITEM_ORAN_BERRY); Speed(10); } } WHEN { diff --git a/test/battle/move_effect/court_change.c b/test/battle/move_effect/court_change.c index 4aa2e9d365bb..2986a3ec6eea 100644 --- a/test/battle/move_effect/court_change.c +++ b/test/battle/move_effect/court_change.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_COURT_CHANGE].effect == EFFECT_COURT_CHANGE); + ASSUME(gMovesInfo[MOVE_COURT_CHANGE].effect == EFFECT_COURT_CHANGE); } DOUBLE_BATTLE_TEST("Court Change swaps entry hazards used by the opponent") diff --git a/test/battle/move_effect/defense_down.c b/test/battle/move_effect/defense_down.c index dfc9628f550a..df672469c23f 100644 --- a/test/battle/move_effect/defense_down.c +++ b/test/battle/move_effect/defense_down.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TAIL_WHIP].effect == EFFECT_DEFENSE_DOWN); + ASSUME(gMovesInfo[MOVE_TAIL_WHIP].effect == EFFECT_DEFENSE_DOWN); } SINGLE_BATTLE_TEST("Tail Whip lowers Defense", s16 damage) @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Tail Whip lowers Defense", s16 damage) PARAMETRIZE { lowerDefense = FALSE; } PARAMETRIZE { lowerDefense = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/defense_up.c b/test/battle/move_effect/defense_up.c index 6b18ecc9343d..25a98ff086d3 100644 --- a/test/battle/move_effect/defense_up.c +++ b/test/battle/move_effect/defense_up.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HARDEN].effect == EFFECT_DEFENSE_UP); + ASSUME(gMovesInfo[MOVE_HARDEN].effect == EFFECT_DEFENSE_UP); } SINGLE_BATTLE_TEST("Harden raises Defense", s16 damage) @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Harden raises Defense", s16 damage) PARAMETRIZE { raiseDefense = FALSE; } PARAMETRIZE { raiseDefense = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/defog.c b/test/battle/move_effect/defog.c index 635fe822c4bc..91f0970a3077 100644 --- a/test/battle/move_effect/defog.c +++ b/test/battle/move_effect/defog.c @@ -3,20 +3,20 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_DEFOG].effect == EFFECT_DEFOG); - ASSUME(gBattleMoves[MOVE_REFLECT].effect == EFFECT_REFLECT); - ASSUME(gBattleMoves[MOVE_LIGHT_SCREEN].effect == EFFECT_LIGHT_SCREEN); - ASSUME(gBattleMoves[MOVE_MIST].effect == EFFECT_MIST); - ASSUME(gBattleMoves[MOVE_SAFEGUARD].effect == EFFECT_SAFEGUARD); - ASSUME(gBattleMoves[MOVE_AURORA_VEIL].effect == EFFECT_AURORA_VEIL); - ASSUME(gBattleMoves[MOVE_STEALTH_ROCK].effect == EFFECT_STEALTH_ROCK); - ASSUME(gBattleMoves[MOVE_SPIKES].effect == EFFECT_SPIKES); - ASSUME(gBattleMoves[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); - ASSUME(gBattleMoves[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); - ASSUME(gBattleMoves[MOVE_SCREECH].effect == EFFECT_DEFENSE_DOWN_2); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_DEFOG].effect == EFFECT_DEFOG); + ASSUME(gMovesInfo[MOVE_REFLECT].effect == EFFECT_REFLECT); + ASSUME(gMovesInfo[MOVE_LIGHT_SCREEN].effect == EFFECT_LIGHT_SCREEN); + ASSUME(gMovesInfo[MOVE_MIST].effect == EFFECT_MIST); + ASSUME(gMovesInfo[MOVE_SAFEGUARD].effect == EFFECT_SAFEGUARD); + ASSUME(gMovesInfo[MOVE_AURORA_VEIL].effect == EFFECT_AURORA_VEIL); + ASSUME(gMovesInfo[MOVE_STEALTH_ROCK].effect == EFFECT_STEALTH_ROCK); + ASSUME(gMovesInfo[MOVE_SPIKES].effect == EFFECT_SPIKES); + ASSUME(gMovesInfo[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); + ASSUME(gMovesInfo[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_SCREECH].effect == EFFECT_DEFENSE_DOWN_2); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Defog lowers evasiveness by 1") @@ -296,7 +296,7 @@ DOUBLE_BATTLE_TEST("Defog lowers evasiveness by 1 and removes Aurora Veil from p PARAMETRIZE { move = MOVE_DEFOG; } PARAMETRIZE { move = MOVE_CELEBRATE; } GIVEN { - ASSUME(gBattleMoves[MOVE_HAIL].effect == EFFECT_HAIL); + ASSUME(gMovesInfo[MOVE_HAIL].effect == EFFECT_HAIL); ASSUME(gSpeciesInfo[SPECIES_GLALIE].types[0] == TYPE_ICE); PLAYER(SPECIES_GLALIE) { Speed(4); } PLAYER(SPECIES_GLALIE) { Speed(3); } @@ -328,7 +328,7 @@ DOUBLE_BATTLE_TEST("Defog lowers evasiveness by 1 and removes Aurora Veil from p DOUBLE_BATTLE_TEST("Defog lowers evasiveness by 1 and removes everything it can") { GIVEN { - ASSUME(gBattleMoves[MOVE_HAIL].effect == EFFECT_HAIL); + ASSUME(gMovesInfo[MOVE_HAIL].effect == EFFECT_HAIL); ASSUME(gSpeciesInfo[SPECIES_GLALIE].types[0] == TYPE_ICE); PLAYER(SPECIES_GLALIE) { Speed(4); } PLAYER(SPECIES_GLALIE) { Speed(3); } diff --git a/test/battle/move_effect/doodle.c b/test/battle/move_effect/doodle.c index 23671b38463e..bf7e208646ba 100644 --- a/test/battle/move_effect/doodle.c +++ b/test/battle/move_effect/doodle.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_DOODLE].effect == EFFECT_DOODLE); + ASSUME(gMovesInfo[MOVE_DOODLE].effect == EFFECT_DOODLE); } DOUBLE_BATTLE_TEST("Doodle gives the target's ability to user and ally") diff --git a/test/battle/move_effect/double_shock.c b/test/battle/move_effect/double_shock.c index 7357a10fecd3..1771724fcd4c 100644 --- a/test/battle/move_effect/double_shock.c +++ b/test/battle/move_effect/double_shock.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_DOUBLE_SHOCK].effect == EFFECT_FAIL_IF_NOT_ARG_TYPE); + ASSUME(gMovesInfo[MOVE_DOUBLE_SHOCK].effect == EFFECT_FAIL_IF_NOT_ARG_TYPE); ASSUME(MoveHasMoveEffectSelfArg(MOVE_DOUBLE_SHOCK, MOVE_EFFECT_REMOVE_ARG_TYPE, TYPE_ELECTRIC) == TRUE); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[0] != TYPE_ELECTRIC || gSpeciesInfo[SPECIES_WOBBUFFET].types[1] != TYPE_ELECTRIC); ASSUME(gSpeciesInfo[SPECIES_PIKACHU].types[0] == TYPE_ELECTRIC || gSpeciesInfo[SPECIES_PIKACHU].types[1] == TYPE_ELECTRIC); diff --git a/test/battle/move_effect/dream_eater.c b/test/battle/move_effect/dream_eater.c index 62fd918a1ba7..4ce749b5d2ba 100644 --- a/test/battle/move_effect/dream_eater.c +++ b/test/battle/move_effect/dream_eater.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_DREAM_EATER].effect == EFFECT_DREAM_EATER); + ASSUME(gMovesInfo[MOVE_DREAM_EATER].effect == EFFECT_DREAM_EATER); } SINGLE_BATTLE_TEST("Dream Eater recovers 50% of the damage dealt") diff --git a/test/battle/move_effect/embargo.c b/test/battle/move_effect/embargo.c index c6514aa67374..ca7a9d9e0351 100644 --- a/test/battle/move_effect/embargo.c +++ b/test/battle/move_effect/embargo.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_EMBARGO].effect == EFFECT_EMBARGO); + ASSUME(gMovesInfo[MOVE_EMBARGO].effect == EFFECT_EMBARGO); } SINGLE_BATTLE_TEST("Embargo blocks the effect of an affected Pokémon's held item") diff --git a/test/battle/move_effect/encore.c b/test/battle/move_effect/encore.c index 08d3f2544832..670122dc3711 100644 --- a/test/battle/move_effect/encore.c +++ b/test/battle/move_effect/encore.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ENCORE].effect == EFFECT_ENCORE); + ASSUME(gMovesInfo[MOVE_ENCORE].effect == EFFECT_ENCORE); } SINGLE_BATTLE_TEST("Encore forces consecutive move uses for 2 turns for player") diff --git a/test/battle/move_effect/evasion_up.c b/test/battle/move_effect/evasion_up.c index ecb6429cd35e..4dcd92c7b305 100644 --- a/test/battle/move_effect/evasion_up.c +++ b/test/battle/move_effect/evasion_up.c @@ -3,13 +3,13 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_DOUBLE_TEAM].effect == EFFECT_EVASION_UP); + ASSUME(gMovesInfo[MOVE_DOUBLE_TEAM].effect == EFFECT_EVASION_UP); } SINGLE_BATTLE_TEST("Double Team raises Evasion") { - ASSUME(gBattleMoves[MOVE_SCRATCH].accuracy == 100); - PASSES_RANDOMLY(gBattleMoves[MOVE_SCRATCH].accuracy * 3 / 4, 100, RNG_ACCURACY); + ASSUME(gMovesInfo[MOVE_SCRATCH].accuracy == 100); + PASSES_RANDOMLY(gMovesInfo[MOVE_SCRATCH].accuracy * 3 / 4, 100, RNG_ACCURACY); GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/explosion.c b/test/battle/move_effect/explosion.c index ef6dba6c0bff..21d3f1b790ca 100644 --- a/test/battle/move_effect/explosion.c +++ b/test/battle/move_effect/explosion.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); + ASSUME(gMovesInfo[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); } SINGLE_BATTLE_TEST("Explosion causes the user to faint") @@ -54,7 +54,7 @@ SINGLE_BATTLE_TEST("Explosion causes the user to faint even if it misses") SINGLE_BATTLE_TEST("Explosion causes the user to faint even if it has no effect") { GIVEN { - ASSUME(gBattleMoves[MOVE_EXPLOSION].type == TYPE_NORMAL); + ASSUME(gMovesInfo[MOVE_EXPLOSION].type == TYPE_NORMAL); ASSUME(gSpeciesInfo[SPECIES_GASTLY].types[0] == TYPE_GHOST); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_GASTLY); diff --git a/test/battle/move_effect/fickle_beam.c b/test/battle/move_effect/fickle_beam.c index 2732b641a6d6..ffbbe4d18dc5 100644 --- a/test/battle/move_effect/fickle_beam.c +++ b/test/battle/move_effect/fickle_beam.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_FICKLE_BEAM].effect == EFFECT_FICKLE_BEAM); + ASSUME(gMovesInfo[MOVE_FICKLE_BEAM].effect == EFFECT_FICKLE_BEAM); } SINGLE_BATTLE_TEST("Fickle Beam deals double damage 30% of the time") @@ -12,8 +12,8 @@ SINGLE_BATTLE_TEST("Fickle Beam deals double damage 30% of the time") PASSES_RANDOMLY(30, 100, RNG_FICKLE_BEAM); GIVEN { - ASSUME(gBattleMoves[MOVE_POWER_GEM].power == 80); - ASSUME(gBattleMoves[MOVE_FICKLE_BEAM].power == 80); + ASSUME(gMovesInfo[MOVE_POWER_GEM].power == 80); + ASSUME(gMovesInfo[MOVE_FICKLE_BEAM].power == 80); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/fillet_away.c b/test/battle/move_effect/fillet_away.c index ea403e16d6dc..8d770860a804 100644 --- a/test/battle/move_effect/fillet_away.c +++ b/test/battle/move_effect/fillet_away.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_FILLET_AWAY].effect == EFFECT_FILLET_AWAY); + ASSUME(gMovesInfo[MOVE_FILLET_AWAY].effect == EFFECT_FILLET_AWAY); } SINGLE_BATTLE_TEST("Fillet Away cuts the user's HP in half") diff --git a/test/battle/move_effect/fling.c b/test/battle/move_effect/fling.c index 88e27b0d6d2b..e8451a74dda8 100644 --- a/test/battle/move_effect/fling.c +++ b/test/battle/move_effect/fling.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_FLING].effect == EFFECT_FLING); + ASSUME(gMovesInfo[MOVE_FLING].effect == EFFECT_FLING); } SINGLE_BATTLE_TEST("Fling fails if pokemon holds no item") @@ -38,8 +38,8 @@ SINGLE_BATTLE_TEST("Fling fails if pokemon is under the effects of Embargo or Ma PARAMETRIZE {move = MOVE_MAGIC_ROOM; } GIVEN { - ASSUME(gBattleMoves[MOVE_EMBARGO].effect == EFFECT_EMBARGO); - ASSUME(gBattleMoves[MOVE_MAGIC_ROOM].effect == EFFECT_MAGIC_ROOM); + ASSUME(gMovesInfo[MOVE_EMBARGO].effect == EFFECT_EMBARGO); + ASSUME(gMovesInfo[MOVE_MAGIC_ROOM].effect == EFFECT_MAGIC_ROOM); PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RAZOR_CLAW); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -83,7 +83,7 @@ SINGLE_BATTLE_TEST("Fling fails for pokemon with Klutz ability") SINGLE_BATTLE_TEST("Fling's thrown item can be regained with Recycle") { GIVEN { - ASSUME(gBattleMoves[MOVE_RECYCLE].effect == EFFECT_RECYCLE); + ASSUME(gMovesInfo[MOVE_RECYCLE].effect == EFFECT_RECYCLE); PLAYER(SPECIES_WOBBUFFET) {Item(ITEM_RAZOR_CLAW); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -106,7 +106,7 @@ SINGLE_BATTLE_TEST("Fling's thrown item can be regained with Recycle") SINGLE_BATTLE_TEST("Fling - Item is lost even when there is no target") { GIVEN { - ASSUME(gBattleMoves[MOVE_SELF_DESTRUCT].effect == EFFECT_EXPLOSION); + ASSUME(gMovesInfo[MOVE_SELF_DESTRUCT].effect == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET) {Item(ITEM_RAZOR_CLAW); Speed(2); } OPPONENT(SPECIES_WOBBUFFET) {Speed(5); } OPPONENT(SPECIES_WOBBUFFET) {Speed(5); } @@ -131,7 +131,7 @@ SINGLE_BATTLE_TEST("Fling - Item is lost even when there is no target") SINGLE_BATTLE_TEST("Fling - Item is lost when target protects itself") { GIVEN { - ASSUME(gBattleMoves[MOVE_PROTECT].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_PROTECT].effect == EFFECT_PROTECT); PLAYER(SPECIES_WOBBUFFET) {Item(ITEM_RAZOR_CLAW); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -362,7 +362,7 @@ SINGLE_BATTLE_TEST("Fling - thrown berry's effect activates for the target even PARAMETRIZE { item = ITEM_SALAC_BERRY; effect = HOLD_EFFECT_SPEED_UP; statId = STAT_SPEED; } GIVEN { - ASSUME(gBattleMoves[MOVE_FLING].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_FLING].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Item(item); Attack(1); } OPPONENT(SPECIES_WOBBUFFET) { Status1(status1); HP(399); MaxHP(400); MovesWithPP({MOVE_CELEBRATE, 35}); } } WHEN { @@ -441,7 +441,7 @@ SINGLE_BATTLE_TEST("Fling deals damage based on items fling power") s16 damage[2]; GIVEN { - ASSUME(gBattleMoves[MOVE_CRUNCH].power == 80); + ASSUME(gMovesInfo[MOVE_CRUNCH].power == 80); ASSUME(gItems[ITEM_VENUSAURITE].flingPower == 80); PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_VENUSAURITE); } OPPONENT(SPECIES_REGIROCK); diff --git a/test/battle/move_effect/focus_punch.c b/test/battle/move_effect/focus_punch.c index e97deef439d0..5bfb606b0ffe 100644 --- a/test/battle/move_effect/focus_punch.c +++ b/test/battle/move_effect/focus_punch.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_FOCUS_PUNCH].effect == EFFECT_FOCUS_PUNCH); + ASSUME(gMovesInfo[MOVE_FOCUS_PUNCH].effect == EFFECT_FOCUS_PUNCH); } SINGLE_BATTLE_TEST("Focus Punch activates only if not damaged") diff --git a/test/battle/move_effect/freeze_hit.c b/test/battle/move_effect/freeze_hit.c index 8d5b34b7940e..1fefd59d1261 100644 --- a/test/battle/move_effect/freeze_hit.c +++ b/test/battle/move_effect/freeze_hit.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(MoveHasMoveEffect(MOVE_POWDER_SNOW, MOVE_EFFECT_FREEZE_OR_FROSTBITE) == TRUE); - ASSUME(gBattleMoves[MOVE_BLIZZARD].accuracy == 70); + ASSUME(gMovesInfo[MOVE_BLIZZARD].accuracy == 70); } SINGLE_BATTLE_TEST("Powder Snow inflicts freeze") @@ -76,7 +76,7 @@ SINGLE_BATTLE_TEST("Freezing Glare shouldn't freeze Psychic-types") GIVEN { ASSUME(gSpeciesInfo[SPECIES_ARTICUNO_GALARIAN].types[0] == TYPE_PSYCHIC); ASSUME(MoveHasMoveEffect(MOVE_FREEZING_GLARE, MOVE_EFFECT_FREEZE_OR_FROSTBITE) == TRUE); - ASSUME(gBattleMoves[MOVE_FREEZING_GLARE].type == TYPE_PSYCHIC); + ASSUME(gMovesInfo[MOVE_FREEZING_GLARE].type == TYPE_PSYCHIC); PLAYER(SPECIES_ARTICUNO_GALARIAN); OPPONENT(SPECIES_ARTICUNO_GALARIAN); } WHEN { diff --git a/test/battle/move_effect/glaive_rush.c b/test/battle/move_effect/glaive_rush.c index 6248da8726e5..639756da44a7 100644 --- a/test/battle/move_effect/glaive_rush.c +++ b/test/battle/move_effect/glaive_rush.c @@ -3,14 +3,14 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_GLAIVE_RUSH].effect == EFFECT_GLAIVE_RUSH); + ASSUME(gMovesInfo[MOVE_GLAIVE_RUSH].effect == EFFECT_GLAIVE_RUSH); } SINGLE_BATTLE_TEST("If Glaive Rush is successful moves targeted at the user do not check accuracy") { PASSES_RANDOMLY(100, 100, RNG_ACCURACY); GIVEN { - ASSUME(gBattleMoves[MOVE_MEGA_PUNCH].accuracy == 85); + ASSUME(gMovesInfo[MOVE_MEGA_PUNCH].accuracy == 85); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/haze.c b/test/battle/move_effect/haze.c index f386110ef186..6cdb9c454a5b 100644 --- a/test/battle/move_effect/haze.c +++ b/test/battle/move_effect/haze.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HAZE].effect == EFFECT_HAZE); + ASSUME(gMovesInfo[MOVE_HAZE].effect == EFFECT_HAZE); } SINGLE_BATTLE_TEST("Haze resets stat changes", s16 damage) @@ -12,8 +12,8 @@ SINGLE_BATTLE_TEST("Haze resets stat changes", s16 damage) PARAMETRIZE { haze = FALSE; } PARAMETRIZE { haze = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_MEDITATE].effect == EFFECT_ATTACK_UP); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_MEDITATE].effect == EFFECT_ATTACK_UP); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/heal_pulse.c b/test/battle/move_effect/heal_pulse.c index 6ba678d2c58e..e25203998281 100644 --- a/test/battle/move_effect/heal_pulse.c +++ b/test/battle/move_effect/heal_pulse.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HEAL_PULSE].effect == EFFECT_HEAL_PULSE); + ASSUME(gMovesInfo[MOVE_HEAL_PULSE].effect == EFFECT_HEAL_PULSE); } SINGLE_BATTLE_TEST("Heal Pulse heals the target by 1/2 of it's maxHP") @@ -68,7 +68,7 @@ SINGLE_BATTLE_TEST("Heal Pulse ignores accurace checks") SINGLE_BATTLE_TEST("Heal Pulse is blocked by Substitute") { GIVEN { - ASSUME(gBattleMoves[MOVE_SUBSTITUTE].effect == EFFECT_SUBSTITUTE); + ASSUME(gMovesInfo[MOVE_SUBSTITUTE].effect == EFFECT_SUBSTITUTE); PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(50); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -86,8 +86,8 @@ SINGLE_BATTLE_TEST("Heal Pulse is blocked by Substitute") SINGLE_BATTLE_TEST("Floral Healing heals the target by 2/3rd of it's maxHP if Grassy Terrain is on the field") { GIVEN { - ASSUME(gBattleMoves[MOVE_FLORAL_HEALING].argument == MOVE_EFFECT_FLORAL_HEALING); - ASSUME(gBattleMoves[MOVE_GRASSY_TERRAIN].effect == EFFECT_GRASSY_TERRAIN); + ASSUME(gMovesInfo[MOVE_FLORAL_HEALING].argument == MOVE_EFFECT_FLORAL_HEALING); + ASSUME(gMovesInfo[MOVE_GRASSY_TERRAIN].effect == EFFECT_GRASSY_TERRAIN); PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/healing_wish.c b/test/battle/move_effect/healing_wish.c index 7fd7ffede21e..df0c2c3a9bbf 100644 --- a/test/battle/move_effect/healing_wish.c +++ b/test/battle/move_effect/healing_wish.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HEALING_WISH].effect == EFFECT_HEALING_WISH); - ASSUME(gBattleMoves[MOVE_LUNAR_DANCE].effect == EFFECT_HEALING_WISH); + ASSUME(gMovesInfo[MOVE_HEALING_WISH].effect == EFFECT_HEALING_WISH); + ASSUME(gMovesInfo[MOVE_LUNAR_DANCE].effect == EFFECT_HEALING_WISH); } SINGLE_BATTLE_TEST("Healing Wish causes the user to faint and fully heals the replacement") diff --git a/test/battle/move_effect/hex.c b/test/battle/move_effect/hex.c index 1c4e9a7a0fcd..25660d73099f 100644 --- a/test/battle/move_effect/hex.c +++ b/test/battle/move_effect/hex.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HEX].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); - ASSUME(gBattleMoves[MOVE_HEX].argument == STATUS1_ANY); + ASSUME(gMovesInfo[MOVE_HEX].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); + ASSUME(gMovesInfo[MOVE_HEX].argument == STATUS1_ANY); } SINGLE_BATTLE_TEST("Hex deals double damage to foes with a status", s16 damage) diff --git a/test/battle/move_effect/hit_escape.c b/test/battle/move_effect/hit_escape.c index 34821b1492fc..05ec894ae2b6 100644 --- a/test/battle/move_effect/hit_escape.c +++ b/test/battle/move_effect/hit_escape.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_U_TURN].effect == EFFECT_HIT_ESCAPE); + ASSUME(gMovesInfo[MOVE_U_TURN].effect == EFFECT_HIT_ESCAPE); } SINGLE_BATTLE_TEST("U-turn switches the user out") @@ -98,7 +98,7 @@ SINGLE_BATTLE_TEST("U-turn switches the user out if Wimp Out fails to activate") SINGLE_BATTLE_TEST("U-turn switches the user out after Ice Face activates") { GIVEN { - ASSUME(gBattleMoves[MOVE_U_TURN].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_U_TURN].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_BEEDRILL); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_EISCUE) { Ability(ABILITY_ICE_FACE); } diff --git a/test/battle/move_effect/hit_set_remove_terrain.c b/test/battle/move_effect/hit_set_remove_terrain.c index 4a54eb436d98..834b2dc22332 100644 --- a/test/battle/move_effect/hit_set_remove_terrain.c +++ b/test/battle/move_effect/hit_set_remove_terrain.c @@ -3,12 +3,12 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ELECTRIC_TERRAIN].effect == EFFECT_ELECTRIC_TERRAIN); - ASSUME(gBattleMoves[MOVE_PSYCHIC_TERRAIN].effect == EFFECT_PSYCHIC_TERRAIN); - ASSUME(gBattleMoves[MOVE_GRASSY_TERRAIN].effect == EFFECT_GRASSY_TERRAIN); - ASSUME(gBattleMoves[MOVE_MISTY_TERRAIN].effect == EFFECT_MISTY_TERRAIN); - ASSUME(gBattleMoves[MOVE_STEEL_ROLLER].effect == EFFECT_HIT_SET_REMOVE_TERRAIN); - ASSUME(gBattleMoves[MOVE_ICE_SPINNER].effect == EFFECT_HIT_SET_REMOVE_TERRAIN); + ASSUME(gMovesInfo[MOVE_ELECTRIC_TERRAIN].effect == EFFECT_ELECTRIC_TERRAIN); + ASSUME(gMovesInfo[MOVE_PSYCHIC_TERRAIN].effect == EFFECT_PSYCHIC_TERRAIN); + ASSUME(gMovesInfo[MOVE_GRASSY_TERRAIN].effect == EFFECT_GRASSY_TERRAIN); + ASSUME(gMovesInfo[MOVE_MISTY_TERRAIN].effect == EFFECT_MISTY_TERRAIN); + ASSUME(gMovesInfo[MOVE_STEEL_ROLLER].effect == EFFECT_HIT_SET_REMOVE_TERRAIN); + ASSUME(gMovesInfo[MOVE_ICE_SPINNER].effect == EFFECT_HIT_SET_REMOVE_TERRAIN); } SINGLE_BATTLE_TEST("Steel Roller and Ice Spinner can remove a terrain from the field") diff --git a/test/battle/move_effect/hit_switch_target.c b/test/battle/move_effect/hit_switch_target.c index 683b005fd642..22227ea8323e 100644 --- a/test/battle/move_effect/hit_switch_target.c +++ b/test/battle/move_effect/hit_switch_target.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); - ASSUME(gBattleMoves[MOVE_LOCK_ON].effect == EFFECT_LOCK_ON); + ASSUME(gMovesInfo[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); + ASSUME(gMovesInfo[MOVE_LOCK_ON].effect == EFFECT_LOCK_ON); } SINGLE_BATTLE_TEST("Dragon Tail switches the target with a random non-fainted replacement") diff --git a/test/battle/move_effect/hurricane.c b/test/battle/move_effect/hurricane.c index 3a1d42053af2..eab843e7209f 100644 --- a/test/battle/move_effect/hurricane.c +++ b/test/battle/move_effect/hurricane.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HURRICANE].effect == EFFECT_THUNDER); - ASSUME(gBattleMoves[MOVE_HURRICANE].accuracy == 70); + ASSUME(gMovesInfo[MOVE_HURRICANE].effect == EFFECT_THUNDER); + ASSUME(gMovesInfo[MOVE_HURRICANE].accuracy == 70); } SINGLE_BATTLE_TEST("Hurricane's accuracy is lowered to 50% in Sunlight") diff --git a/test/battle/move_effect/hydro_steam.c b/test/battle/move_effect/hydro_steam.c index 80a3a90d376f..a9c14c9acbba 100644 --- a/test/battle/move_effect/hydro_steam.c +++ b/test/battle/move_effect/hydro_steam.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HYDRO_STEAM].effect == EFFECT_HYDRO_STEAM); + ASSUME(gMovesInfo[MOVE_HYDRO_STEAM].effect == EFFECT_HYDRO_STEAM); } SINGLE_BATTLE_TEST("Hydro Steam deals 1.5x damage under both Sunlight and Rain", s16 damage) diff --git a/test/battle/move_effect/infernal_parade.c b/test/battle/move_effect/infernal_parade.c index abd43cfc4edc..bd7ec793ac20 100644 --- a/test/battle/move_effect/infernal_parade.c +++ b/test/battle/move_effect/infernal_parade.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_INFERNAL_PARADE].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); - ASSUME(gBattleMoves[MOVE_INFERNAL_PARADE].argument == STATUS1_ANY); + ASSUME(gMovesInfo[MOVE_INFERNAL_PARADE].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); + ASSUME(gMovesInfo[MOVE_INFERNAL_PARADE].argument == STATUS1_ANY); } SINGLE_BATTLE_TEST("Infernal Parade inflicts burn") diff --git a/test/battle/move_effect/ion_deluge.c b/test/battle/move_effect/ion_deluge.c index 20181fb75c3d..ab64667b06f3 100644 --- a/test/battle/move_effect/ion_deluge.c +++ b/test/battle/move_effect/ion_deluge.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ION_DELUGE].effect == EFFECT_ION_DELUGE); + ASSUME(gMovesInfo[MOVE_ION_DELUGE].effect == EFFECT_ION_DELUGE); } // For some reason SINGLE_BATTLE_TEST didn't catch these two issues. @@ -51,7 +51,7 @@ WILD_BATTLE_TEST("Ion Deluge works the same way as always when used by a mon wit SINGLE_BATTLE_TEST("Ion Deluge makes Normal type moves Electric type") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL); + ASSUME(gMovesInfo[MOVE_TACKLE].type == TYPE_NORMAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_GOLBAT); } WHEN { diff --git a/test/battle/move_effect/ivy_cudgel.c b/test/battle/move_effect/ivy_cudgel.c index 47db28f50d36..1693c439c04f 100644 --- a/test/battle/move_effect/ivy_cudgel.c +++ b/test/battle/move_effect/ivy_cudgel.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_IVY_CUDGEL].effect == EFFECT_IVY_CUDGEL); + ASSUME(gMovesInfo[MOVE_IVY_CUDGEL].effect == EFFECT_IVY_CUDGEL); } SINGLE_BATTLE_TEST("Ivy Cudgel changes the move type depending on the form of Ogerpon") diff --git a/test/battle/move_effect/knock_off.c b/test/battle/move_effect/knock_off.c index 3022a19633dd..863cf165d304 100644 --- a/test/battle/move_effect/knock_off.c +++ b/test/battle/move_effect/knock_off.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF); + ASSUME(gMovesInfo[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF); } SINGLE_BATTLE_TEST("Knock Off knocks a healing berry before it has the chance to activate") diff --git a/test/battle/move_effect/last_resort.c b/test/battle/move_effect/last_resort.c index 01a685ffc19d..a9660f2c0e42 100644 --- a/test/battle/move_effect/last_resort.c +++ b/test/battle/move_effect/last_resort.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_LAST_RESORT].effect == EFFECT_LAST_RESORT); + ASSUME(gMovesInfo[MOVE_LAST_RESORT].effect == EFFECT_LAST_RESORT); } SINGLE_BATTLE_TEST("Last Resort always fails if it's the only known move") @@ -95,7 +95,7 @@ SINGLE_BATTLE_TEST("Last Resort works only when all of the known moves have been SINGLE_BATTLE_TEST("Last Resort works with Sleep Talk") { GIVEN { - ASSUME(gBattleMoves[MOVE_SLEEP_TALK].effect == EFFECT_SLEEP_TALK); + ASSUME(gMovesInfo[MOVE_SLEEP_TALK].effect == EFFECT_SLEEP_TALK); PLAYER(SPECIES_WOBBUFFET) { Moves(MOVE_LAST_RESORT, MOVE_SLEEP_TALK); Status1(STATUS1_SLEEP_TURN(3)); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/leech_seed.c b/test/battle/move_effect/leech_seed.c index a2585a3d7fb7..6faf4e8031d8 100644 --- a/test/battle/move_effect/leech_seed.c +++ b/test/battle/move_effect/leech_seed.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_LEECH_SEED].effect == EFFECT_LEECH_SEED); + ASSUME(gMovesInfo[MOVE_LEECH_SEED].effect == EFFECT_LEECH_SEED); } SINGLE_BATTLE_TEST("Leech Seed doesn't affect Grass-type Pokémon") diff --git a/test/battle/move_effect/make_it_rain.c b/test/battle/move_effect/make_it_rain.c index 1b17106b876d..f6a13ac2b417 100644 --- a/test/battle/move_effect/make_it_rain.c +++ b/test/battle/move_effect/make_it_rain.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Make It Rain lowers special attack by one stage") s16 damage[2]; GIVEN { - ASSUME(gBattleMoves[MOVE_MAKE_IT_RAIN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_MAKE_IT_RAIN].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/max_hp_50_recoil.c b/test/battle/move_effect/max_hp_50_recoil.c index b921e5a85f23..d310de84c23b 100644 --- a/test/battle/move_effect/max_hp_50_recoil.c +++ b/test/battle/move_effect/max_hp_50_recoil.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_STEEL_BEAM].effect == EFFECT_MAX_HP_50_RECOIL); + ASSUME(gMovesInfo[MOVE_STEEL_BEAM].effect == EFFECT_MAX_HP_50_RECOIL); } SINGLE_BATTLE_TEST("Steel Beam causes the user to take damage equal to half of its maximum HP") diff --git a/test/battle/move_effect/meteor_beam.c b/test/battle/move_effect/meteor_beam.c index 600de153d47f..d9ae6fb99efb 100644 --- a/test/battle/move_effect/meteor_beam.c +++ b/test/battle/move_effect/meteor_beam.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ELECTRO_SHOT].effect == EFFECT_METEOR_BEAM); + ASSUME(gMovesInfo[MOVE_ELECTRO_SHOT].effect == EFFECT_METEOR_BEAM); } SINGLE_BATTLE_TEST("Electro Shot needs a charging Turn") diff --git a/test/battle/move_effect/metronome.c b/test/battle/move_effect/metronome.c index 390c834be257..d4efcaafff5f 100644 --- a/test/battle/move_effect/metronome.c +++ b/test/battle/move_effect/metronome.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_METRONOME].effect == EFFECT_METRONOME); + ASSUME(gMovesInfo[MOVE_METRONOME].effect == EFFECT_METRONOME); } SINGLE_BATTLE_TEST("Metronome picks a random move") @@ -25,9 +25,9 @@ SINGLE_BATTLE_TEST("Metronome picks a random move") SINGLE_BATTLE_TEST("Metronome's called powder move fails against Grass Types") { GIVEN { - ASSUME(gBattleMoves[MOVE_POISON_POWDER].powderMove); + ASSUME(gMovesInfo[MOVE_POISON_POWDER].powderMove); ASSUME(gSpeciesInfo[SPECIES_TANGELA].types[0] == TYPE_GRASS); - ASSUME(gBattleMoves[MOVE_POISON_POWDER].effect == EFFECT_POISON); + ASSUME(gMovesInfo[MOVE_POISON_POWDER].effect == EFFECT_POISON); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_TANGELA); } WHEN { @@ -45,7 +45,7 @@ SINGLE_BATTLE_TEST("Metronome's called powder move fails against Grass Types") SINGLE_BATTLE_TEST("Metronome's called multi-hit move hits multiple times") { GIVEN { - ASSUME(gBattleMoves[MOVE_ROCK_BLAST].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_ROCK_BLAST].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/mind_blown.c b/test/battle/move_effect/mind_blown.c index 671491a8469d..4f4d31cb1836 100644 --- a/test/battle/move_effect/mind_blown.c +++ b/test/battle/move_effect/mind_blown.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_MIND_BLOWN].effect == EFFECT_MIND_BLOWN); + ASSUME(gMovesInfo[MOVE_MIND_BLOWN].effect == EFFECT_MIND_BLOWN); } SINGLE_BATTLE_TEST("Mind Blown makes the user lose 1/2 of its HP") diff --git a/test/battle/move_effect/mirror_move.c b/test/battle/move_effect/mirror_move.c index 96d5280c530e..18ac8c78e19d 100644 --- a/test/battle/move_effect/mirror_move.c +++ b/test/battle/move_effect/mirror_move.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_MIRROR_MOVE].effect == EFFECT_MIRROR_MOVE); + ASSUME(gMovesInfo[MOVE_MIRROR_MOVE].effect == EFFECT_MIRROR_MOVE); } SINGLE_BATTLE_TEST("Mirror Move copies the last used move by the target") @@ -41,9 +41,9 @@ SINGLE_BATTLE_TEST("Mirror Move fails if no move was used before") SINGLE_BATTLE_TEST("Mirror Move's called powder move fails against Grass Types") { GIVEN { - ASSUME(gBattleMoves[MOVE_STUN_SPORE].powderMove); + ASSUME(gMovesInfo[MOVE_STUN_SPORE].powderMove); ASSUME(gSpeciesInfo[SPECIES_ODDISH].types[0] == TYPE_GRASS); - ASSUME(gBattleMoves[MOVE_STUN_SPORE].effect == EFFECT_PARALYZE); + ASSUME(gMovesInfo[MOVE_STUN_SPORE].effect == EFFECT_PARALYZE); PLAYER(SPECIES_ODDISH); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -62,7 +62,7 @@ SINGLE_BATTLE_TEST("Mirror Move's called powder move fails against Grass Types") SINGLE_BATTLE_TEST("Mirror Move's called multi-hit move hits multiple times") { GIVEN { - ASSUME(gBattleMoves[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/moonlight.c b/test/battle/move_effect/moonlight.c index ded85c3fc416..41359ea97cd4 100644 --- a/test/battle/move_effect/moonlight.c +++ b/test/battle/move_effect/moonlight.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_MOONLIGHT].effect == EFFECT_MOONLIGHT); + ASSUME(gMovesInfo[MOVE_MOONLIGHT].effect == EFFECT_MOONLIGHT); } SINGLE_BATTLE_TEST("Moonlight recovers 1/2 of the user's max HP") diff --git a/test/battle/move_effect/morning_sun.c b/test/battle/move_effect/morning_sun.c index 7157944c6bdf..3b57f895006c 100644 --- a/test/battle/move_effect/morning_sun.c +++ b/test/battle/move_effect/morning_sun.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_MORNING_SUN].effect == EFFECT_MORNING_SUN); + ASSUME(gMovesInfo[MOVE_MORNING_SUN].effect == EFFECT_MORNING_SUN); } SINGLE_BATTLE_TEST("Morning Sun recovers 1/2 of the user's max HP") diff --git a/test/battle/move_effect/multi_hit.c b/test/battle/move_effect/multi_hit.c index 99e506ad684e..d9d1c2b894f1 100644 --- a/test/battle/move_effect/multi_hit.c +++ b/test/battle/move_effect/multi_hit.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); } SINGLE_BATTLE_TEST("Multi hit Moves hit the maximum amount with Skill Link") @@ -141,7 +141,7 @@ SINGLE_BATTLE_TEST("Multi hit Moves hit five times 50 Percent of the time with L SINGLE_BATTLE_TEST("Scale Shot decreases defense and increases speed after final hit") { GIVEN { - ASSUME(gBattleMoves[MOVE_SCALE_SHOT].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_SCALE_SHOT].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -163,8 +163,8 @@ SINGLE_BATTLE_TEST("Scale Shot decreases defense and increases speed after final SINGLE_BATTLE_TEST("Endure does not prevent multiple hits and stat changes occur at the end of the turn") { GIVEN { - ASSUME(gBattleMoves[MOVE_SCALE_SHOT].effect == EFFECT_MULTI_HIT); - ASSUME(gBattleMoves[MOVE_ENDURE].effect == EFFECT_ENDURE); + ASSUME(gMovesInfo[MOVE_SCALE_SHOT].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_ENDURE].effect == EFFECT_ENDURE); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { HP(1); } } WHEN { diff --git a/test/battle/move_effect/ohko.c b/test/battle/move_effect/ohko.c index 63e77b07f9ff..ca448be6fd43 100644 --- a/test/battle/move_effect/ohko.c +++ b/test/battle/move_effect/ohko.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SHEER_COLD].effect == EFFECT_OHKO); + ASSUME(gMovesInfo[MOVE_SHEER_COLD].effect == EFFECT_OHKO); } SINGLE_BATTLE_TEST("Sheer Cold doesn't affect Ice-type Pokémon") diff --git a/test/battle/move_effect/paralyze_hit.c b/test/battle/move_effect/paralyze_hit.c index 158c19d3164c..4d1b4ce9da52 100644 --- a/test/battle/move_effect/paralyze_hit.c +++ b/test/battle/move_effect/paralyze_hit.c @@ -49,7 +49,7 @@ SINGLE_BATTLE_TEST("Body Slam shouldn't paralyze Normal-types") GIVEN { ASSUME(gSpeciesInfo[SPECIES_TAUROS].types[0] == TYPE_NORMAL); ASSUME(MoveHasMoveEffect(MOVE_BODY_SLAM, MOVE_EFFECT_PARALYSIS) == TRUE); - ASSUME(gBattleMoves[MOVE_BODY_SLAM].type == TYPE_NORMAL); + ASSUME(gMovesInfo[MOVE_BODY_SLAM].type == TYPE_NORMAL); PLAYER(SPECIES_TAUROS); OPPONENT(SPECIES_TAUROS); } WHEN { diff --git a/test/battle/move_effect/photon_geyser.c b/test/battle/move_effect/photon_geyser.c index 62fc9adf10b3..9342bec51518 100644 --- a/test/battle/move_effect/photon_geyser.c +++ b/test/battle/move_effect/photon_geyser.c @@ -3,14 +3,14 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_PHOTON_GEYSER].effect == EFFECT_PHOTON_GEYSER); + ASSUME(gMovesInfo[MOVE_PHOTON_GEYSER].effect == EFFECT_PHOTON_GEYSER); } SINGLE_BATTLE_TEST("Photon Geyser can be mirror coated if it is a special move") { GIVEN { // EFFECT_PHOTON_GEYSER requires the move data to be Special to work - ASSUME(gBattleMoves[MOVE_PHOTON_GEYSER].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_PHOTON_GEYSER].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Attack(100); SpAttack(110); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/plasma_fists.c b/test/battle/move_effect/plasma_fists.c index daef90ec5053..a7b1ac5f6ae8 100644 --- a/test/battle/move_effect/plasma_fists.c +++ b/test/battle/move_effect/plasma_fists.c @@ -3,13 +3,13 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_PLASMA_FISTS].effect == EFFECT_PLASMA_FISTS); + ASSUME(gMovesInfo[MOVE_PLASMA_FISTS].effect == EFFECT_PLASMA_FISTS); } SINGLE_BATTLE_TEST("Ion Duldge turns normal moves into electric for the remainder of the current turn") { GIVEN { - ASSUME(gBattleMoves[MOVE_ION_DELUGE].effect == EFFECT_ION_DELUGE); + ASSUME(gMovesInfo[MOVE_ION_DELUGE].effect == EFFECT_ION_DELUGE); PLAYER(SPECIES_KRABBY); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/pledge.c b/test/battle/move_effect/pledge.c index f7ee5db00d8e..4f73ea98fef5 100644 --- a/test/battle/move_effect/pledge.c +++ b/test/battle/move_effect/pledge.c @@ -3,9 +3,9 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_WATER_PLEDGE].effect == EFFECT_PLEDGE); - ASSUME(gBattleMoves[MOVE_FIRE_PLEDGE].effect == EFFECT_PLEDGE); - ASSUME(gBattleMoves[MOVE_GRASS_PLEDGE].effect == EFFECT_PLEDGE); + ASSUME(gMovesInfo[MOVE_WATER_PLEDGE].effect == EFFECT_PLEDGE); + ASSUME(gMovesInfo[MOVE_FIRE_PLEDGE].effect == EFFECT_PLEDGE); + ASSUME(gMovesInfo[MOVE_GRASS_PLEDGE].effect == EFFECT_PLEDGE); } DOUBLE_BATTLE_TEST("Water and Fire Pledge create a rainbow on the user's side of the field for four turns") @@ -189,7 +189,7 @@ DOUBLE_BATTLE_TEST("The base power of a combined pledge move effect is 150") s16 combinedPledgeDamage; GIVEN { - ASSUME(gBattleMoves[MOVE_HYPER_BEAM].power == 150); + ASSUME(gMovesInfo[MOVE_HYPER_BEAM].power == 150); PLAYER(SPECIES_WOBBUFFET) { Speed(4); } PLAYER(SPECIES_WYNAUT) { Speed(3); } OPPONENT(SPECIES_WOBBUFFET) { Speed(8); } @@ -313,7 +313,7 @@ DOUBLE_BATTLE_TEST("Damage calculation: Combined pledge move") PARAMETRIZE { expectedDamage = 136; } PARAMETRIZE { expectedDamage = 135; } GIVEN { - ASSUME(gBattleMoves[MOVE_GRASS_PLEDGE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GRASS_PLEDGE].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Speed(4); } PLAYER(SPECIES_WOBBUFFET) { HP(521); SpDefense(152); Speed(3); } OPPONENT(SPECIES_CHARIZARD) { Speed(8); } diff --git a/test/battle/move_effect/population_bomb.c b/test/battle/move_effect/population_bomb.c index e4fad6976ce0..4ef3d1110f5a 100644 --- a/test/battle/move_effect/population_bomb.c +++ b/test/battle/move_effect/population_bomb.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Population Bomb can hit ten times") { GIVEN { - ASSUME(gBattleMoves[MOVE_POPULATION_BOMB].strikeCount == 10); + ASSUME(gMovesInfo[MOVE_POPULATION_BOMB].strikeCount == 10); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/protect.c b/test/battle/move_effect/protect.c index 17b4c3427605..45baeeab6105 100644 --- a/test/battle/move_effect/protect.c +++ b/test/battle/move_effect/protect.c @@ -3,21 +3,21 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_PROTECT].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_DETECT].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_KINGS_SHIELD].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_SILK_TRAP].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_SPIKY_SHIELD].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_WIDE_GUARD].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_QUICK_GUARD].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_CRAFTY_SHIELD].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_BANEFUL_BUNKER].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_BURNING_BULWARK].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(gBattleMoves[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); - ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(!(gBattleMoves[MOVE_WATER_GUN].makesContact)); + ASSUME(gMovesInfo[MOVE_PROTECT].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_DETECT].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_KINGS_SHIELD].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_SILK_TRAP].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_SPIKY_SHIELD].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_WIDE_GUARD].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_QUICK_GUARD].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_CRAFTY_SHIELD].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_BANEFUL_BUNKER].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_BURNING_BULWARK].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); + ASSUME(gMovesInfo[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(!(gMovesInfo[MOVE_WATER_GUN].makesContact)); } SINGLE_BATTLE_TEST("Protect, Detect, Spiky Shield, Baneful Bunker and Burning Bulwark protect from all moves") @@ -240,10 +240,10 @@ SINGLE_BATTLE_TEST("Recoil damage is not applied if target was protected") GIVEN { - ASSUME(gBattleMoves[MOVE_VOLT_TACKLE].recoil > 0); - ASSUME(gBattleMoves[MOVE_HEAD_SMASH].recoil > 0); - ASSUME(gBattleMoves[MOVE_TAKE_DOWN].recoil > 0); - ASSUME(gBattleMoves[MOVE_DOUBLE_EDGE].recoil > 0); + ASSUME(gMovesInfo[MOVE_VOLT_TACKLE].recoil > 0); + ASSUME(gMovesInfo[MOVE_HEAD_SMASH].recoil > 0); + ASSUME(gMovesInfo[MOVE_TAKE_DOWN].recoil > 0); + ASSUME(gMovesInfo[MOVE_DOUBLE_EDGE].recoil > 0); PLAYER(SPECIES_RAPIDASH); OPPONENT(SPECIES_BEAUTIFLY); } WHEN { @@ -278,7 +278,7 @@ SINGLE_BATTLE_TEST("Multi-hit moves don't hit a protected target and fail only o PARAMETRIZE { move = MOVE_SPIKY_SHIELD; } GIVEN { - ASSUME(gBattleMoves[MOVE_ARM_THRUST].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_ARM_THRUST].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_RAPIDASH); OPPONENT(SPECIES_BEAUTIFLY); } WHEN { @@ -321,9 +321,9 @@ DOUBLE_BATTLE_TEST("Wide Guard protects self and ally from multi-target moves") PARAMETRIZE { move = MOVE_HYPER_VOICE; } // 2 foes GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].target == MOVE_TARGET_SELECTED); - ASSUME(gBattleMoves[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY); - ASSUME(gBattleMoves[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_TACKLE].target == MOVE_TARGET_SELECTED); + ASSUME(gMovesInfo[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gMovesInfo[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -360,7 +360,7 @@ DOUBLE_BATTLE_TEST("Wide Guard can not fail on consecutive turns") PASSES_RANDOMLY(2, 2); GIVEN { - ASSUME(gBattleMoves[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -393,8 +393,8 @@ DOUBLE_BATTLE_TEST("Quick Guard protects self and ally from priority moves") PARAMETRIZE { move = MOVE_QUICK_ATTACK; targetOpponent = opponentRight; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].priority == 0); - ASSUME(gBattleMoves[MOVE_QUICK_ATTACK].priority == 1); + ASSUME(gMovesInfo[MOVE_TACKLE].priority == 0); + ASSUME(gMovesInfo[MOVE_QUICK_ATTACK].priority == 1); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -423,7 +423,7 @@ DOUBLE_BATTLE_TEST("Quick Guard can not fail on consecutive turns") PASSES_RANDOMLY(2, 2); GIVEN { - ASSUME(gBattleMoves[MOVE_QUICK_ATTACK].priority == 1); + ASSUME(gMovesInfo[MOVE_QUICK_ATTACK].priority == 1); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -453,9 +453,9 @@ DOUBLE_BATTLE_TEST("Crafty Shield protects self and ally from status moves") PARAMETRIZE { move = MOVE_TACKLE; targetOpponent = opponentRight; } GIVEN { - ASSUME(gBattleMoves[MOVE_LEER].target == MOVE_TARGET_BOTH); - ASSUME(gBattleMoves[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); - ASSUME(gBattleMoves[MOVE_HYPER_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_LEER].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_HYPER_VOICE].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/psychic_noise.c b/test/battle/move_effect/psychic_noise.c index 405bbf492c35..6ad22fd45ac1 100644 --- a/test/battle/move_effect/psychic_noise.c +++ b/test/battle/move_effect/psychic_noise.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(MoveHasMoveEffect(MOVE_PSYCHIC_NOISE, MOVE_EFFECT_PSYCHIC_NOISE)); - ASSUME(gBattleMoves[MOVE_RECOVER].effect == EFFECT_RESTORE_HP); + ASSUME(gMovesInfo[MOVE_RECOVER].effect == EFFECT_RESTORE_HP); } SINGLE_BATTLE_TEST("Psychic Noise blocks healing moves for 2 turns") diff --git a/test/battle/move_effect/rage_fist.c b/test/battle/move_effect/rage_fist.c index 5070c6b329e8..50d4684f6cf3 100644 --- a/test/battle/move_effect/rage_fist.c +++ b/test/battle/move_effect/rage_fist.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_RAGE_FIST].effect == EFFECT_RAGE_FIST); - ASSUME(gBattleMoves[MOVE_RAGE_FIST].power == 50); + ASSUME(gMovesInfo[MOVE_RAGE_FIST].effect == EFFECT_RAGE_FIST); + ASSUME(gMovesInfo[MOVE_RAGE_FIST].power == 50); } SINGLE_BATTLE_TEST("Rage Fist base power is increased by 50 if the user takes damage") @@ -37,7 +37,7 @@ SINGLE_BATTLE_TEST("Rage Fist base power is increased by each multi hit") s16 timesGotHit[2]; GIVEN { - ASSUME(gBattleMoves[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); + ASSUME(gMovesInfo[MOVE_BULLET_SEED].effect == EFFECT_MULTI_HIT); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_REGIROCK); } WHEN { @@ -130,7 +130,7 @@ SINGLE_BATTLE_TEST("Rage Fist base power is not increased if a substitute was hi s16 timesGotHit[2]; GIVEN { - ASSUME(gBattleMoves[MOVE_CRUNCH].category == BATTLE_CATEGORY_PHYSICAL); // Substitute doesn't fade otherwise + ASSUME(gMovesInfo[MOVE_CRUNCH].category == BATTLE_CATEGORY_PHYSICAL); // Substitute doesn't fade otherwise PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_REGIROCK); } WHEN { diff --git a/test/battle/move_effect/recoil.c b/test/battle/move_effect/recoil.c index 7793bbdd5bb8..43a7a8405ce5 100644 --- a/test/battle/move_effect/recoil.c +++ b/test/battle/move_effect/recoil.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Take Down deals 25% of recoil damage to the user") s16 recoilDamage; GIVEN { - ASSUME(gBattleMoves[MOVE_TAKE_DOWN].recoil == 25); + ASSUME(gMovesInfo[MOVE_TAKE_DOWN].recoil == 25); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -27,7 +27,7 @@ SINGLE_BATTLE_TEST("Double Edge deals 33% of recoil damage to the user") s16 recoilDamage; GIVEN { - ASSUME(gBattleMoves[MOVE_DOUBLE_EDGE].recoil == 33); + ASSUME(gMovesInfo[MOVE_DOUBLE_EDGE].recoil == 33); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -47,7 +47,7 @@ SINGLE_BATTLE_TEST("Head Smash deals 50% of recoil damage to the user") s16 recoilDamage; GIVEN { - ASSUME(gBattleMoves[MOVE_HEAD_SMASH].recoil == 50); + ASSUME(gMovesInfo[MOVE_HEAD_SMASH].recoil == 50); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -67,8 +67,8 @@ SINGLE_BATTLE_TEST("Flare Blitz deals 33% of recoil damage to the user and can b s16 recoilDamage; GIVEN { - ASSUME(gBattleMoves[MOVE_FLARE_BLITZ].recoil == 33); - ASSUME(gBattleMoves[MOVE_FLARE_BLITZ].argument == STATUS1_BURN); + ASSUME(gMovesInfo[MOVE_FLARE_BLITZ].recoil == 33); + ASSUME(gMovesInfo[MOVE_FLARE_BLITZ].argument == STATUS1_BURN); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/recoil_if_miss.c b/test/battle/move_effect/recoil_if_miss.c index f7d5cf24231c..49c78a229e2d 100644 --- a/test/battle/move_effect/recoil_if_miss.c +++ b/test/battle/move_effect/recoil_if_miss.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_JUMP_KICK].effect == EFFECT_RECOIL_IF_MISS); + ASSUME(gMovesInfo[MOVE_JUMP_KICK].effect == EFFECT_RECOIL_IF_MISS); } SINGLE_BATTLE_TEST("Jump Kick has 50% recoil on miss") @@ -25,7 +25,7 @@ SINGLE_BATTLE_TEST("Jump Kick has 50% recoil on miss") SINGLE_BATTLE_TEST("Jump Kick has 50% recoil on protect") { GIVEN { - ASSUME(!gBattleMoves[MOVE_JUMP_KICK].ignoresProtect); + ASSUME(!gMovesInfo[MOVE_JUMP_KICK].ignoresProtect); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -64,7 +64,7 @@ SINGLE_BATTLE_TEST("Jump Kick's recoil happens after Spiky Shield damage and Pok PARAMETRIZE { hp = maxHp / 8; faintOnSpiky = TRUE; } // Faints after Spiky Shield's recoil GIVEN { - ASSUME(gBattleMoves[MOVE_SPIKY_SHIELD].effect == EFFECT_PROTECT); + ASSUME(gMovesInfo[MOVE_SPIKY_SHIELD].effect == EFFECT_PROTECT); PLAYER(SPECIES_WOBBUFFET) { HP(hp); MaxHP(maxHp); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/reflect.c b/test/battle/move_effect/reflect.c index a12f31e7c56d..d32ebcefa28e 100644 --- a/test/battle/move_effect/reflect.c +++ b/test/battle/move_effect/reflect.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_REFLECT].effect == EFFECT_REFLECT); + ASSUME(gMovesInfo[MOVE_REFLECT].effect == EFFECT_REFLECT); } SINGLE_BATTLE_TEST("Reflect reduces physical damage", s16 damage) @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Reflect reduces physical damage", s16 damage) PARAMETRIZE { move = MOVE_CELEBRATE; } PARAMETRIZE { move = MOVE_REFLECT; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -30,7 +30,7 @@ SINGLE_BATTLE_TEST("Reflect applies for 5 turns") { s16 damage[6]; GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/relic_song.c b/test/battle/move_effect/relic_song.c index 4e3a381ea265..0b5a89bf5d27 100644 --- a/test/battle/move_effect/relic_song.c +++ b/test/battle/move_effect/relic_song.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_RELIC_SONG].effect == EFFECT_RELIC_SONG); + ASSUME(gMovesInfo[MOVE_RELIC_SONG].effect == EFFECT_RELIC_SONG); ASSUME(MoveHasMoveEffect(MOVE_RELIC_SONG, MOVE_EFFECT_SLEEP) == TRUE); } diff --git a/test/battle/move_effect/revival_blessing.c b/test/battle/move_effect/revival_blessing.c index 63f454a779a9..397e01e73aee 100644 --- a/test/battle/move_effect/revival_blessing.c +++ b/test/battle/move_effect/revival_blessing.c @@ -13,7 +13,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_REVIVAL_BLESSING].effect == EFFECT_REVIVAL_BLESSING); + ASSUME(gMovesInfo[MOVE_REVIVAL_BLESSING].effect == EFFECT_REVIVAL_BLESSING); } SINGLE_BATTLE_TEST("Revival Blessing revives a chosen fainted party member for the player") diff --git a/test/battle/move_effect/roar.c b/test/battle/move_effect/roar.c index 20f9348082d9..90e0fd1b47bf 100644 --- a/test/battle/move_effect/roar.c +++ b/test/battle/move_effect/roar.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ROAR].effect == EFFECT_ROAR); + ASSUME(gMovesInfo[MOVE_ROAR].effect == EFFECT_ROAR); } SINGLE_BATTLE_TEST("Roar switches the target with a random non-fainted replacement") diff --git a/test/battle/move_effect/roost.c b/test/battle/move_effect/roost.c index 3a46350ed3d1..1ae84dd088d7 100644 --- a/test/battle/move_effect/roost.c +++ b/test/battle/move_effect/roost.c @@ -3,28 +3,28 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_ROOST].effect == EFFECT_ROOST); + ASSUME(gMovesInfo[MOVE_ROOST].effect == EFFECT_ROOST); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[0] != TYPE_FLYING); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[1] != TYPE_FLYING); // One attack of each type to verify typelessness - ASSUME(gBattleMoves[MOVE_POUND].type == TYPE_NORMAL); - ASSUME(gBattleMoves[MOVE_KARATE_CHOP].type == TYPE_FIGHTING); - ASSUME(gBattleMoves[MOVE_GUST].type == TYPE_FLYING); - ASSUME(gBattleMoves[MOVE_POISON_STING].type == TYPE_POISON); - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].type == TYPE_GROUND); - ASSUME(gBattleMoves[MOVE_ROCK_THROW].type == TYPE_ROCK); - ASSUME(gBattleMoves[MOVE_LEECH_LIFE].type == TYPE_BUG); - ASSUME(gBattleMoves[MOVE_LICK].type == TYPE_GHOST); - ASSUME(gBattleMoves[MOVE_STEEL_WING].type == TYPE_STEEL); - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); - ASSUME(gBattleMoves[MOVE_WATER_GUN].type == TYPE_WATER); - ASSUME(gBattleMoves[MOVE_VINE_WHIP].type == TYPE_GRASS); - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); - ASSUME(gBattleMoves[MOVE_CONFUSION].type == TYPE_PSYCHIC); - ASSUME(gBattleMoves[MOVE_ICE_BEAM].type == TYPE_ICE); - ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].type == TYPE_DRAGON); - ASSUME(gBattleMoves[MOVE_BITE].type == TYPE_DARK); - ASSUME(gBattleMoves[MOVE_DISARMING_VOICE].type == TYPE_FAIRY); + ASSUME(gMovesInfo[MOVE_POUND].type == TYPE_NORMAL); + ASSUME(gMovesInfo[MOVE_KARATE_CHOP].type == TYPE_FIGHTING); + ASSUME(gMovesInfo[MOVE_GUST].type == TYPE_FLYING); + ASSUME(gMovesInfo[MOVE_POISON_STING].type == TYPE_POISON); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].type == TYPE_GROUND); + ASSUME(gMovesInfo[MOVE_ROCK_THROW].type == TYPE_ROCK); + ASSUME(gMovesInfo[MOVE_LEECH_LIFE].type == TYPE_BUG); + ASSUME(gMovesInfo[MOVE_LICK].type == TYPE_GHOST); + ASSUME(gMovesInfo[MOVE_STEEL_WING].type == TYPE_STEEL); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_WATER_GUN].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_VINE_WHIP].type == TYPE_GRASS); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); + ASSUME(gMovesInfo[MOVE_CONFUSION].type == TYPE_PSYCHIC); + ASSUME(gMovesInfo[MOVE_ICE_BEAM].type == TYPE_ICE); + ASSUME(gMovesInfo[MOVE_DRAGON_BREATH].type == TYPE_DRAGON); + ASSUME(gMovesInfo[MOVE_BITE].type == TYPE_DARK); + ASSUME(gMovesInfo[MOVE_DISARMING_VOICE].type == TYPE_FAIRY); } SINGLE_BATTLE_TEST("Roost fails when user is at full HP") diff --git a/test/battle/move_effect/salt_cure.c b/test/battle/move_effect/salt_cure.c index b0b58c997ce1..547797e38b47 100644 --- a/test/battle/move_effect/salt_cure.c +++ b/test/battle/move_effect/salt_cure.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SALT_CURE].effect == EFFECT_SALT_CURE); + ASSUME(gMovesInfo[MOVE_SALT_CURE].effect == EFFECT_SALT_CURE); } SINGLE_BATTLE_TEST("Salt Cure inflicts 1/8 of the target's maximum HP as damage per turn") diff --git a/test/battle/move_effect/shed_tail.c b/test/battle/move_effect/shed_tail.c index 258d52b3daab..7ca787af1d2d 100644 --- a/test/battle/move_effect/shed_tail.c +++ b/test/battle/move_effect/shed_tail.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SHED_TAIL].effect == EFFECT_SHED_TAIL); + ASSUME(gMovesInfo[MOVE_SHED_TAIL].effect == EFFECT_SHED_TAIL); } SINGLE_BATTLE_TEST("Shed Tail creates a Substitute at the cost of 1/2 users maximum HP and switches the user out") diff --git a/test/battle/move_effect/shell_trap.c b/test/battle/move_effect/shell_trap.c index 9d582c78beed..d1aa217ecce6 100644 --- a/test/battle/move_effect/shell_trap.c +++ b/test/battle/move_effect/shell_trap.c @@ -3,10 +3,10 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SHELL_TRAP].effect == EFFECT_SHELL_TRAP); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gBattleMoves[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_SHELL_TRAP].effect == EFFECT_SHELL_TRAP); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); } SINGLE_BATTLE_TEST("Shell Trap activates only if hit by a physical move") @@ -98,7 +98,7 @@ SINGLE_BATTLE_TEST("Shell Trap does not activate if battler faints before being DOUBLE_BATTLE_TEST("Shell Trap activates immediately after being hit on turn 1 and attacks both opponents") { GIVEN { - ASSUME(gBattleMoves[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } PLAYER(SPECIES_WOBBUFFET) { Speed(2); } OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } @@ -122,7 +122,7 @@ DOUBLE_BATTLE_TEST("Shell Trap activates immediately after being hit on turn 1 a DOUBLE_BATTLE_TEST("Shell Trap activates immediately after being hit on turn 2 and attacks both opponents") { GIVEN { - ASSUME(gBattleMoves[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } PLAYER(SPECIES_WOBBUFFET) { Speed(2); } OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } @@ -146,7 +146,7 @@ DOUBLE_BATTLE_TEST("Shell Trap activates immediately after being hit on turn 2 a DOUBLE_BATTLE_TEST("Shell Trap activates immediately after being hit on turn 3 and attacks both opponents") { GIVEN { - ASSUME(gBattleMoves[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); + ASSUME(gMovesInfo[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } PLAYER(SPECIES_WOBBUFFET) { Speed(7); } OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } diff --git a/test/battle/move_effect/sleep.c b/test/battle/move_effect/sleep.c index d2cac0af9ba7..05efb7ab749c 100644 --- a/test/battle/move_effect/sleep.c +++ b/test/battle/move_effect/sleep.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_HYPNOSIS].effect == EFFECT_SLEEP); + ASSUME(gMovesInfo[MOVE_HYPNOSIS].effect == EFFECT_SLEEP); } SINGLE_BATTLE_TEST("Hypnosis inflicts 1-3 turns of sleep") diff --git a/test/battle/move_effect/solar_beam.c b/test/battle/move_effect/solar_beam.c index 6aa8056b728b..11edb61ba08f 100644 --- a/test/battle/move_effect/solar_beam.c +++ b/test/battle/move_effect/solar_beam.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SOLAR_BEAM].effect == EFFECT_SOLAR_BEAM); - ASSUME(gBattleMoves[MOVE_SOLAR_BLADE].effect == EFFECT_SOLAR_BEAM); + ASSUME(gMovesInfo[MOVE_SOLAR_BEAM].effect == EFFECT_SOLAR_BEAM); + ASSUME(gMovesInfo[MOVE_SOLAR_BLADE].effect == EFFECT_SOLAR_BEAM); } SINGLE_BATTLE_TEST("Solar Beam and Solar Blade can be used instantly in Sunlight") diff --git a/test/battle/move_effect/special_attack_down.c b/test/battle/move_effect/special_attack_down.c index 72f554de1da7..8eedb7c18055 100644 --- a/test/battle/move_effect/special_attack_down.c +++ b/test/battle/move_effect/special_attack_down.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN); } SINGLE_BATTLE_TEST("Confide lowers Special Attack", s16 damage) @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Confide lowers Special Attack", s16 damage) PARAMETRIZE { lowerSpecialAttack = FALSE; } PARAMETRIZE { lowerSpecialAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/special_attack_up_3.c b/test/battle/move_effect/special_attack_up_3.c index 404469139d06..2bf4074bedf7 100644 --- a/test/battle/move_effect/special_attack_up_3.c +++ b/test/battle/move_effect/special_attack_up_3.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TAIL_GLOW].effect == EFFECT_SPECIAL_ATTACK_UP_3); + ASSUME(gMovesInfo[MOVE_TAIL_GLOW].effect == EFFECT_SPECIAL_ATTACK_UP_3); } SINGLE_BATTLE_TEST("Tail Glow drastically raises Special Attack", s16 damage) @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Tail Glow drastically raises Special Attack", s16 damage) PARAMETRIZE { raiseSpecialAttack = FALSE; } PARAMETRIZE { raiseSpecialAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/spikes.c b/test/battle/move_effect/spikes.c index bfc0f39b5a50..97207297f92e 100644 --- a/test/battle/move_effect/spikes.c +++ b/test/battle/move_effect/spikes.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SPIKES].effect == EFFECT_SPIKES); + ASSUME(gMovesInfo[MOVE_SPIKES].effect == EFFECT_SPIKES); } SINGLE_BATTLE_TEST("Spikes damage on switch in") diff --git a/test/battle/move_effect/stealth_rock.c b/test/battle/move_effect/stealth_rock.c index 4662379f5ecb..23a773f8e828 100644 --- a/test/battle/move_effect/stealth_rock.c +++ b/test/battle/move_effect/stealth_rock.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_STEALTH_ROCK].effect == EFFECT_STEALTH_ROCK); + ASSUME(gMovesInfo[MOVE_STEALTH_ROCK].effect == EFFECT_STEALTH_ROCK); } SINGLE_BATTLE_TEST("Stealth Rock damage on switch in based on typing") diff --git a/test/battle/move_effect/sticky_web.c b/test/battle/move_effect/sticky_web.c index cdf577b5add7..6c6f8f156cb2 100644 --- a/test/battle/move_effect/sticky_web.c +++ b/test/battle/move_effect/sticky_web.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); + ASSUME(gMovesInfo[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); } SINGLE_BATTLE_TEST("Sticky Web lowers Speed by 1 on switch-in") @@ -49,7 +49,7 @@ SINGLE_BATTLE_TEST("Sticky Web can only be set up 1 time") DOUBLE_BATTLE_TEST("Sticky Web lowers Speed by 1 in a double battle after Explosion fainting both mons") { GIVEN { - ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); + ASSUME(gMovesInfo[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET) {Speed(5);} PLAYER(SPECIES_WOBBUFFET) {HP(1500); Speed(10);} PLAYER(SPECIES_WOBBUFFET) {Speed(10);} @@ -191,7 +191,7 @@ DOUBLE_BATTLE_TEST("Sticky Web has correct interactions with Mirror Armor - no o PARAMETRIZE {hasReplacement = FALSE;} GIVEN { - ASSUME(gBattleMoves[MOVE_MEMENTO].effect == EFFECT_MEMENTO); + ASSUME(gMovesInfo[MOVE_MEMENTO].effect == EFFECT_MEMENTO); PLAYER(SPECIES_SQUIRTLE) {Speed(5); } PLAYER(SPECIES_CHARMANDER) {Speed(5); } PLAYER(SPECIES_CORVIKNIGHT) {Ability(ABILITY_MIRROR_ARMOR); Item(ITEM_IRON_BALL); Speed(5); } // Iron Ball, so that flying type Corviknight is affected by Sticky Web. diff --git a/test/battle/move_effect/stockpile.c b/test/battle/move_effect/stockpile.c index f793d143094a..419b92bb11b4 100644 --- a/test/battle/move_effect/stockpile.c +++ b/test/battle/move_effect/stockpile.c @@ -4,9 +4,9 @@ // These tests cover all 3 effects: Stockpile, Spit up and Swallow. ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_STOCKPILE].effect == EFFECT_STOCKPILE); - ASSUME(gBattleMoves[MOVE_SWALLOW].effect == EFFECT_SWALLOW); - ASSUME(gBattleMoves[MOVE_SPIT_UP].effect == EFFECT_SPIT_UP); + ASSUME(gMovesInfo[MOVE_STOCKPILE].effect == EFFECT_STOCKPILE); + ASSUME(gMovesInfo[MOVE_SWALLOW].effect == EFFECT_SWALLOW); + ASSUME(gMovesInfo[MOVE_SPIT_UP].effect == EFFECT_SPIT_UP); } SINGLE_BATTLE_TEST("Stockpile's count can go up only to 3") @@ -148,8 +148,8 @@ SINGLE_BATTLE_TEST("Stockpile temporarily raises Def and Sp. Def", s16 dmgPyhsic PARAMETRIZE { move = MOVE_CELEBRATE; } GIVEN { ASSUME(B_STOCKPILE_RAISES_DEFS >= GEN_4); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Speed(2); } OPPONENT(SPECIES_WOBBUFFET) { Speed(1); } } WHEN { @@ -184,8 +184,8 @@ DOUBLE_BATTLE_TEST("Stockpile's Def and Sp. Def boost is lost after using Spit U PARAMETRIZE { count = 3; move = MOVE_SPIT_UP; } GIVEN { ASSUME(B_STOCKPILE_RAISES_DEFS >= GEN_4); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Speed(4); HP(399); MaxHP(400); } PLAYER(SPECIES_WOBBUFFET) { Speed(3); } OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } diff --git a/test/battle/move_effect/strength_sap.c b/test/battle/move_effect/strength_sap.c index d8e0b6e74bb3..fc4c424978d0 100644 --- a/test/battle/move_effect/strength_sap.c +++ b/test/battle/move_effect/strength_sap.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_STRENGTH_SAP].effect == EFFECT_STRENGTH_SAP); + ASSUME(gMovesInfo[MOVE_STRENGTH_SAP].effect == EFFECT_STRENGTH_SAP); } SINGLE_BATTLE_TEST("Strength Sap lowers Attack by 1 and restores HP based on target's Attack Stat", s16 hp) @@ -69,8 +69,8 @@ SINGLE_BATTLE_TEST("Strength Sap lowers Attack by 1 and restores HP based on tar } GIVEN { - ASSUME(gBattleMoves[MOVE_WORK_UP].effect == EFFECT_ATTACK_SPATK_UP); - ASSUME(gBattleMoves[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); + ASSUME(gMovesInfo[MOVE_WORK_UP].effect == EFFECT_ATTACK_SPATK_UP); + ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); PLAYER(SPECIES_WOBBUFFET) { HP(50); } OPPONENT(SPECIES_WOBBUFFET) { Attack(60); } } WHEN { @@ -117,7 +117,7 @@ SINGLE_BATTLE_TEST("Strength Sap lowers Attack by 1 and restores HP based on tar SINGLE_BATTLE_TEST("Strength Sap fails if target is at -6 Atk") { GIVEN { - ASSUME(gBattleMoves[MOVE_CHARM].effect == EFFECT_ATTACK_DOWN_2); + ASSUME(gMovesInfo[MOVE_CHARM].effect == EFFECT_ATTACK_DOWN_2); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/stuff_cheeks.c b/test/battle/move_effect/stuff_cheeks.c index e0d1e5aadc49..e17965ec848a 100644 --- a/test/battle/move_effect/stuff_cheeks.c +++ b/test/battle/move_effect/stuff_cheeks.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_STUFF_CHEEKS].effect == EFFECT_STUFF_CHEEKS); + ASSUME(gMovesInfo[MOVE_STUFF_CHEEKS].effect == EFFECT_STUFF_CHEEKS); ASSUME(gItems[ITEM_LIECHI_BERRY].pocket == POCKET_BERRIES); ASSUME(gItems[ITEM_LIECHI_BERRY].holdEffect == HOLD_EFFECT_ATTACK_UP); } @@ -92,7 +92,7 @@ SINGLE_BATTLE_TEST("Stuff Cheeks can be used even if Magic Room is active") SINGLE_BATTLE_TEST("Stuff Cheeks fails if the user's berry is removed before they use the move") { GIVEN { - ASSUME(gBattleMoves[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF); + ASSUME(gMovesInfo[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF); PLAYER(SPECIES_SKWOVET) { Item(ITEM_LIECHI_BERRY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/substitute.c b/test/battle/move_effect/substitute.c index ae2d4848b4df..92486923ca25 100644 --- a/test/battle/move_effect/substitute.c +++ b/test/battle/move_effect/substitute.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SUBSTITUTE].effect == EFFECT_SUBSTITUTE); + ASSUME(gMovesInfo[MOVE_SUBSTITUTE].effect == EFFECT_SUBSTITUTE); } SINGLE_BATTLE_TEST("Substitute creates a Substitute at the cost of 1/4 users maximum HP") diff --git a/test/battle/move_effect/synthesis.c b/test/battle/move_effect/synthesis.c index 7b0c260fa07a..e4a2b77869c6 100644 --- a/test/battle/move_effect/synthesis.c +++ b/test/battle/move_effect/synthesis.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SYNTHESIS].effect == EFFECT_SYNTHESIS); + ASSUME(gMovesInfo[MOVE_SYNTHESIS].effect == EFFECT_SYNTHESIS); } SINGLE_BATTLE_TEST("Synthesis recovers 1/2 of the user's max HP") diff --git a/test/battle/move_effect/tailwind.c b/test/battle/move_effect/tailwind.c index 2e9ee5adef5a..9cadc875991b 100644 --- a/test/battle/move_effect/tailwind.c +++ b/test/battle/move_effect/tailwind.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TAILWIND].effect == EFFECT_TAILWIND); + ASSUME(gMovesInfo[MOVE_TAILWIND].effect == EFFECT_TAILWIND); } SINGLE_BATTLE_TEST("Tailwind applies for 4 turns") diff --git a/test/battle/move_effect/take_heart.c b/test/battle/move_effect/take_heart.c index c2dfc90a8bf4..081815cfb87e 100644 --- a/test/battle/move_effect/take_heart.c +++ b/test/battle/move_effect/take_heart.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TAKE_HEART].effect == EFFECT_TAKE_HEART); + ASSUME(gMovesInfo[MOVE_TAKE_HEART].effect == EFFECT_TAKE_HEART); } SINGLE_BATTLE_TEST("Take Heart increases Sp. Atk and Sp. Def by one stage") diff --git a/test/battle/move_effect/teatime.c b/test/battle/move_effect/teatime.c index 4d00205a2d50..ff46e20e19f6 100644 --- a/test/battle/move_effect/teatime.c +++ b/test/battle/move_effect/teatime.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TEATIME].effect == EFFECT_TEATIME); + ASSUME(gMovesInfo[MOVE_TEATIME].effect == EFFECT_TEATIME); ASSUME(gItems[ITEM_LIECHI_BERRY].holdEffect == HOLD_EFFECT_ATTACK_UP); } diff --git a/test/battle/move_effect/techno_blast.c b/test/battle/move_effect/techno_blast.c index 2a5b4f43964c..0bd181cf61e8 100644 --- a/test/battle/move_effect/techno_blast.c +++ b/test/battle/move_effect/techno_blast.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TECHNO_BLAST].effect == EFFECT_CHANGE_TYPE_ON_ITEM); - ASSUME(gBattleMoves[MOVE_TECHNO_BLAST].argument == HOLD_EFFECT_DRIVE); + ASSUME(gMovesInfo[MOVE_TECHNO_BLAST].effect == EFFECT_CHANGE_TYPE_ON_ITEM); + ASSUME(gMovesInfo[MOVE_TECHNO_BLAST].argument == HOLD_EFFECT_DRIVE); } diff --git a/test/battle/move_effect/telekinesis.c b/test/battle/move_effect/telekinesis.c index 7dbce2d1fdec..6e8ef409f0ce 100644 --- a/test/battle/move_effect/telekinesis.c +++ b/test/battle/move_effect/telekinesis.c @@ -3,14 +3,14 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TELEKINESIS].effect == EFFECT_TELEKINESIS); + ASSUME(gMovesInfo[MOVE_TELEKINESIS].effect == EFFECT_TELEKINESIS); } SINGLE_BATTLE_TEST("Telekinesis makes the target unable to avoid any attacks made against it") { GIVEN { - ASSUME(gBattleMoves[MOVE_MINIMIZE].effect == EFFECT_MINIMIZE); // Raises evs by 2 - ASSUME(gBattleMoves[MOVE_SCREECH].accuracy < 100); + ASSUME(gMovesInfo[MOVE_MINIMIZE].effect == EFFECT_MINIMIZE); // Raises evs by 2 + ASSUME(gMovesInfo[MOVE_SCREECH].accuracy < 100); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WYNAUT); } WHEN { @@ -47,7 +47,7 @@ SINGLE_BATTLE_TEST("Telekinesis ends after 3 turns") SINGLE_BATTLE_TEST("Telekinesis makes the target immune to Ground-type attacks") { GIVEN { - ASSUME(gBattleMoves[MOVE_BULLDOZE].type == TYPE_GROUND); + ASSUME(gMovesInfo[MOVE_BULLDOZE].type == TYPE_GROUND); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WYNAUT); } WHEN { diff --git a/test/battle/move_effect/teleport.c b/test/battle/move_effect/teleport.c index 7544ae8a4eed..3c79cb54ffb5 100644 --- a/test/battle/move_effect/teleport.c +++ b/test/battle/move_effect/teleport.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TELEPORT].effect == EFFECT_TELEPORT); + ASSUME(gMovesInfo[MOVE_TELEPORT].effect == EFFECT_TELEPORT); } SINGLE_BATTLE_TEST("Teleport fails when there is no pokemon to switch in") diff --git a/test/battle/move_effect/thunder.c b/test/battle/move_effect/thunder.c index d6e5101f3b9a..98a4979e7966 100644 --- a/test/battle/move_effect/thunder.c +++ b/test/battle/move_effect/thunder.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_THUNDER].effect == EFFECT_THUNDER); - ASSUME(gBattleMoves[MOVE_THUNDER].accuracy == 70); + ASSUME(gMovesInfo[MOVE_THUNDER].effect == EFFECT_THUNDER); + ASSUME(gMovesInfo[MOVE_THUNDER].accuracy == 70); } SINGLE_BATTLE_TEST("Thunder's accuracy is lowered to 50% in Sunlight") diff --git a/test/battle/move_effect/torment.c b/test/battle/move_effect/torment.c index dbef1d983d0b..376267f39631 100644 --- a/test/battle/move_effect/torment.c +++ b/test/battle/move_effect/torment.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TORMENT].effect == EFFECT_TORMENT); + ASSUME(gMovesInfo[MOVE_TORMENT].effect == EFFECT_TORMENT); } SINGLE_BATTLE_TEST("Torment prevents consecutive move uses") diff --git a/test/battle/move_effect/toxic.c b/test/battle/move_effect/toxic.c index 4a07994fb80f..35bfaa064486 100644 --- a/test/battle/move_effect/toxic.c +++ b/test/battle/move_effect/toxic.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); + ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); } SINGLE_BATTLE_TEST("Toxic inflicts bad poison") diff --git a/test/battle/move_effect/toxic_spikes.c b/test/battle/move_effect/toxic_spikes.c index 3bac9d8ba563..517a1b261e29 100644 --- a/test/battle/move_effect/toxic_spikes.c +++ b/test/battle/move_effect/toxic_spikes.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); + ASSUME(gMovesInfo[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES); } SINGLE_BATTLE_TEST("Toxic Spikes inflicts poison on switch in") @@ -212,7 +212,7 @@ SINGLE_BATTLE_TEST("Toxic Spikes are removed by Poison-type Pokémon affected by SINGLE_BATTLE_TEST("Toxic Spikes inflicts poison on switch in after Primal Reversed mon fainted") // Oddly specific, but encountered during testing { GIVEN { - ASSUME(gBattleMoves[MOVE_MEMENTO].effect == EFFECT_MEMENTO); // Faints the user. + ASSUME(gMovesInfo[MOVE_MEMENTO].effect == EFFECT_MEMENTO); // Faints the user. PLAYER(SPECIES_WOBBUFFET) {Speed(5); } PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(1); } PLAYER(SPECIES_WYNAUT) {Speed(5); } diff --git a/test/battle/move_effect/triple_arrows.c b/test/battle/move_effect/triple_arrows.c index 30c37ff3bb93..73a82fbee453 100644 --- a/test/battle/move_effect/triple_arrows.c +++ b/test/battle/move_effect/triple_arrows.c @@ -47,7 +47,7 @@ SINGLE_BATTLE_TEST("Triple Arrows makes the foe flinch 30% of the time") SINGLE_BATTLE_TEST("Triple Arrows lands a critical hit") { ASSUME(B_CRIT_CHANCE >= GEN_7); - ASSUME(gBattleMoves[MOVE_TRIPLE_ARROWS].criticalHitStage == 1); + ASSUME(gMovesInfo[MOVE_TRIPLE_ARROWS].criticalHitStage == 1); PASSES_RANDOMLY(1, 8, RNG_CRITICAL_HIT); GIVEN { PLAYER(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/triple_kick.c b/test/battle/move_effect/triple_kick.c index fef571cb4cef..9fe0ec60225e 100644 --- a/test/battle/move_effect/triple_kick.c +++ b/test/battle/move_effect/triple_kick.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TRIPLE_KICK].effect == EFFECT_TRIPLE_KICK); + ASSUME(gMovesInfo[MOVE_TRIPLE_KICK].effect == EFFECT_TRIPLE_KICK); } SINGLE_BATTLE_TEST("Triple Kick damage is increased by its base damage for each hit") diff --git a/test/battle/move_effect/venoshock.c b/test/battle/move_effect/venoshock.c index 45a8dbfca1ae..feea48df10c4 100644 --- a/test/battle/move_effect/venoshock.c +++ b/test/battle/move_effect/venoshock.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_VENOSHOCK].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); - ASSUME(gBattleMoves[MOVE_VENOSHOCK].argument == STATUS1_PSN_ANY); + ASSUME(gMovesInfo[MOVE_VENOSHOCK].effect == EFFECT_DOUBLE_POWER_ON_ARG_STATUS); + ASSUME(gMovesInfo[MOVE_VENOSHOCK].argument == STATUS1_PSN_ANY); } SINGLE_BATTLE_TEST("Venoshock's power doubles if the target is poisoned/badly poisoned", s16 damage) diff --git a/test/battle/move_effect/weather_ball.c b/test/battle/move_effect/weather_ball.c index 629b32f97e75..38c902f507f7 100644 --- a/test/battle/move_effect/weather_ball.c +++ b/test/battle/move_effect/weather_ball.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_WEATHER_BALL].effect == EFFECT_WEATHER_BALL); + ASSUME(gMovesInfo[MOVE_WEATHER_BALL].effect == EFFECT_WEATHER_BALL); } SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to a Fire-type move in Sunlight", s16 damage) diff --git a/test/battle/move_flags/cant_use_twice.c b/test/battle/move_flags/cant_use_twice.c index 3135e0016920..99bd681acb2e 100644 --- a/test/battle/move_flags/cant_use_twice.c +++ b/test/battle/move_flags/cant_use_twice.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_GIGATON_HAMMER].cantUseTwice == TRUE); - ASSUME(gBattleMoves[MOVE_BLOOD_MOON].cantUseTwice == TRUE); + ASSUME(gMovesInfo[MOVE_GIGATON_HAMMER].cantUseTwice == TRUE); + ASSUME(gMovesInfo[MOVE_BLOOD_MOON].cantUseTwice == TRUE); } SINGLE_BATTLE_TEST("Struggle will be used if slow Encore is used on moves with the cantUseTwice flag") @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Struggle will be used if slow Encore is used on moves with t PARAMETRIZE { move = MOVE_GIGATON_HAMMER; } PARAMETRIZE { move = MOVE_BLOOD_MOON; } GIVEN { - ASSUME(gBattleMoves[MOVE_ENCORE].effect == EFFECT_ENCORE); + ASSUME(gMovesInfo[MOVE_ENCORE].effect == EFFECT_ENCORE); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -32,7 +32,7 @@ SINGLE_BATTLE_TEST("Moves with the cantUseTwice flag strike again if fast encore PARAMETRIZE { move = MOVE_GIGATON_HAMMER; } PARAMETRIZE { move = MOVE_BLOOD_MOON; } GIVEN { - ASSUME(gBattleMoves[MOVE_ENCORE].effect == EFFECT_ENCORE); + ASSUME(gMovesInfo[MOVE_ENCORE].effect == EFFECT_ENCORE); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_flags/damages_airborne_double_damage.c b/test/battle/move_flags/damages_airborne_double_damage.c index 5906e3b6b4e3..dcdb801ff655 100644 --- a/test/battle/move_flags/damages_airborne_double_damage.c +++ b/test/battle/move_flags/damages_airborne_double_damage.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Being airborne causes the target to take double damage from PARAMETRIZE { useDive = FALSE; } PARAMETRIZE { useDive = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TWISTER].damagesAirborneDoubleDamage); + ASSUME(gMovesInfo[MOVE_TWISTER].damagesAirborneDoubleDamage); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } } WHEN { diff --git a/test/battle/move_flags/damages_underground.c b/test/battle/move_flags/damages_underground.c index 54af8b8298f2..97b792b4dd1e 100644 --- a/test/battle/move_flags/damages_underground.c +++ b/test/battle/move_flags/damages_underground.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Being underground causes the target to take double damage fr PARAMETRIZE { useDig = FALSE; } PARAMETRIZE { useDig = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].damagesUnderground); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].damagesUnderground); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } } WHEN { diff --git a/test/battle/move_flags/damages_underwater.c b/test/battle/move_flags/damages_underwater.c index e8f45e8deee9..a7269a016263 100644 --- a/test/battle/move_flags/damages_underwater.c +++ b/test/battle/move_flags/damages_underwater.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Being underwater causes the target to take double damage fro PARAMETRIZE { useDive = FALSE; } PARAMETRIZE { useDive = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SURF].damagesUnderwater); + ASSUME(gMovesInfo[MOVE_SURF].damagesUnderwater); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } } WHEN { diff --git a/test/battle/move_flags/minimize_double_damage.c b/test/battle/move_flags/minimize_double_damage.c index 6b631c9a36ae..f3cdd7657f06 100644 --- a/test/battle/move_flags/minimize_double_damage.c +++ b/test/battle/move_flags/minimize_double_damage.c @@ -7,8 +7,8 @@ SINGLE_BATTLE_TEST("MinimizeDoubleDamage flag makes moves cause double damage to PARAMETRIZE { useMinimize = FALSE; } PARAMETRIZE { useMinimize = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_MINIMIZE].effect == EFFECT_MINIMIZE); - ASSUME(gBattleMoves[MOVE_STEAMROLLER].minimizeDoubleDamage); + ASSUME(gMovesInfo[MOVE_MINIMIZE].effect == EFFECT_MINIMIZE); + ASSUME(gMovesInfo[MOVE_STEAMROLLER].minimizeDoubleDamage); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } } WHEN { diff --git a/test/battle/move_flags/powder.c b/test/battle/move_flags/powder.c index 184402f6bf6f..356ab69a980b 100644 --- a/test/battle/move_flags/powder.c +++ b/test/battle/move_flags/powder.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Powder moves are blocked by Grass-type Pokémon") { GIVEN { - ASSUME(gBattleMoves[MOVE_STUN_SPORE].powderMove); + ASSUME(gMovesInfo[MOVE_STUN_SPORE].powderMove); ASSUME(gSpeciesInfo[SPECIES_ODDISH].types[0] == TYPE_GRASS); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_ODDISH); diff --git a/test/battle/move_flags/strike_count.c b/test/battle/move_flags/strike_count.c index d397d805c60c..8967836eff9e 100644 --- a/test/battle/move_flags/strike_count.c +++ b/test/battle/move_flags/strike_count.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Two strike count turns a move into a 2-hit move") { GIVEN { - ASSUME(gBattleMoves[MOVE_DOUBLE_KICK].strikeCount == 2); + ASSUME(gMovesInfo[MOVE_DOUBLE_KICK].strikeCount == 2); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -23,7 +23,7 @@ SINGLE_BATTLE_TEST("Three strike count turns a move into a 3-hit move") s16 thirdHit; GIVEN { - ASSUME(gBattleMoves[MOVE_TRIPLE_DIVE].strikeCount == 3); + ASSUME(gMovesInfo[MOVE_TRIPLE_DIVE].strikeCount == 3); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -49,8 +49,8 @@ SINGLE_BATTLE_TEST("Surging Strikes hits 3 times with each hit being a critical s16 thirdHit; GIVEN { - ASSUME(gBattleMoves[MOVE_SURGING_STRIKES].strikeCount == 3); - ASSUME(gBattleMoves[MOVE_SURGING_STRIKES].alwaysCriticalHit == TRUE); + ASSUME(gMovesInfo[MOVE_SURGING_STRIKES].strikeCount == 3); + ASSUME(gMovesInfo[MOVE_SURGING_STRIKES].alwaysCriticalHit == TRUE); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/status1/burn.c b/test/battle/status1/burn.c index 9633598db992..e1cc3750542a 100644 --- a/test/battle/status1/burn.c +++ b/test/battle/status1/burn.c @@ -24,7 +24,7 @@ SINGLE_BATTLE_TEST("Burn reduces Attack by 50%", s16 damage) PARAMETRIZE { burned = FALSE; } PARAMETRIZE { burned = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { if (burned) Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/status1/freeze.c b/test/battle/status1/freeze.c index 28a31efef617..c89bda337fe2 100644 --- a/test/battle/status1/freeze.c +++ b/test/battle/status1/freeze.c @@ -17,7 +17,7 @@ SINGLE_BATTLE_TEST("Freeze has a 20% chance of being thawed") SINGLE_BATTLE_TEST("Freeze is thawed by opponent's Fire-type attacks") { GIVEN { - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_FREEZE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -32,7 +32,7 @@ SINGLE_BATTLE_TEST("Freeze is thawed by opponent's Fire-type attacks") SINGLE_BATTLE_TEST("Freeze is thawed by user's Flame Wheel") { GIVEN { - ASSUME(gBattleMoves[MOVE_FLAME_WHEEL].thawsUser); + ASSUME(gMovesInfo[MOVE_FLAME_WHEEL].thawsUser); PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_FREEZE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/status1/frostbite.c b/test/battle/status1/frostbite.c index cd417b52bccd..eb22d597ea95 100644 --- a/test/battle/status1/frostbite.c +++ b/test/battle/status1/frostbite.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Frostbite reduces the special attack by 50 percent") s16 normaleDamage; GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_FROSTBITE); } } WHEN { diff --git a/test/battle/terrain/grassy.c b/test/battle/terrain/grassy.c index e135426427ad..b97667be20f1 100644 --- a/test/battle/terrain/grassy.c +++ b/test/battle/terrain/grassy.c @@ -67,8 +67,8 @@ SINGLE_BATTLE_TEST("Grassy Terrain decreases power of Earthquake and Bulldoze by PARAMETRIZE { terrain = FALSE; move = MOVE_BULLDOZE; } // 2 PARAMETRIZE { terrain = TRUE; move = MOVE_BULLDOZE; } // 3 GIVEN { - ASSUME(gBattleMoves[MOVE_EARTHQUAKE].effect == EFFECT_EARTHQUAKE); - ASSUME(gBattleMoves[MOVE_BULLDOZE].effect == EFFECT_BULLDOZE); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].effect == EFFECT_EARTHQUAKE); + ASSUME(gMovesInfo[MOVE_BULLDOZE].effect == EFFECT_BULLDOZE); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/weather/rain.c b/test/battle/weather/rain.c index 3f7a6f599b9e..ce05870290df 100644 --- a/test/battle/weather/rain.c +++ b/test/battle/weather/rain.c @@ -4,8 +4,8 @@ // Please add Rain interactions with move, item and ability effects on their respective files. ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); - ASSUME(gBattleMoves[MOVE_WATER_GUN].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_WATER_GUN].type == TYPE_WATER); } SINGLE_BATTLE_TEST("Rain multiplies the power of Fire-type moves by 0.5x", s16 damage) diff --git a/test/battle/weather/sandstorm.c b/test/battle/weather/sandstorm.c index ff14f14d8a04..e328b29f8821 100644 --- a/test/battle/weather/sandstorm.c +++ b/test/battle/weather/sandstorm.c @@ -23,7 +23,7 @@ SINGLE_BATTLE_TEST("Sandstorm multiplies the special defense of Rock-types by 1. PARAMETRIZE{ move = MOVE_SANDSTORM; } PARAMETRIZE{ move = MOVE_CELEBRATE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) ; OPPONENT(SPECIES_NOSEPASS); } WHEN { diff --git a/test/battle/weather/snow.c b/test/battle/weather/snow.c index 33ffe3df7b90..4725eba65173 100644 --- a/test/battle/weather/snow.c +++ b/test/battle/weather/snow.c @@ -4,10 +4,10 @@ // Please add Snow interactions with move, item and ability effects on their respective files. ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_SNOWSCAPE].effect == EFFECT_SNOWSCAPE); + ASSUME(gMovesInfo[MOVE_SNOWSCAPE].effect == EFFECT_SNOWSCAPE); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[0] != TYPE_ICE && gSpeciesInfo[SPECIES_WOBBUFFET].types[1] != TYPE_ICE); ASSUME(gSpeciesInfo[SPECIES_GLALIE].types[0] == TYPE_ICE || gSpeciesInfo[SPECIES_GLALIE].types[1] == TYPE_ICE); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Snow multiplies the defense of Ice-types by 1.5x", s16 damage) diff --git a/test/battle/weather/sunlight.c b/test/battle/weather/sunlight.c index 51b18dd076f3..4c8ea5cb1957 100644 --- a/test/battle/weather/sunlight.c +++ b/test/battle/weather/sunlight.c @@ -4,8 +4,8 @@ // Please add Sunlight interactions with move, item and ability effects on their respective files. ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE); - ASSUME(gBattleMoves[MOVE_WATER_GUN].type == TYPE_WATER); + ASSUME(gMovesInfo[MOVE_EMBER].type == TYPE_FIRE); + ASSUME(gMovesInfo[MOVE_WATER_GUN].type == TYPE_WATER); } SINGLE_BATTLE_TEST("Sunlight multiplies the power of Fire-type moves by 1.5x", s16 damage) diff --git a/test/dynamax.c b/test/dynamax.c index 7c171f583b1f..d3073624f381 100644 --- a/test/dynamax.c +++ b/test/dynamax.c @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamax expires after three turns", u16 hp) SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon cannot be flinched") { GIVEN { - ASSUME(gBattleMoves[MOVE_FAKE_OUT].effect == EFFECT_FAKE_OUT); + ASSUME(gMovesInfo[MOVE_FAKE_OUT].effect == EFFECT_FAKE_OUT); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -73,7 +73,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon cannot be flinched") SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon cannot be hit by weight-based moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_HEAVY_SLAM].effect == EFFECT_HEAT_CRASH); + ASSUME(gMovesInfo[MOVE_HEAVY_SLAM].effect == EFFECT_HEAT_CRASH); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -89,7 +89,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon cannot be hit by weight-based mo SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon cannot be hit by OHKO moves") { GIVEN { - ASSUME(gBattleMoves[MOVE_FISSURE].effect == EFFECT_OHKO); + ASSUME(gMovesInfo[MOVE_FISSURE].effect == EFFECT_OHKO); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_MACHAMP) { Ability(ABILITY_NO_GUARD); } } WHEN { @@ -136,8 +136,8 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are affected by Grudge") SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by phazing moves, but still take damage") { GIVEN { - ASSUME(gBattleMoves[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); - ASSUME(gBattleMoves[MOVE_WHIRLWIND].effect == EFFECT_ROAR); + ASSUME(gMovesInfo[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); + ASSUME(gMovesInfo[MOVE_WHIRLWIND].effect == EFFECT_ROAR); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); @@ -158,7 +158,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by phazing move SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by phazing moves but no block message is printed if they faint") { GIVEN { - ASSUME(gBattleMoves[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); + ASSUME(gMovesInfo[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); PLAYER(SPECIES_WOBBUFFET) { HP(1); }; PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); @@ -382,7 +382,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon take double damage from Dynamax PARAMETRIZE { dynamaxed = FALSE; } PARAMETRIZE { dynamaxed = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_DYNAMAX_CANNON].effect == EFFECT_DYNAMAX_DOUBLE_DMG); + ASSUME(gMovesInfo[MOVE_DYNAMAX_CANNON].effect == EFFECT_DYNAMAX_DOUBLE_DMG); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -544,7 +544,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Endeavor uses a Pokemon's non-Dynamax HP", s16 dam PARAMETRIZE { dynamax = TRUE; } PARAMETRIZE { dynamax = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_ENDEAVOR].effect == EFFECT_ENDEAVOR); + ASSUME(gMovesInfo[MOVE_ENDEAVOR].effect == EFFECT_ENDEAVOR); PLAYER(SPECIES_WOBBUFFET) { Speed(50); } OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(100); } } WHEN { @@ -563,7 +563,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Super Fang uses a Pokemon's non-Dynamax HP", s16 d PARAMETRIZE { dynamax = TRUE; } PARAMETRIZE { dynamax = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SUPER_FANG].effect == EFFECT_SUPER_FANG); + ASSUME(gMovesInfo[MOVE_SUPER_FANG].effect == EFFECT_SUPER_FANG); PLAYER(SPECIES_WOBBUFFET) { Speed(50); } OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } } WHEN { @@ -582,7 +582,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Pain Split uses a Pokemon's non-Dynamax HP", s16 d PARAMETRIZE { dynamax = TRUE; } PARAMETRIZE { dynamax = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_PAIN_SPLIT].effect == EFFECT_PAIN_SPLIT); + ASSUME(gMovesInfo[MOVE_PAIN_SPLIT].effect == EFFECT_PAIN_SPLIT); PLAYER(SPECIES_WOBBUFFET) { Speed(50); } OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(100); } } WHEN { @@ -621,7 +621,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Heal Pulse heals based on a Pokemon's non-Dynamax PARAMETRIZE { dynamax = TRUE; } PARAMETRIZE { dynamax = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_HEAL_PULSE].effect == EFFECT_HEAL_PULSE); + ASSUME(gMovesInfo[MOVE_HEAL_PULSE].effect == EFFECT_HEAL_PULSE); PLAYER(SPECIES_WOBBUFFET) { HP(1); Speed(50); } OPPONENT(SPECIES_WOBBUFFET) { MaxHP(100); Speed(100); } } WHEN { @@ -639,7 +639,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Strike lowers single opponent's speed") { GIVEN { // Fails?: ASSUME(GetMaxMove(B_POSITION_PLAYER_LEFT, MOVE_TACKLE) == MOVE_MAX_STRIKE); - ASSUME(gBattleMoves[MOVE_MAX_STRIKE].argument == MAX_EFFECT_LOWER_SPEED); + ASSUME(gMovesInfo[MOVE_MAX_STRIKE].argument == MAX_EFFECT_LOWER_SPEED); OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } PLAYER(SPECIES_WOBBUFFET) { Speed(80); } } WHEN { @@ -663,7 +663,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Strike lowers single opponent's speed") DOUBLE_BATTLE_TEST("(DYNAMAX) Max Strike lowers both opponents' speed") { GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_STRIKE].argument == MAX_EFFECT_LOWER_SPEED); + ASSUME(gMovesInfo[MOVE_MAX_STRIKE].argument == MAX_EFFECT_LOWER_SPEED); PLAYER(SPECIES_WOBBUFFET) { Speed(80); } PLAYER(SPECIES_WOBBUFFET) { Speed(79); } OPPONENT(SPECIES_WOBBUFFET) {Speed(100); } @@ -700,9 +700,9 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) Max Knuckle raises both allies' attack") { s16 damage[4]; GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_KNUCKLE].argument == MAX_EFFECT_RAISE_TEAM_ATTACK); - ASSUME(gBattleMoves[MOVE_CLOSE_COMBAT].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_MAX_KNUCKLE].argument == MAX_EFFECT_RAISE_TEAM_ATTACK); + ASSUME(gMovesInfo[MOVE_CLOSE_COMBAT].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); @@ -742,7 +742,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) Max Knuckle raises both allies' attack") SINGLE_BATTLE_TEST("(DYNAMAX) Max Flare sets up sunlight") { GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_FLARE].argument == MAX_EFFECT_SUN); + ASSUME(gMovesInfo[MOVE_MAX_FLARE].argument == MAX_EFFECT_SUN); OPPONENT(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); } WHEN { @@ -758,7 +758,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Flare sets up sunlight") SINGLE_BATTLE_TEST("(DYNAMAX) Max Geyser sets up heavy rain") { GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_GEYSER].argument == MAX_EFFECT_RAIN); + ASSUME(gMovesInfo[MOVE_MAX_GEYSER].argument == MAX_EFFECT_RAIN); OPPONENT(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); } WHEN { @@ -774,7 +774,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Geyser sets up heavy rain") SINGLE_BATTLE_TEST("(DYNAMAX) Max Hailstorm sets up hail") { GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_HAILSTORM].argument == MAX_EFFECT_HAIL); + ASSUME(gMovesInfo[MOVE_MAX_HAILSTORM].argument == MAX_EFFECT_HAIL); OPPONENT(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); } WHEN { @@ -790,7 +790,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Hailstorm sets up hail") SINGLE_BATTLE_TEST("(DYNAMAX) Max Rockfall sets up a sandstorm") { GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_ROCKFALL].argument == MAX_EFFECT_SANDSTORM); + ASSUME(gMovesInfo[MOVE_MAX_ROCKFALL].argument == MAX_EFFECT_SANDSTORM); OPPONENT(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); } WHEN { @@ -807,7 +807,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Overgrowth sets up Grassy Terrain") { s32 maxHP = 490; // Because of recalculated stats upon Dynamaxing GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_OVERGROWTH].argument == MAX_EFFECT_GRASSY_TERRAIN); + ASSUME(gMovesInfo[MOVE_MAX_OVERGROWTH].argument == MAX_EFFECT_GRASSY_TERRAIN); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].baseHP == 190); OPPONENT(SPECIES_WOBBUFFET) { MaxHP(maxHP); HP(maxHP / 2); }; PLAYER(SPECIES_WOBBUFFET) { MaxHP(maxHP); HP(maxHP / 2); }; @@ -827,7 +827,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Overgrowth sets up Grassy Terrain") SINGLE_BATTLE_TEST("(DYNAMAX) Max Mindstorm sets up Psychic Terrain") { GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_MINDSTORM].argument == MAX_EFFECT_PSYCHIC_TERRAIN); + ASSUME(gMovesInfo[MOVE_MAX_MINDSTORM].argument == MAX_EFFECT_PSYCHIC_TERRAIN); OPPONENT(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); } WHEN { @@ -844,7 +844,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Mindstorm sets up Psychic Terrain") SINGLE_BATTLE_TEST("(DYNAMAX) Max Lightning sets up Electric Terrain") { GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_LIGHTNING].argument == MAX_EFFECT_ELECTRIC_TERRAIN); + ASSUME(gMovesInfo[MOVE_MAX_LIGHTNING].argument == MAX_EFFECT_ELECTRIC_TERRAIN); OPPONENT(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); } WHEN { @@ -859,7 +859,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Lightning sets up Electric Terrain") SINGLE_BATTLE_TEST("(DYNAMAX) Max Starfall sets up Misty Terrain") { GIVEN { - ASSUME(gBattleMoves[MOVE_MAX_STARFALL].argument == MAX_EFFECT_MISTY_TERRAIN); + ASSUME(gMovesInfo[MOVE_MAX_STARFALL].argument == MAX_EFFECT_MISTY_TERRAIN); OPPONENT(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); } WHEN { @@ -874,7 +874,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Starfall sets up Misty Terrain") SINGLE_BATTLE_TEST("(DYNAMAX) G-Max Stonesurge sets up Stealth Rocks") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_STONESURGE].argument == MAX_EFFECT_STEALTH_ROCK); + ASSUME(gMovesInfo[MOVE_G_MAX_STONESURGE].argument == MAX_EFFECT_STEALTH_ROCK); PLAYER(SPECIES_DREDNAW) { GigantamaxFactor(TRUE); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -894,7 +894,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) G-Max Stonesurge sets up Stealth Rocks") SINGLE_BATTLE_TEST("(DYNAMAX) G-Max Steelsurge sets up sharp steel") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_STEELSURGE].argument == MAX_EFFECT_STEELSURGE); + ASSUME(gMovesInfo[MOVE_G_MAX_STEELSURGE].argument == MAX_EFFECT_STEELSURGE); PLAYER(SPECIES_COPPERAJAH) { GigantamaxFactor(TRUE); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_HATTERENE); @@ -925,7 +925,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) G-Max Hydrosnipe has fixed power and ignores abili PARAMETRIZE { move = MOVE_WATER_GUN; } PARAMETRIZE { move = MOVE_HYDRO_CANNON; } GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_HYDROSNIPE].argument == MAX_EFFECT_FIXED_POWER); + ASSUME(gMovesInfo[MOVE_G_MAX_HYDROSNIPE].argument == MAX_EFFECT_FIXED_POWER); PLAYER(SPECIES_INTELEON) { GigantamaxFactor(TRUE); } OPPONENT(SPECIES_ARCTOVISH) { Ability(ABILITY_WATER_ABSORB); } } WHEN { @@ -941,7 +941,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) G-Max Hydrosnipe has fixed power and ignores abili DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Volt Crash paralyzes both opponents") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_VOLT_CRASH].argument == MAX_EFFECT_PARALYZE_FOES); + ASSUME(gMovesInfo[MOVE_G_MAX_VOLT_CRASH].argument == MAX_EFFECT_PARALYZE_FOES); PLAYER(SPECIES_PIKACHU) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_PICHU); OPPONENT(SPECIES_WOBBUFFET); @@ -968,7 +968,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Stun Shock paralyzes or poisons both opponen PARAMETRIZE { statusAnim = B_ANIM_STATUS_PRZ; rng = STATUS1_PARALYSIS; } PARAMETRIZE { statusAnim = B_ANIM_STATUS_PSN; rng = STATUS1_POISON; } GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_STUN_SHOCK].argument == MAX_EFFECT_POISON_PARALYZE_FOES); + ASSUME(gMovesInfo[MOVE_G_MAX_STUN_SHOCK].argument == MAX_EFFECT_POISON_PARALYZE_FOES); PLAYER(SPECIES_TOXTRICITY) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_TOXEL); OPPONENT(SPECIES_WOBBUFFET); @@ -1005,7 +1005,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Stun Shock paralyzes or poisons both opponen DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Stun Shock chooses statuses before considering immunities") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_STUN_SHOCK].argument == MAX_EFFECT_POISON_PARALYZE_FOES); + ASSUME(gMovesInfo[MOVE_G_MAX_STUN_SHOCK].argument == MAX_EFFECT_POISON_PARALYZE_FOES); PLAYER(SPECIES_TOXTRICITY) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_TOXEL); OPPONENT(SPECIES_GARBODOR); @@ -1038,7 +1038,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Befuddle paralyzes, poisons, or sleeps both PARAMETRIZE { statusAnim = B_ANIM_STATUS_PSN; rng = STATUS1_POISON; } PARAMETRIZE { statusAnim = B_ANIM_STATUS_SLP; rng = STATUS1_SLEEP; } GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_BEFUDDLE].argument == MAX_EFFECT_EFFECT_SPORE_FOES); + ASSUME(gMovesInfo[MOVE_G_MAX_BEFUDDLE].argument == MAX_EFFECT_EFFECT_SPORE_FOES); PLAYER(SPECIES_BUTTERFREE) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_CATERPIE); OPPONENT(SPECIES_WOBBUFFET); @@ -1082,7 +1082,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Befuddle paralyzes, poisons, or sleeps both DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Gold Rush confuses both opponents and generates money") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_GOLD_RUSH].argument == MAX_EFFECT_CONFUSE_FOES_PAY_DAY); + ASSUME(gMovesInfo[MOVE_G_MAX_GOLD_RUSH].argument == MAX_EFFECT_CONFUSE_FOES_PAY_DAY); PLAYER(SPECIES_MEOWTH) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_PERSIAN); OPPONENT(SPECIES_WOBBUFFET); @@ -1102,7 +1102,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Gold Rush confuses both opponents and genera DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Smite confuses both opponents") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_SMITE].argument == MAX_EFFECT_CONFUSE_FOES); + ASSUME(gMovesInfo[MOVE_G_MAX_SMITE].argument == MAX_EFFECT_CONFUSE_FOES); PLAYER(SPECIES_HATTERENE) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_HATENNA); OPPONENT(SPECIES_WOBBUFFET); @@ -1121,7 +1121,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Smite confuses both opponents") DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Cuddle infatuates both opponents, if possible") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_CUDDLE].argument == MAX_EFFECT_INFATUATE_FOES); + ASSUME(gMovesInfo[MOVE_G_MAX_CUDDLE].argument == MAX_EFFECT_INFATUATE_FOES); PLAYER(SPECIES_EEVEE) { Gender(MON_MALE); GigantamaxFactor(TRUE); } PLAYER(SPECIES_EEVEE); OPPONENT(SPECIES_WOBBUFFET) { Gender(MON_FEMALE); } @@ -1142,7 +1142,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Cuddle infatuates both opponents, if possibl DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Terror traps both opponents") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_TERROR].argument == MAX_EFFECT_MEAN_LOOK); + ASSUME(gMovesInfo[MOVE_G_MAX_TERROR].argument == MAX_EFFECT_MEAN_LOOK); PLAYER(SPECIES_GENGAR) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_GASTLY); OPPONENT(SPECIES_WOBBUFFET); @@ -1161,7 +1161,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Terror traps both opponents") DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Meltdown torments both opponents for 3 turns") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_MELTDOWN].argument == MAX_EFFECT_TORMENT_FOES); + ASSUME(gMovesInfo[MOVE_G_MAX_MELTDOWN].argument == MAX_EFFECT_TORMENT_FOES); PLAYER(SPECIES_MELMETAL) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_MELTAN); OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_SPLASH, MOVE_CELEBRATE); } @@ -1198,7 +1198,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Wildfire sets a field effect that damages no { s16 damage; GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_WILDFIRE].argument == MAX_EFFECT_WILDFIRE); + ASSUME(gMovesInfo[MOVE_G_MAX_WILDFIRE].argument == MAX_EFFECT_WILDFIRE); PLAYER(SPECIES_CHARIZARD) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_CHARMANDER); OPPONENT(SPECIES_WOBBUFFET) { HP(600); MaxHP(600); } @@ -1244,7 +1244,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Replenish recycles allies' berries 50\% of t { PASSES_RANDOMLY(1, 2, RNG_G_MAX_REPLENISH); GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_REPLENISH].argument == MAX_EFFECT_RECYCLE_BERRIES); + ASSUME(gMovesInfo[MOVE_G_MAX_REPLENISH].argument == MAX_EFFECT_RECYCLE_BERRIES); PLAYER(SPECIES_SNORLAX) { Item(ITEM_APICOT_BERRY); GigantamaxFactor(TRUE); } PLAYER(SPECIES_MUNCHLAX) { Item(ITEM_APICOT_BERRY); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_APICOT_BERRY); } @@ -1272,8 +1272,8 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Snooze makes only the target drowsy") { PASSES_RANDOMLY(1, 2, RNG_G_MAX_SNOOZE); GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_SNOOZE].argument == MAX_EFFECT_YAWN_FOE); - ASSUME(gBattleMoves[MOVE_DARK_PULSE].category == BATTLE_CATEGORY_SPECIAL); // Otherwise, Blissey faints. + ASSUME(gMovesInfo[MOVE_G_MAX_SNOOZE].argument == MAX_EFFECT_YAWN_FOE); + ASSUME(gMovesInfo[MOVE_DARK_PULSE].category == BATTLE_CATEGORY_SPECIAL); // Otherwise, Blissey faints. PLAYER(SPECIES_GRIMMSNARL) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_IMPIDIMP); OPPONENT(SPECIES_BLISSEY); @@ -1296,7 +1296,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Finale heals allies by 1/6 of their health") { s16 damage1, damage2; GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_FINALE].argument == MAX_EFFECT_HEAL_TEAM); + ASSUME(gMovesInfo[MOVE_G_MAX_FINALE].argument == MAX_EFFECT_HEAL_TEAM); PLAYER(SPECIES_ALCREMIE) { HP(1); GigantamaxFactor(TRUE); } PLAYER(SPECIES_MILCERY) { HP(1); } OPPONENT(SPECIES_WOBBUFFET); @@ -1316,7 +1316,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Finale heals allies by 1/6 of their health") DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Sweetness cures allies' status conditions") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_SWEETNESS].argument == MAX_EFFECT_AROMATHERAPY); + ASSUME(gMovesInfo[MOVE_G_MAX_SWEETNESS].argument == MAX_EFFECT_AROMATHERAPY); PLAYER(SPECIES_APPLETUN) { Status1(STATUS1_POISON); GigantamaxFactor(TRUE); } PLAYER(SPECIES_APPLIN) { Status1(STATUS1_POISON); } OPPONENT(SPECIES_WOBBUFFET); @@ -1336,7 +1336,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Sweetness cures allies' status conditions") DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Centiferno traps both opponents in Fire Spin") { GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_CENTIFERNO].argument == MAX_EFFECT_FIRE_SPIN_FOES); + ASSUME(gMovesInfo[MOVE_G_MAX_CENTIFERNO].argument == MAX_EFFECT_FIRE_SPIN_FOES); PLAYER(SPECIES_CENTISKORCH) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_SIZZLIPEDE); PLAYER(SPECIES_SIZZLIPEDE); @@ -1365,7 +1365,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Chi Strike boosts allies' crit chance") u32 j; GIVEN { ASSUME(B_CRIT_CHANCE >= GEN_6); - ASSUME(gBattleMoves[MOVE_G_MAX_CHI_STRIKE].argument == MAX_EFFECT_CRIT_PLUS); + ASSUME(gMovesInfo[MOVE_G_MAX_CHI_STRIKE].argument == MAX_EFFECT_CRIT_PLUS); PLAYER(SPECIES_MACHAMP) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_MACHOP); OPPONENT(SPECIES_WOBBUFFET); @@ -1394,8 +1394,8 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Chi Strike boosts allies' crit chance") DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Depletion takes away 2 PP from the target's last move") { GIVEN { - ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].category == BATTLE_CATEGORY_PHYSICAL); // Otherwise Sableye faints. - ASSUME(gBattleMoves[MOVE_G_MAX_DEPLETION].argument == MAX_EFFECT_SPITE); + ASSUME(gMovesInfo[MOVE_DRAGON_CLAW].category == BATTLE_CATEGORY_PHYSICAL); // Otherwise Sableye faints. + ASSUME(gMovesInfo[MOVE_G_MAX_DEPLETION].argument == MAX_EFFECT_SPITE); PLAYER(SPECIES_DURALUDON) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_WYNAUT); // Dynamax behaves weird with test turn order because stats are recalculated. @@ -1417,7 +1417,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max One Blow bypasses Max Guard for full damage" PARAMETRIZE { protect = TRUE; } PARAMETRIZE { protect = FALSE; } GIVEN { - ASSUME(gBattleMoves[MOVE_G_MAX_ONE_BLOW].argument == MAX_EFFECT_BYPASS_PROTECT); + ASSUME(gMovesInfo[MOVE_G_MAX_ONE_BLOW].argument == MAX_EFFECT_BYPASS_PROTECT); PLAYER(SPECIES_URSHIFU) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_KUBFU); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c index d33a5db1d33e..168dea1ca65a 100644 --- a/test/test_runner_battle.c +++ b/test/test_runner_battle.c @@ -1734,7 +1734,7 @@ void Moves_(u32 sourceLine, u16 moves[MAX_MON_MOVES]) break; INVALID_IF(moves[i] >= MOVES_COUNT, "Illegal move: %d", moves[i]); SetMonData(DATA.currentMon, MON_DATA_MOVE1 + i, &moves[i]); - SetMonData(DATA.currentMon, MON_DATA_PP1 + i, &gBattleMoves[moves[i]].pp); + SetMonData(DATA.currentMon, MON_DATA_PP1 + i, &gMovesInfo[moves[i]].pp); } DATA.explicitMoves[DATA.currentSide] |= 1 << DATA.currentPartyIndex; } @@ -1980,7 +1980,7 @@ s32 MoveGetTarget(s32 battlerId, u32 moveId, struct MoveContext *ctx, u32 source } else { - const struct BattleMove *move = &gBattleMoves[moveId]; + const struct BattleMove *move = &gMovesInfo[moveId]; if (move->target == MOVE_TARGET_RANDOM || move->target == MOVE_TARGET_BOTH || move->target == MOVE_TARGET_DEPENDS @@ -2040,7 +2040,7 @@ void MoveGetIdAndSlot(s32 battlerId, struct MoveContext *ctx, u32 *moveId, u32 * { INVALID_IF(DATA.explicitMoves[battlerId & BIT_SIDE] & (1 << DATA.currentMonIndexes[battlerId]), "Missing explicit %S", GetBattleMoveName(ctx->move)); SetMonData(mon, MON_DATA_MOVE1 + i, &ctx->move); - SetMonData(DATA.currentMon, MON_DATA_PP1 + i, &gBattleMoves[ctx->move].pp); + SetMonData(DATA.currentMon, MON_DATA_PP1 + i, &gMovesInfo[ctx->move].pp); *moveSlot = i; *moveId = ctx->move; break; From ea6cd551f3d048a7d1c5e98d198fac58ee9d76d3 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 26 Jan 2024 00:39:11 -0300 Subject: [PATCH 20/30] Renamed the BattleMove struct to MovesInfo This is consistent with the struct SpeciesInfo, which contains the variables used by the gSpeciesInfo array. --- include/pokemon.h | 4 ++-- src/data/battle_moves.h | 2 +- src/menu_specialized.c | 4 ++-- src/rom_header_gf.c | 2 +- test/test_runner_battle.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index 615d278a5e47..93760eeef2b2 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -443,7 +443,7 @@ struct SpeciesInfo /*0x8C*/ /* 0x84 */ const struct FormChange *formChangeTable; }; -struct BattleMove +struct MovesInfo { union { u8 moveName[MOVE_NAME_LENGTH + 1]; @@ -608,7 +608,7 @@ extern u8 gEnemyPartyCount; extern struct Pokemon gEnemyParty[PARTY_SIZE]; extern struct SpriteTemplate gMultiuseSpriteTemplate; -extern const struct BattleMove gMovesInfo[]; +extern const struct MovesInfo gMovesInfo[]; extern const u8 gFacilityClassToPicIndex[]; extern const u8 gFacilityClassToTrainerClass[]; extern const struct SpeciesInfo gSpeciesInfo[]; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 191b6e4af84e..4f3c53dd7ddb 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -104,7 +104,7 @@ static const u8 sFeintDescription[] = _( "An attack that hits foes\n" "using moves like Protect."); -const struct BattleMove gMovesInfo[MOVES_COUNT_DYNAMAX] = +const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 8a0576b057e1..ce4f45d2c287 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -751,7 +751,7 @@ u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices) static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) { s32 x; - const struct BattleMove *move; + const struct MovesInfo *move; u8 buffer[32]; const u8 *str; @@ -818,7 +818,7 @@ static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) { s32 x; const u8 *str; - const struct BattleMove *move; + const struct MovesInfo *move; MoveRelearnerShowHideHearts(chosenMove); FillWindowPixelBuffer(RELEARNERWIN_DESC_CONTEST, PIXEL_FILL(1)); diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c index 4d473b2b54a8..9c42cab46343 100644 --- a/src/rom_header_gf.c +++ b/src/rom_header_gf.c @@ -73,7 +73,7 @@ struct GFRomHeader const u8 (* abilityNames)[]; const u8 *const * abilityDescriptions; const struct Item * items; - const struct BattleMove * moves; + const struct MovesInfo * moves; const struct CompressedSpriteSheet * ballGfx; const struct CompressedSpritePalette * ballPalettes; u32 gcnLinkFlagsOffset; diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c index 168dea1ca65a..6e58e5aaf5c9 100644 --- a/test/test_runner_battle.c +++ b/test/test_runner_battle.c @@ -1980,7 +1980,7 @@ s32 MoveGetTarget(s32 battlerId, u32 moveId, struct MoveContext *ctx, u32 source } else { - const struct BattleMove *move = &gMovesInfo[moveId]; + const struct MovesInfo *move = &gMovesInfo[moveId]; if (move->target == MOVE_TARGET_RANDOM || move->target == MOVE_TARGET_BOTH || move->target == MOVE_TARGET_DEPENDS From dc60e70f7c1195fa051fd41c4746619bc3c184e3 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 26 Jan 2024 07:05:17 -0300 Subject: [PATCH 21/30] Removed empty lines separating battle params from contest params in gMovesInfo --- src/data/battle_moves.h | 739 ---------------------------------------- 1 file changed, 739 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 4f3c53dd7ddb..4821be46b555 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -138,7 +138,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS == GEN_4, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_POUND, @@ -160,7 +159,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -181,7 +179,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -203,7 +200,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -225,7 +221,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -248,7 +243,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PAYDAY, }), - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -275,7 +269,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_FIRE_PUNCH, @@ -306,7 +299,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_ICE_PUNCH, @@ -337,7 +329,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_THUNDER_PUNCH, @@ -358,7 +349,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SCRATCH, @@ -379,7 +369,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_VICE_GRIP, @@ -400,7 +389,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -425,7 +413,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .windMove = B_EXTRAPOLATED_MOVE_FLAGS, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -448,7 +435,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_SWORDS_DANCE, @@ -470,7 +456,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -493,7 +478,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), .damagesAirborneDoubleDamage = TRUE, .windMove = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -514,7 +498,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -541,7 +524,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -567,7 +549,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -592,7 +573,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -614,7 +594,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -641,7 +620,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -669,7 +647,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -691,7 +668,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -712,7 +688,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -740,7 +715,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .gravityBanned = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -767,7 +741,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -789,7 +762,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_SAND_ATTACK, @@ -815,7 +787,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -836,7 +807,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_HORN_ATTACK, @@ -857,7 +827,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -878,7 +847,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -905,7 +873,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -933,7 +900,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -957,7 +923,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -979,7 +944,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -1005,7 +969,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THRASH, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -1027,7 +990,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -1049,7 +1011,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -1074,7 +1035,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -1101,7 +1061,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1121,7 +1080,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1143,7 +1101,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_LEER, @@ -1170,7 +1127,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -1194,7 +1150,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -1221,7 +1176,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .soundMove = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1245,7 +1199,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_SING, @@ -1269,7 +1222,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -1290,7 +1242,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .argument = 20, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1319,7 +1270,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -1348,7 +1298,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = B_UPDATED_MOVE_DATA >= GEN_4 ? MOVE_EFFECT_SP_DEF_MINUS_1 : MOVE_EFFECT_DEF_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -1373,7 +1322,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1398,7 +1346,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1422,7 +1369,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1442,7 +1388,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -1462,7 +1407,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1484,7 +1428,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .damagesUnderwater = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_SURF, @@ -1515,7 +1458,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1545,7 +1487,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1570,7 +1511,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1595,7 +1535,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1620,7 +1559,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1644,7 +1582,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1665,7 +1602,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_PECK, @@ -1686,7 +1622,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1708,7 +1643,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1729,7 +1663,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -1755,7 +1688,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_2, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -1777,7 +1709,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -1798,7 +1729,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -1820,7 +1750,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -1841,7 +1770,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -1863,7 +1791,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_LEECH_SEED, @@ -1887,7 +1814,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_GROWTH, @@ -1909,7 +1835,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1932,7 +1857,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1959,7 +1883,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -1982,7 +1905,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2005,7 +1927,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2038,7 +1959,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THRASH, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -2060,7 +1980,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_STRING_SHOT, @@ -2082,7 +2001,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), .argument = 40, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_RAGE, @@ -2106,7 +2024,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -2135,7 +2052,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -2160,7 +2076,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -2182,7 +2097,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -2208,7 +2122,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -2228,7 +2141,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_ROCK_THROW, @@ -2251,7 +2163,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_EARTHQUAKE, @@ -2273,7 +2184,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -2299,7 +2209,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .assistBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2321,7 +2230,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_TOXIC, @@ -2346,7 +2254,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_CONFUSION, @@ -2371,7 +2278,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_PSYCHIC, @@ -2393,7 +2299,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_HYPNOSIS, @@ -2417,7 +2322,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -2441,7 +2345,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -2462,7 +2365,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -2483,7 +2385,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_RAGE, @@ -2506,7 +2407,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -2526,7 +2426,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2555,7 +2454,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -2579,7 +2477,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2603,7 +2500,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DOUBLE_TEAM, @@ -2634,7 +2530,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2658,7 +2553,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_HARDEN, @@ -2682,7 +2576,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -2704,7 +2597,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2726,7 +2618,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2750,7 +2641,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -2774,7 +2664,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_DEFENSE_CURL, @@ -2798,7 +2687,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -2822,7 +2710,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -2846,7 +2733,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -2870,7 +2756,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2894,7 +2779,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_FOCUS_ENERGY, @@ -2918,7 +2802,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -2947,7 +2830,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -2975,7 +2857,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -3000,7 +2881,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -3021,7 +2901,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3047,7 +2926,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3072,7 +2950,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 40, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SMOG, @@ -3097,7 +2974,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SLUDGE, @@ -3122,7 +2998,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_BONE_CLUB, @@ -3147,7 +3022,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -3175,7 +3049,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .chance = 20, }), #endif - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3200,7 +3073,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3220,7 +3092,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -3244,7 +3115,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3264,7 +3134,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -3290,7 +3159,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3314,7 +3182,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -3336,7 +3203,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_KINESIS, @@ -3361,7 +3227,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_SOFT_BOILED, @@ -3393,7 +3258,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .gravityBanned = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -3421,7 +3285,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3442,7 +3305,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -3470,7 +3332,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -3491,7 +3352,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3514,7 +3374,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -3536,7 +3395,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -3567,7 +3425,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .chance = 30, }), #endif - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -3596,7 +3453,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -3621,7 +3477,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -3648,7 +3503,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -3671,7 +3525,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -3693,7 +3546,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -3713,7 +3565,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -3737,7 +3588,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .gravityBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -3761,7 +3611,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3783,7 +3632,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3804,7 +3652,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -3825,7 +3672,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3846,7 +3692,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .strikeCount = 2, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_BONEMERANG, @@ -3871,7 +3716,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .healingMove = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_REST, @@ -3896,7 +3740,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -3923,7 +3766,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -3947,7 +3789,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -3971,7 +3812,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -3996,7 +3836,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_TRI_ATTACK, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -4018,7 +3857,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -4041,7 +3879,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -4066,7 +3903,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -4134,7 +3970,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .sketchBanned = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -4156,7 +3991,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -4185,7 +4019,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_STEAL_ITEM, }), - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -4208,7 +4041,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -4229,7 +4061,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_MIND_READER, @@ -4251,7 +4082,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS <= GEN_3, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -4278,7 +4108,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -4306,7 +4135,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -4330,7 +4158,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_CURSE, @@ -4351,7 +4178,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -4375,7 +4201,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -4397,7 +4222,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .windMove = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -4420,7 +4244,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -4441,7 +4264,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -4464,7 +4286,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -4489,7 +4310,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_POWDER_SNOW, @@ -4514,7 +4334,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -4536,7 +4355,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -4558,7 +4376,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SCARY_FACE, @@ -4578,7 +4395,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -4600,7 +4416,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -4624,7 +4439,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_BELLY_DRUM, @@ -4650,7 +4464,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SLUDGE_BOMB, @@ -4675,7 +4488,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_MUD_SLAP, @@ -4701,7 +4513,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -4727,7 +4538,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .forcePressure = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -4753,7 +4563,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -4776,7 +4585,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -4803,7 +4611,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -4828,7 +4635,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .mirrorMoveBanned = TRUE, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -4854,7 +4660,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -4881,7 +4686,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -4901,7 +4705,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_BONE_RUSH, @@ -4922,7 +4725,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_LOCK_ON, @@ -4948,7 +4750,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THRASH, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -4972,7 +4773,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .windMove = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SANDSTORM, @@ -4994,7 +4794,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -5021,7 +4820,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_ENDURE, @@ -5043,7 +4841,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_CHARM, @@ -5066,7 +4863,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .instructBanned = TRUE, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -5086,7 +4882,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5108,7 +4903,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5133,7 +4927,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5159,7 +4952,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5187,7 +4979,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5214,7 +5005,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5237,7 +5027,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_MEAN_LOOK, @@ -5260,7 +5049,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5290,7 +5078,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mimicBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5316,7 +5103,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .soundMove = B_UPDATED_MOVE_FLAGS != GEN_5, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_HEAL_BELL, @@ -5337,7 +5123,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5358,7 +5143,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5379,7 +5163,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5403,7 +5186,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -5424,7 +5206,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -5450,7 +5231,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -5472,7 +5252,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -5503,7 +5282,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5524,7 +5302,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5554,7 +5331,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_BREATH, @@ -5577,7 +5353,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5601,7 +5376,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .encoreBanned = TRUE, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -5623,7 +5397,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -5656,7 +5429,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = } #endif ), - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5678,7 +5450,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_SWEET_SCENT, @@ -5704,7 +5475,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5731,7 +5501,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5752,7 +5521,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = -1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5777,7 +5545,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -5802,7 +5569,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -5827,7 +5593,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -5847,7 +5612,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -5869,7 +5633,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5896,7 +5659,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -5919,7 +5681,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_RAIN_DANCE, @@ -5942,7 +5703,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_SUNNY_DAY, @@ -5977,7 +5737,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = #endif .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6001,7 +5760,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .meFirstBanned = TRUE, .metronomeBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -6026,7 +5784,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS < GEN_5, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6051,7 +5808,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 2 : 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -6082,7 +5838,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6108,7 +5863,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6136,7 +5890,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6162,7 +5915,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6186,7 +5938,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -6206,7 +5957,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6232,7 +5982,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_FAKE_OUT, @@ -6265,7 +6014,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_UPROAR, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -6289,7 +6037,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_STOCKPILE, @@ -6310,7 +6057,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6335,7 +6081,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6361,7 +6106,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -6384,7 +6128,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_HAIL, @@ -6406,7 +6149,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6428,7 +6170,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6450,7 +6191,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -6471,7 +6211,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESTORE_REPLACEMENT_HP }, - .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6492,7 +6231,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -6521,7 +6259,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6550,7 +6287,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_REMOVE_STATUS, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6576,7 +6312,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -6603,7 +6338,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .mimicBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -6627,7 +6361,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_CHARGE, @@ -6650,7 +6383,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_TAUNT, @@ -6677,7 +6409,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6701,7 +6432,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6725,7 +6455,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -6750,7 +6479,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -6779,7 +6507,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .mimicBanned = TRUE, - .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -6804,7 +6531,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6829,7 +6555,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_DEF_DOWN, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -6852,7 +6577,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -6876,7 +6600,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6896,7 +6619,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = -4, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_REVENGE, @@ -6917,7 +6639,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -6939,7 +6660,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_YAWN, @@ -6963,7 +6683,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_KNOCK_OFF, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6985,7 +6704,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -7005,7 +6723,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7027,7 +6744,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7053,7 +6769,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .forcePressure = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7077,7 +6792,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -7101,7 +6815,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -7127,7 +6840,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7152,7 +6864,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SECRET_POWER, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7178,7 +6889,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .assistBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_DIVE, @@ -7199,7 +6909,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -7223,7 +6932,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7247,7 +6955,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7272,7 +6979,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7298,7 +7004,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7325,7 +7030,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .danceMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7348,7 +7052,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .danceMove = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_4, - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -7375,7 +7078,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7399,7 +7101,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_MUD_SPORT, @@ -7423,7 +7124,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ballisticMove = TRUE, .instructBanned = TRUE, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7450,7 +7150,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7475,7 +7174,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -7497,7 +7195,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -7524,7 +7221,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_TOXIC, .chance = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 30, }), - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7550,7 +7246,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -7574,7 +7269,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7598,7 +7292,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -7626,7 +7319,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -7653,7 +7345,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7674,7 +7365,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7698,7 +7388,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7720,7 +7409,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7743,7 +7431,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .windMove = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -7768,7 +7455,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7791,7 +7477,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7816,7 +7501,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7843,7 +7527,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7867,7 +7550,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_METAL_SOUND, @@ -7895,7 +7577,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -7917,7 +7598,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -7941,7 +7621,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -7961,7 +7640,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7986,7 +7664,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8008,7 +7685,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -8034,7 +7710,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8057,7 +7732,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .punchingMove = TRUE, .damagesAirborne = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8080,7 +7754,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -8100,7 +7773,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8126,7 +7798,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -8147,7 +7818,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8169,7 +7839,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8189,7 +7858,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8213,7 +7881,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -8236,7 +7903,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -8261,7 +7927,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .soundMove = B_UPDATED_MOVE_FLAGS >= GEN_8, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8282,7 +7947,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8307,7 +7971,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8331,7 +7994,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8362,7 +8024,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -8387,7 +8048,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -8414,7 +8074,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -8442,7 +8101,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_STEAL_ITEM, }), - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -8471,7 +8129,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .chance = 10, }), #endif - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8491,7 +8148,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8515,7 +8171,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_WATER_SPORT, @@ -8539,7 +8194,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_CALM_MIND, @@ -8562,7 +8216,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8587,7 +8240,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_DANCE, @@ -8608,7 +8260,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = B_UPDATED_MOVE_FLAGS >= GEN_6, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -8628,7 +8279,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8654,7 +8304,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8676,7 +8325,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8700,7 +8348,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -8725,7 +8372,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8749,7 +8395,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8772,7 +8417,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -8797,7 +8441,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_REMOVE_STATUS, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -8823,7 +8466,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8845,7 +8487,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8868,7 +8509,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -8888,7 +8528,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -8908,7 +8547,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8936,7 +8574,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FEINT, }), - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8959,7 +8596,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BUG_BITE, }), - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -8984,7 +8620,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .windMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9008,7 +8643,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS < GEN_5, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9029,7 +8663,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .meFirstBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9049,7 +8682,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9073,7 +8705,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_SPDEF_DOWN, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9094,7 +8725,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_PAYBACK, @@ -9115,7 +8745,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9137,7 +8766,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9158,7 +8786,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -9179,7 +8806,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9200,7 +8826,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9222,7 +8847,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9242,7 +8866,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9266,7 +8889,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9288,7 +8910,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9312,7 +8933,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_LUCKY_CHANT, @@ -9343,7 +8963,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .mimicBanned = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9373,7 +8992,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .mimicBanned = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9395,7 +9013,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9417,7 +9034,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9438,7 +9054,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9459,7 +9074,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9481,7 +9095,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_WORRY_SEED, @@ -9501,7 +9114,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9527,7 +9139,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .forcePressure = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9549,7 +9160,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9573,7 +9183,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9598,7 +9207,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .gravityBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9627,7 +9235,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9653,7 +9260,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9675,7 +9281,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9699,7 +9304,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -9725,7 +9329,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9751,7 +9354,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9774,7 +9376,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9795,7 +9396,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9816,7 +9416,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9842,7 +9441,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -9864,7 +9462,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9891,7 +9488,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -9912,7 +9508,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9939,7 +9534,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_RUSH, @@ -9959,7 +9553,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9981,7 +9574,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .punchingMove = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10001,7 +9593,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10027,7 +9618,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10053,7 +9643,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10075,7 +9664,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_BRAVE_BIRD, @@ -10101,7 +9689,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10125,7 +9712,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10149,7 +9735,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10173,7 +9758,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -10195,7 +9779,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10215,7 +9798,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = -4, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10235,7 +9817,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10257,7 +9838,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -10289,7 +9869,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_THUNDER_FANG, @@ -10320,7 +9899,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_ICE_FANG, @@ -10352,7 +9930,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_FIRE_FANG, @@ -10373,7 +9950,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10399,7 +9975,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10421,7 +9996,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10447,7 +10021,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10472,7 +10045,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -10497,7 +10069,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10523,7 +10094,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10546,7 +10116,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, //.ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10568,7 +10137,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -10592,7 +10160,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10617,7 +10184,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10641,7 +10207,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -10665,7 +10230,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -10686,7 +10250,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10710,7 +10273,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -10738,7 +10300,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10763,7 +10324,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10789,7 +10349,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -10810,7 +10369,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10831,7 +10389,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -10853,7 +10410,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10878,7 +10434,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .forcePressure = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -10900,7 +10455,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10940,7 +10494,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .chance = 31, #endif }), - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10961,7 +10514,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .argument = HOLD_EFFECT_PLATE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -10984,7 +10536,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BUG_BITE, }), - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11010,7 +10561,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 70, }), - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -11032,7 +10582,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11053,7 +10602,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -11074,7 +10622,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_ATTACK_ORDER, @@ -11098,7 +10645,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_DEFEND_ORDER, @@ -11123,7 +10669,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_HEAL_ORDER, @@ -11145,7 +10690,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11167,7 +10711,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11191,7 +10734,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -11212,7 +10754,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11236,7 +10777,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .danceMove = TRUE, - .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -11256,7 +10796,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11279,7 +10818,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11302,7 +10840,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .sketchBanned = (B_SKETCH_BANS >= GEN_9), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11327,7 +10864,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_2, .chance = 40, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -11354,7 +10890,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11383,7 +10918,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FEINT, }), - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11407,7 +10941,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -11434,7 +10967,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .protectionMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11456,7 +10988,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11478,7 +11009,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11500,7 +11030,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -11519,7 +11048,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11540,7 +11068,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .argument = STATUS1_PSN_ANY, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11564,7 +11091,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11591,7 +11117,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -11614,7 +11139,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .gravityBanned = TRUE, - .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11636,7 +11160,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11661,7 +11184,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SMACK_DOWN, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11682,7 +11204,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .alwaysCriticalHit = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11706,7 +11227,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLAME_BURST, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -11731,7 +11251,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11756,7 +11275,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11778,7 +11296,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_7, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11798,7 +11315,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11819,7 +11335,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -11841,7 +11356,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11868,7 +11382,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -11892,7 +11405,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11918,7 +11430,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11944,7 +11455,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_2, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11965,7 +11475,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -11987,7 +11496,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12009,7 +11517,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12034,7 +11541,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12059,7 +11565,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ROUND, }), - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12081,7 +11586,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12102,7 +11606,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12125,7 +11628,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CLEAR_SMOG, }), - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -12145,7 +11647,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -12172,7 +11673,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .protectionMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12195,7 +11695,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12221,7 +11720,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SCALD, @@ -12245,7 +11743,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12270,7 +11767,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .pulseMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12291,7 +11787,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .argument = STATUS1_ANY, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12317,7 +11812,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12341,7 +11835,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12363,7 +11856,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12386,7 +11878,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_INCINERATE, }), - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -12408,7 +11899,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -12429,7 +11919,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -12452,7 +11941,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12473,7 +11961,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12495,7 +11982,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12521,7 +12007,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12546,7 +12031,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -12567,7 +12051,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12588,7 +12071,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -12609,7 +12091,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12628,7 +12109,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -12653,7 +12133,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12679,7 +12158,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12699,7 +12177,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .alwaysCriticalHit = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -12721,7 +12198,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_TAIL, @@ -12745,7 +12221,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -12770,7 +12245,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12792,7 +12266,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -12814,7 +12287,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12836,7 +12308,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12862,7 +12333,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12883,7 +12353,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -12905,7 +12374,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, .slicingMove = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -12932,7 +12400,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -12953,7 +12420,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -12979,7 +12445,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13006,7 +12471,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -13030,7 +12494,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13055,7 +12518,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ACC_MINUS_1, .chance = 40, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13074,7 +12536,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13095,7 +12556,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -13122,7 +12582,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13144,7 +12603,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -13166,7 +12624,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -13191,7 +12648,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13213,7 +12669,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .argument = HOLD_EFFECT_DRIVE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13242,7 +12697,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SLEEP, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13264,7 +12718,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .slicingMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13289,7 +12742,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13315,7 +12767,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13340,7 +12791,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13367,7 +12817,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13396,7 +12845,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13425,7 +12873,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13453,7 +12900,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13478,7 +12924,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13504,7 +12949,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_V_CREATE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13525,7 +12969,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .thawsUser = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13545,7 +12988,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13570,7 +13012,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .minimizeDoubleDamage = TRUE, .gravityBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13599,7 +13040,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .assistBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13627,7 +13067,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13651,7 +13090,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -13676,7 +13114,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .magicCoatAffected = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13697,7 +13134,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -13730,7 +13166,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FEINT, }), - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13757,7 +13192,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .argument = TYPE_GHOST, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13781,7 +13215,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13804,7 +13237,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13829,7 +13261,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13856,7 +13287,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .argument = TYPE_GRASS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13881,7 +13311,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .windMove = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13906,7 +13335,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -13932,7 +13360,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -13956,7 +13383,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -13978,7 +13404,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14004,7 +13429,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .argument = 75, // restores 75% HP instead of 50% HP .makesContact = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14033,7 +13457,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -14060,7 +13483,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14088,7 +13510,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_GRASSY_TERRAIN, @@ -14116,7 +13537,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_MISTY_TERRAIN, @@ -14137,7 +13557,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -14163,7 +13582,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -14184,7 +13602,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .windMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14209,7 +13626,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14231,7 +13647,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -14254,7 +13669,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14286,7 +13700,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -14310,7 +13723,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14335,7 +13747,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .magicCoatAffected = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -14364,7 +13775,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = B_UPDATED_MOVE_DATA >= GEN_7 ? MOVE_EFFECT_DEF_PLUS_2: MOVE_EFFECT_DEF_PLUS_1, .chance = 50, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -14395,7 +13805,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -14424,7 +13833,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FEINT, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_HYPERSPACE_HOLE, @@ -14448,7 +13856,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .category = B_UPDATED_MOVE_DATA >= GEN_7 ? BATTLE_CATEGORY_SPECIAL : BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -14477,7 +13884,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -14504,7 +13910,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -14532,7 +13937,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14558,7 +13962,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -14580,7 +13983,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -14603,7 +14005,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .powderMove = TRUE, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -14628,7 +14029,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14657,7 +14057,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -14680,7 +14079,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -14708,7 +14106,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_ELECTRIC_TERRAIN, @@ -14732,7 +14129,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14761,7 +14157,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14790,7 +14185,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14816,7 +14210,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14842,7 +14235,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14862,7 +14254,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14886,7 +14277,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -14918,7 +14308,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -14943,7 +14332,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -14974,7 +14362,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SMACK_DOWN, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_THOUSAND_ARROWS, @@ -15003,7 +14390,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PREVENT_ESCAPE, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_THOUSAND_WAVES, @@ -15024,7 +14410,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -15067,7 +14452,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -15092,7 +14476,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -15121,7 +14504,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_SPDEF_DOWN, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -15154,7 +14536,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_HYPERSPACE_FURY, @@ -15179,7 +14560,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -15204,7 +14584,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 2, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -15235,7 +14614,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -15264,7 +14642,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PREVENT_ESCAPE, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15290,7 +14667,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -15322,7 +14698,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_REMOVE_STATUS, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -15348,7 +14723,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -15377,7 +14751,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -15402,7 +14775,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -15425,7 +14797,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15450,7 +14821,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .slicingMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -15470,7 +14840,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -15496,7 +14865,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -15518,7 +14886,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -15542,7 +14909,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -15567,7 +14933,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15593,7 +14958,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THROAT_CHOP, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15614,7 +14978,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -15640,7 +15003,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PREVENT_ESCAPE, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15667,7 +15029,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_PSYCHIC_TERRAIN, @@ -15693,7 +15054,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -15719,7 +15079,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -15740,7 +15099,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -15766,7 +15124,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_REMOVE_ARG_TYPE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -15788,7 +15145,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15809,7 +15165,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15833,7 +15188,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15858,7 +15212,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .danceMove = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -15886,7 +15239,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CORE_ENFORCER, }), - .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -15912,7 +15264,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -15937,7 +15288,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .instructBanned = TRUE, - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -15965,7 +15315,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -15995,7 +15344,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -16020,7 +15368,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -16041,7 +15388,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -16065,7 +15411,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -16092,7 +15437,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sleepTalkBanned = TRUE, .instructBanned = TRUE, .assistBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -16117,7 +15461,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -16143,7 +15486,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -16169,7 +15511,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -16194,7 +15535,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SHADOW_BONE, @@ -16215,7 +15555,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -16241,7 +15580,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -16269,7 +15607,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -16299,7 +15636,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPECTRAL_THIEF, }), - .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -16326,7 +15662,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -16352,7 +15687,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -16375,7 +15709,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -16400,7 +15733,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -16425,7 +15757,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -16447,7 +15778,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .argument = HOLD_EFFECT_MEMORY, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -16468,7 +15798,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -16491,7 +15820,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -16517,7 +15845,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -16827,7 +16154,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -16860,7 +16186,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -16881,7 +16206,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -16906,7 +16230,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_TRAP_BOTH, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -16929,7 +16252,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -16952,7 +16274,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -16973,7 +16294,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -16996,7 +16316,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .argument = TYPE_PSYCHIC, .magicCoatAffected = TRUE, .powderMove = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17018,7 +16337,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .strikeCount = 2, .parentalBondBanned = TRUE, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17041,7 +16359,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -17061,7 +16378,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_STATUS, - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17082,7 +16398,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17108,7 +16423,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17129,7 +16443,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, - .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17159,7 +16472,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .soundMove = TRUE, .danceMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17182,7 +16494,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -17205,7 +16516,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17231,7 +16541,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -17257,7 +16566,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17285,7 +16593,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -17315,7 +16622,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .mimicBanned = TRUE, .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17344,7 +16650,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .mimicBanned = TRUE, .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17371,7 +16676,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -17402,7 +16706,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17424,7 +16727,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17447,7 +16749,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17473,7 +16774,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17499,7 +16799,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17526,7 +16825,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17556,7 +16854,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -17582,7 +16879,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17607,7 +16903,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .instructBanned = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17633,7 +16928,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17663,7 +16957,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17688,7 +16981,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, }), - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -17709,7 +17001,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -17733,7 +17024,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -17756,7 +17046,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_FAIL, // Remove a field terrain if there is one and hit, otherwise fail. .skyBattleBanned = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -17777,7 +17066,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .argument = MOVE_EFFECT_SCALE_SHOT, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17804,7 +17092,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .onChargeTurnOnly = TRUE, }), - .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -17833,7 +17120,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -17857,7 +17143,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17879,7 +17164,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, - .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -17903,7 +17187,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -17928,7 +17211,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17958,7 +17240,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17988,7 +17269,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .onlyIfTargetRaisedStats = TRUE, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -18009,7 +17289,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -18029,7 +17308,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -18054,7 +17332,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_STATUS, .magicCoatAffected = TRUE, - .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -18077,7 +17354,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, - .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -18098,7 +17374,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -18120,7 +17395,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, - .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -18146,7 +17420,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, - .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -18176,7 +17449,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -18205,7 +17477,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .healingMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -18229,7 +17500,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .alwaysCriticalHit = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -18258,7 +17528,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .punchingMove = TRUE, .strikeCount = 3, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -18282,7 +17551,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), - .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -18307,7 +17575,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -18341,7 +17608,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -18366,7 +17632,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -18397,7 +17662,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_MINUS_1, .chance = 100, }), - .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -18422,7 +17686,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -18447,7 +17710,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, - .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -18470,7 +17732,6 @@ const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, - .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, From 36bc7fe63ded8c0763cefb447a5cc27a060efe07 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 26 Jan 2024 10:22:42 -0300 Subject: [PATCH 22/30] Renamed MovesInfo to MoveInfo --- include/pokemon.h | 4 ++-- src/data/battle_moves.h | 2 +- src/menu_specialized.c | 4 ++-- src/rom_header_gf.c | 2 +- test/test_runner_battle.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index 93760eeef2b2..7afe4cabd218 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -443,7 +443,7 @@ struct SpeciesInfo /*0x8C*/ /* 0x84 */ const struct FormChange *formChangeTable; }; -struct MovesInfo +struct MoveInfo { union { u8 moveName[MOVE_NAME_LENGTH + 1]; @@ -608,7 +608,7 @@ extern u8 gEnemyPartyCount; extern struct Pokemon gEnemyParty[PARTY_SIZE]; extern struct SpriteTemplate gMultiuseSpriteTemplate; -extern const struct MovesInfo gMovesInfo[]; +extern const struct MoveInfo gMovesInfo[]; extern const u8 gFacilityClassToPicIndex[]; extern const u8 gFacilityClassToTrainerClass[]; extern const struct SpeciesInfo gSpeciesInfo[]; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 4821be46b555..1bd309aa03ce 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -104,7 +104,7 @@ static const u8 sFeintDescription[] = _( "An attack that hits foes\n" "using moves like Protect."); -const struct MovesInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = +const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { diff --git a/src/menu_specialized.c b/src/menu_specialized.c index ce4f45d2c287..85d78abc1c66 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -751,7 +751,7 @@ u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices) static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) { s32 x; - const struct MovesInfo *move; + const struct MoveInfo *move; u8 buffer[32]; const u8 *str; @@ -818,7 +818,7 @@ static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) { s32 x; const u8 *str; - const struct MovesInfo *move; + const struct MoveInfo *move; MoveRelearnerShowHideHearts(chosenMove); FillWindowPixelBuffer(RELEARNERWIN_DESC_CONTEST, PIXEL_FILL(1)); diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c index 9c42cab46343..9deac41fd7f2 100644 --- a/src/rom_header_gf.c +++ b/src/rom_header_gf.c @@ -73,7 +73,7 @@ struct GFRomHeader const u8 (* abilityNames)[]; const u8 *const * abilityDescriptions; const struct Item * items; - const struct MovesInfo * moves; + const struct MoveInfo * moves; const struct CompressedSpriteSheet * ballGfx; const struct CompressedSpritePalette * ballPalettes; u32 gcnLinkFlagsOffset; diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c index 6e58e5aaf5c9..caaadee2d249 100644 --- a/test/test_runner_battle.c +++ b/test/test_runner_battle.c @@ -1980,7 +1980,7 @@ s32 MoveGetTarget(s32 battlerId, u32 moveId, struct MoveContext *ctx, u32 source } else { - const struct MovesInfo *move = &gMovesInfo[moveId]; + const struct MoveInfo *move = &gMovesInfo[moveId]; if (move->target == MOVE_TARGET_RANDOM || move->target == MOVE_TARGET_BOTH || move->target == MOVE_TARGET_DEPENDS From 5da9a9fa85fafbb90d3884daa0afcdff7692fabe Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 26 Jan 2024 22:29:33 -0300 Subject: [PATCH 23/30] Added Cancer Fairy's HANDLE_EXPANDED_MOVE_NAME macro Used to handle moves with expanded names in a more comfortable manner. Also fixed Trick-or-Treat's expanded name. --- src/data/battle_moves.h | 799 +++++++--------------------------------- 1 file changed, 139 insertions(+), 660 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 1bd309aa03ce..ccc3cf88eaea 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -12,6 +12,13 @@ #define MOVE_NAME(nameOfMove) { .moveName = _(nameOfMove) } #define LONG_MOVE_NAME(longNameOfMove) { .longMoveName = COMPOUND_STRING(longNameOfMove) } +#define FIRST(a, ...) a +#if B_EXPANDED_MOVE_NAMES == TRUE +#define HANDLE_EXPANDED_MOVE_NAME(_name, ...) MOVE_NAME(FIRST(__VA_OPT__(__VA_ARGS__, ) _name)) +#else +#define HANDLE_EXPANDED_MOVE_NAME(_name, ...) MOVE_NAME(_name) +#endif + #if B_BINDING_TURNS >= GEN_5 #define BINDING_TURNS "4 or 5" #else @@ -307,11 +314,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_PUNCH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Thunder Punch"), - #else - .name = MOVE_NAME("ThunderPunch"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ThunderPunch", "Thunder Punch"), .description = COMPOUND_STRING("An electrified punch that\n" "may paralyze the foe."), .effect = EFFECT_HIT, @@ -1865,11 +1868,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_POWDER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Poison Powder"), - #else - .name = MOVE_NAME("PoisonPowder"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PoisonPowder", "Poison Powder"), .description = COMPOUND_STRING("Scatters a toxic powder\n" "that may poison the foe."), .effect = EFFECT_POISON, @@ -2032,11 +2031,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_SHOCK] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Thunder Shock"), - #else - .name = MOVE_NAME("ThunderShock"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ThunderShock", "Thunder Shock"), .description = COMPOUND_STRING("An electrical attack that\n" "may paralyze the foe."), .effect = EFFECT_HIT, @@ -2865,11 +2860,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SELF_DESTRUCT] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Self-Destruct"), - #else - .name = MOVE_NAME("SelfDestruct"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SelfDestruct", "Self-Destruct"), .description = COMPOUND_STRING("Inflicts severe damage but\n" "makes the user faint."), .effect = EFFECT_EXPLOSION, @@ -3235,11 +3226,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_JUMP_KICK] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("High Jump Kick"), - #else - .name = MOVE_NAME("HighJumpKick"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("HighJumpKick", "High Jump Kick"), .description = COMPOUND_STRING("A jumping knee kick. If it\n" "misses, the user is hurt."), #if B_UPDATED_MOVE_DATA >= GEN_5 @@ -5260,11 +5247,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMIC_PUNCH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Dynamic Punch"), - #else - .name = MOVE_NAME("DynamicPunch"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DynamicPunch", "Dynamic Punch"), .description = COMPOUND_STRING("Powerful and sure to cause\n" "confusion, but inaccurate."), .effect = EFFECT_HIT, @@ -5310,11 +5293,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_BREATH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Dragon Breath"), - #else - .name = MOVE_NAME("DragonBreath"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DragonBreath", "Dragon Breath"), .description = COMPOUND_STRING("Strikes the foe with an\n" "incredible blast of breath."), .effect = EFFECT_HIT, @@ -5792,11 +5771,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_SPEED] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Extreme Speed"), - #else - .name = MOVE_NAME("ExtremeSpeed"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ExtremeSpeed", "Extreme Speed"), .description = COMPOUND_STRING("An extremely fast and\n" "powerful attack."), .effect = EFFECT_HIT, @@ -5816,11 +5791,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ANCIENT_POWER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Ancient Power"), - #else - .name = MOVE_NAME("AncientPower"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("AncientPower", "Ancient Power"), .description = COMPOUND_STRING("An attack that may raise\n" "all stats."), .effect = EFFECT_HIT, @@ -6267,11 +6238,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SMELLING_SALTS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Smelling Salts"), - #else - .name = MOVE_NAME("SmellngSalts"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SmellngSalts", "Smelling Salts"), .description = COMPOUND_STRING("Powerful against paralyzed\n" "foes, but also heals them."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, @@ -7012,11 +6979,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FEATHER_DANCE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Feather Dance"), - #else - .name = MOVE_NAME("FeatherDance"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("FeatherDance", "Feather Dance"), .description = COMPOUND_STRING("Envelops the foe with down\n" "to sharply reduce Attack."), .effect = EFFECT_ATTACK_DOWN_2, @@ -7558,11 +7521,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_WHISTLE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Grass Whistle"), - #else - .name = MOVE_NAME("GrassWhistle"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("GrassWhistle", "Grass Whistle"), .description = COMPOUND_STRING("Lulls the foe into sleep\n" "with a pleasant melody."), .effect = EFFECT_SLEEP, @@ -13142,11 +13101,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PHANTOM_FORCE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Phantom Force"), - #else - .name = MOVE_NAME("PhantomForce"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PhantomForce", "Phantom Force"), .description = sShadowForceDescription, .effect = EFFECT_SEMI_INVULNERABLE, .power = 90, @@ -13174,11 +13129,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_OR_TREAT] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Trick-Or-Treat"), - #else - .name = MOVE_NAME("TrickOrTreat"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("TrickOrTreat", "Trick-or-Treat"), .description = COMPOUND_STRING("Goes trick-or-treating\n" "making the foe Ghost-type."), .effect = EFFECT_THIRD_TYPE, @@ -13245,11 +13196,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PARABOLIC_CHARGE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Parabolic Charge"), - #else - .name = MOVE_NAME("ParabolcChrg"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ParabolcChrg", "Parabolic Charge"), .description = COMPOUND_STRING("Damages adjacent Pokémon and\n" "heals up by half of it."), .effect = EFFECT_ABSORB, @@ -13269,11 +13216,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FORESTS_CURSE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Forest's Curse"), - #else - .name = MOVE_NAME("Forest'sCurs"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("Forest'sCurs", "Forest's Curse"), .description = COMPOUND_STRING("Puts a curse on the foe\n" "making the foe Grass-type."), .effect = EFFECT_THIRD_TYPE, @@ -13295,11 +13238,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_BLIZZARD] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Petal Blizzard"), - #else - .name = MOVE_NAME("PetalBlizzrd"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PetalBlizzrd", "Petal Blizzard"), .description = COMPOUND_STRING("Stirs up a violent storm\n" "of petals to attack."), .effect = EFFECT_HIT, @@ -13343,11 +13282,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DISARMING_VOICE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Disarming Voice"), - #else - .name = MOVE_NAME("DisrmngVoice"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DisrmngVoice", "Disarming Voice"), .description = COMPOUND_STRING("Lets out a charming cry\n" "that cannot be evaded."), .effect = EFFECT_HIT, @@ -13412,11 +13347,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAINING_KISS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Draining Kiss"), - #else - .name = MOVE_NAME("DrainingKiss"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DrainingKiss", "Draining Kiss"), .description = sDrainingKissDescription, .effect = EFFECT_ABSORB, .power = 50, @@ -13437,11 +13368,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CRAFTY_SHIELD] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Crafty Shield"), - #else - .name = MOVE_NAME("CraftyShield"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("CraftyShield", "Crafty Shield"), .description = COMPOUND_STRING("Evades status moves for\n" "one turn."), .effect = EFFECT_PROTECT, @@ -13465,11 +13392,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_SHIELD] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Flower Shield"), - #else - .name = MOVE_NAME("FlowerShield"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("FlowerShield", "Flower Shield"), .description = COMPOUND_STRING("Raises the Defense of\n" "Grass-type Pokémon."), .effect = EFFECT_FLOWER_SHIELD, @@ -13491,11 +13414,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_TERRAIN] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Grassy Terrain"), - #else - .name = MOVE_NAME("GrssyTerrain"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("GrssyTerrain", "Grassy Terrain"), .description = COMPOUND_STRING("The ground turns to grass\n" "for 5 turns. Restores HP."), .effect = EFFECT_GRASSY_TERRAIN, @@ -13518,11 +13437,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_TERRAIN] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Misty Terrain"), - #else - .name = MOVE_NAME("MistyTerrain"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MistyTerrain", "Misty Terrain"), .description = COMPOUND_STRING("Covers the ground with mist\n" "for 5 turns. Blocks status."), .effect = EFFECT_MISTY_TERRAIN, @@ -13677,11 +13592,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_KINGS_SHIELD] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("King's Shield"), - #else - .name = MOVE_NAME("King'sShield"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("King'sShield", "King's Shield"), .description = COMPOUND_STRING("Evades damage, and sharply\n" "reduces Attack if struck."), .effect = EFFECT_PROTECT, @@ -13755,11 +13666,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DIAMOND_STORM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Diamond Storm"), - #else - .name = MOVE_NAME("DiamondStorm"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DiamondStorm", "Diamond Storm"), .description = COMPOUND_STRING("Whips up a storm of\n" "diamonds. May up Defense."), .power = 100, @@ -13783,11 +13690,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STEAM_ERUPTION] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Steam Eruption"), - #else - .name = MOVE_NAME("SteamErption"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SteamErption", "Steam Eruption"), .description = COMPOUND_STRING("Immerses the foe in heated\n" "steam. May inflict a burn."), .effect = EFFECT_HIT, @@ -13813,11 +13716,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_HOLE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Hyprspace Hole"), - #else - .name = MOVE_NAME("HyprspceHole"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("HyprspceHole", "Hyprspace Hole"), .description = sHyperspaceHoleDescription, .effect = EFFECT_HIT, .power = 80, @@ -13841,11 +13740,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SHURIKEN] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Water Shuriken"), - #else - .name = MOVE_NAME("WatrShuriken"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("WatrShuriken", "Water Shuriken"), .description = COMPOUND_STRING("Throws 2 to 5 stars that\n" "are sure to strike first."), .effect = EFFECT_MULTI_HIT, @@ -13864,11 +13759,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_FIRE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Mystical Fire"), - #else - .name = MOVE_NAME("MysticalFire"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MysticalFire", "Mystical Fire"), .description = COMPOUND_STRING("Breathes a special, hot\n" "fire. Lowers Sp. Atk."), .effect = EFFECT_HIT, @@ -13918,11 +13809,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATIC_MIST] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Aromatic Mist"), - #else - .name = MOVE_NAME("AromaticMist"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("AromaticMist", "Aromatic Mist"), .description = COMPOUND_STRING("Raises the Sp. Def of a\n" "partner Pokémon."), .effect = EFFECT_AROMATIC_MIST, @@ -13945,11 +13832,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_IMPULSE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Eerie Impulse"), - #else - .name = MOVE_NAME("EerieImpulse"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("EerieImpulse", "Eerie Impulse"), .description = COMPOUND_STRING("Exposes the foe to a pulse\n" "that sharply cuts Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_2, @@ -14037,11 +13920,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNETIC_FLUX] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Magnetic Flux"), - #else - .name = MOVE_NAME("MagneticFlux"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MagneticFlux", "Magnetic Flux"), .description = COMPOUND_STRING("Boosts the defenses of\n" "those with Plus or Minus."), .effect = EFFECT_MAGNETIC_FLUX, @@ -14087,11 +13966,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIC_TERRAIN] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Electric Terrain"), - #else - .name = MOVE_NAME("ElctrcTrrain"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ElctrcTrrain", "Electric Terrain"), .description = COMPOUND_STRING("Electrifies the ground for\n" "5 turns. Prevents sleep."), .effect = EFFECT_ELECTRIC_TERRAIN, @@ -14114,11 +13989,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DAZZLING_GLEAM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Dazzling Gleam"), - #else - .name = MOVE_NAME("DazzlngGleam"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DazzlngGleam", "Dazzling Gleam"), .description = COMPOUND_STRING("Damages foes by emitting\n" "a bright flash."), .effect = EFFECT_HIT, @@ -14193,11 +14064,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BABY_DOLL_EYES] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Baby-Doll Eyes"), - #else - .name = MOVE_NAME("BabyDollEyes"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BabyDollEyes", "Baby-Doll Eyes"), .description = COMPOUND_STRING("Lowers the foe's Attack\n" "before it can move."), .effect = EFFECT_ATTACK_DOWN, @@ -14285,11 +14152,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_UP_PUNCH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Power-Up Punch"), - #else - .name = MOVE_NAME("PowerUpPunch"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PowerUpPunch", "Power-Up Punch"), .description = COMPOUND_STRING("A hard punch that raises\n" "the user's Attack."), .effect = EFFECT_HIT, @@ -14316,11 +14179,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OBLIVION_WING] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Oblivion Wing"), - #else - .name = MOVE_NAME("OblivionWing"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("OblivionWing", "Oblivion Wing"), .description = sDrainingKissDescription, .effect = EFFECT_ABSORB, .power = 80, @@ -14340,11 +14199,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_ARROWS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Thousand Arrows"), - #else - .name = MOVE_NAME("ThousndArrws"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ThousndArrws", "Thousand Arrows"), .description = COMPOUND_STRING("Can hit Flying foes, then\n" "knocks them to the ground."), .effect = EFFECT_HIT, @@ -14370,11 +14225,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_WAVES] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Thousand Waves"), - #else - .name = MOVE_NAME("ThousndWaves"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ThousndWaves", "Thousand Waves"), .description = COMPOUND_STRING("Those hit by the wave can\n" "no longer escape."), .effect = EFFECT_HIT, @@ -14418,11 +14269,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_OF_RUIN] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Light Of Ruin"), - #else - .name = MOVE_NAME("LightOfRuin"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("LightOfRuin", "Light Of Ruin"), .description = COMPOUND_STRING("Fires a great beam of light\n" "that also hurts the user."), .effect = EFFECT_HIT, @@ -14460,11 +14307,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PRECIPICE_BLADES] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Precipice Blades"), - #else - .name = MOVE_NAME("PrcipceBldes"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PrcipceBldes", "Precipice Blades"), .description = COMPOUND_STRING("Fearsome blades of stone\n" "attack both foes."), .effect = EFFECT_HIT, @@ -14484,11 +14327,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ASCENT] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Dragon Ascent"), - #else - .name = MOVE_NAME("DragonAscent"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DragonAscent", "Dragon Ascent"), .description = sCloseCombatDescription, .effect = EFFECT_HIT, .power = 120, @@ -14512,11 +14351,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYPERSPACE_FURY] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Hyperspace Fury"), - #else - .name = MOVE_NAME("HyprspceFury"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("HyprspceFury", "Hyperspace Fury"), .description = sHyperspaceHoleDescription, .effect = EFFECT_HYPERSPACE_FURY, .power = 100, @@ -14568,11 +14403,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIRST_IMPRESSION] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("First Impression"), - #else - .name = MOVE_NAME("FrstImpressn"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("FrstImpressn", "First Impression"), .description = COMPOUND_STRING("Hits hard and first.\n" "Only works first turn."), .effect = EFFECT_FAKE_OUT, @@ -14592,11 +14423,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BANEFUL_BUNKER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Baneful Bunker"), - #else - .name = MOVE_NAME("BanefulBunkr"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BanefulBunkr", "Baneful Bunker"), .description = COMPOUND_STRING("Protects user and poisons\n" "foes on contact."), .effect = EFFECT_PROTECT, @@ -14622,11 +14449,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_SHACKLE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Spirit Shackle"), - #else - .name = MOVE_NAME("SpiritShackl"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SpiritShackl", "Spirit Shackle"), .description = COMPOUND_STRING("After being hit, foes can\n" "no longer escape."), .effect = EFFECT_HIT, @@ -14650,11 +14473,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DARKEST_LARIAT] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Darkest Lariat"), - #else - .name = MOVE_NAME("DarkstLariat"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DarkstLariat", "Darkest Lariat"), .description = COMPOUND_STRING("Swings the arms to strike\n" "It ignores stat changes."), .effect = EFFECT_HIT, @@ -14675,11 +14494,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLING_ARIA] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Sparkling Aria"), - #else - .name = MOVE_NAME("SparklngAria"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SparklngAria", "Sparkling Aria"), .description = COMPOUND_STRING("Sings with bubbles. Cures\n" "burns on contact."), .effect = EFFECT_HIT, @@ -14731,11 +14546,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLORAL_HEALING] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Floral Healng"), - #else - .name = MOVE_NAME("FloralHealng"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("FloralHealng", "Floral Healng"), .description = COMPOUND_STRING("Restores an ally's HP.\n" "Heals more on grass."), .effect = EFFECT_HEAL_PULSE, @@ -14759,11 +14570,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_HORSEPOWER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("High Horsepower"), - #else - .name = MOVE_NAME("HighHorsepwr"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("HighHorsepwr", "High Horsepower"), .description = COMPOUND_STRING("Slams hard into the foe with\n" "its entire body."), .effect = EFFECT_HIT, @@ -15011,11 +14818,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_TERRAIN] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Psychic Terrain"), - #else - .name = MOVE_NAME("PsychcTrrain"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PsychcTrrain", "Psychic Terrain"), .description = COMPOUND_STRING("The ground turns weird for\n" "5 turns. Blocks priority."), .effect = EFFECT_PSYCHIC_TERRAIN, @@ -15196,11 +14999,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REVELATION_DANCE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Revelation Dance"), - #else - .name = MOVE_NAME("RvlationDnce"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("RvlationDnce", "Revelation Dance"), .description = COMPOUND_STRING("Dances with mystical power.\n" "Matches user's first type."), .effect = EFFECT_REVELATION_DANCE, @@ -15220,11 +15019,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CORE_ENFORCER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Core Enforcer"), - #else - .name = MOVE_NAME("CoreEnforcer"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("CoreEnforcer", "Core Enforcer"), .description = COMPOUND_STRING("Hits with a ray that\n" "nullifies the foe's ability."), .effect = EFFECT_HIT, @@ -15323,11 +15118,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGING_SCALES] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Clanging Scales"), - #else - .name = MOVE_NAME("ClngngScales"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ClngngScales", "Clanging Scales"), .description = COMPOUND_STRING("Makes a big noise with\n" "its scales. Drops Defense."), .effect = EFFECT_HIT, @@ -15352,11 +15143,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_HAMMER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Dragon Hammer"), - #else - .name = MOVE_NAME("DragonHammer"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DragonHammer", "Dragon Hammer"), .description = COMPOUND_STRING("Swings its whole body\n" "like a hammer to damage."), .effect = EFFECT_HIT, @@ -15469,11 +15256,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_FANGS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Psychic Fangs"), - #else - .name = MOVE_NAME("PsychicFangs"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PsychicFangs", "Psychic Fangs"), .description = COMPOUND_STRING("Chomps with psychic fangs.\n" "Destroys any barriers."), .effect = EFFECT_BRICK_BREAK, @@ -15494,11 +15277,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STOMPING_TANTRUM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Stomping Tantrum"), - #else - .name = MOVE_NAME("StmpngTantrm"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("StmpngTantrm", "Stomping Tantrum"), .description = COMPOUND_STRING("Stomps around angrily.\n" "Stronger after a failure."), .effect = EFFECT_STOMPING_TANTRUM, @@ -15588,11 +15367,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PRISMATIC_LASER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Prismatic Laser"), - #else - .name = MOVE_NAME("PrsmaticLasr"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PrsmaticLasr", "Prismatic Laser"), .description = COMPOUND_STRING("A high power laser that\n" "forces recharge next turn."), .effect = EFFECT_HIT, @@ -15615,11 +15390,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPECTRAL_THIEF] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Spectral Thief"), - #else - .name = MOVE_NAME("SpectrlThief"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SpectrlThief", "Spectral Thief"), .description = COMPOUND_STRING("Steals the target's stat\n" "boosts, then attacks."), .effect = EFFECT_HIT, @@ -15644,11 +15415,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUNSTEEL_STRIKE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Sunsteel Strike"), - #else - .name = MOVE_NAME("SnsteelStrke"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SnsteelStrke", "Sunsteel Strike"), .description = COMPOUND_STRING("A sun-fueled strike that\n" "ignores abilities."), .effect = EFFECT_HIT, @@ -15670,11 +15437,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MOONGEIST_BEAM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Moongeist Beam"), - #else - .name = MOVE_NAME("MoongestBeam"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MoongestBeam", "Moongeist Beam"), .description = COMPOUND_STRING("A moon-powered beam that\n" "ignores abilities."), .effect = EFFECT_HIT, @@ -15741,11 +15504,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NATURES_MADNESS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Nature's Madness"), - #else - .name = MOVE_NAME("Natur'sMadns"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("Natur'sMadns", "Nature's Madness"), .description = COMPOUND_STRING("Halves the foe's HP with\n" "the power of nature."), .effect = EFFECT_SUPER_FANG, @@ -15828,11 +15587,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PHOTON_GEYSER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Photon Geyser"), - #else - .name = MOVE_NAME("PhotonGeyser"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PhotonGeyser", "Photon Geyser"), .description = COMPOUND_STRING("User's highest attack stat\n" "determines its category."), .effect = EFFECT_PHOTON_GEYSER, @@ -15879,11 +15634,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPLISHY_SPLASH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Splishy Splash"), - #else - .name = MOVE_NAME("SplishySplsh"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SplishySplsh", "Splishy Splash"), .description = COMPOUND_STRING("A huge electrified wave that\n" "may paralyze the foe."), .effect = EFFECT_HIT, @@ -15946,11 +15697,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCY_BUBBLE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Bouncy Bubble"), - #else - .name = MOVE_NAME("BouncyBubble"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BouncyBubble", "Bouncy Bubble"), .description = COMPOUND_STRING("An attack that absorbs\n" #if B_UPDATED_MOVE_DATA >= GEN_8 "all the damage inflicted."), @@ -16086,11 +15833,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLY_SWIRL] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Sparkly Swirl"), - #else - .name = MOVE_NAME("SparklySwirl"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SparklySwirl", "Sparkly Swirl"), .description = COMPOUND_STRING("Wrap foe with whirlwind of\n" "scent. Heals party's status."), .effect = EFFECT_SPARKLY_SWIRL, @@ -16107,11 +15850,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VEEVEE_VOLLEY] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Veevee Volley"), - #else - .name = MOVE_NAME("VeeveeVolley"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("VeeveeVolley", "Veevee Volley"), .description = COMPOUND_STRING("Eevee's love increases its\n" "power. It never misses."), .effect = EFFECT_RETURN, @@ -16129,11 +15868,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_IRON_BASH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Double Iron Bash"), - #else - .name = MOVE_NAME("DublIronBash"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DublIronBash", "Double Iron Bash"), .description = COMPOUND_STRING("The user spins and hits with\n" "its arms. May cause flinch."), .effect = EFFECT_HIT, @@ -16162,11 +15897,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMAX_CANNON] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Dynamax Cannon"), - #else - .name = MOVE_NAME("DynamxCannon"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DynamxCannon", "Dynamax Cannon"), .description = COMPOUND_STRING("Fires a strong beam. Deals\n" "2x damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, @@ -16406,11 +16137,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FISHIOUS_REND] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Fishious Rend"), - #else - .name = MOVE_NAME("FishiousRend"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("FishiousRend", "Fishious Rend"), .description = COMPOUND_STRING("Double power if the user\n" "moves before the target."), .effect = EFFECT_BOLT_BEAK, @@ -16451,11 +16178,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGOROUS_SOUL] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Clangorous Soul"), - #else - .name = MOVE_NAME("ClngrousSoul"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ClngrousSoul", "Clangorous Soul"), .description = COMPOUND_STRING("The user uses some of its\n" "HP to raise all its stats."), .effect = EFFECT_CLANGOROUS_SOUL, @@ -16601,11 +16324,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BLADE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Behemoth Blade"), - #else - .name = MOVE_NAME("BehemthBlade"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BehemthBlade", "Behemoth Blade"), .description = COMPOUND_STRING("Strikes as a sword. Deals 2x\n" "damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, @@ -16630,11 +16349,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BASH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Behemoth Bash"), - #else - .name = MOVE_NAME("BehemothBash"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BehemothBash", "Behemoth Bash"), .description = COMPOUND_STRING("Attacks as a shield. Deals 2x\n" "damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, @@ -16684,11 +16399,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BREAKING_SWIPE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Breaking Swipe"), - #else - .name = MOVE_NAME("BreakngSwipe"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BreakngSwipe", "Breaking Swipe"), .description = COMPOUND_STRING("Swings its tail to attack.\n" "Lowers the Atk of those hit."), .effect = EFFECT_HIT, @@ -16833,11 +16544,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STRANGE_STEAM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Strange Steam"), - #else - .name = MOVE_NAME("StrangeSteam"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("StrangeSteam", "Strange Steam"), .description = COMPOUND_STRING("Emits a strange steam to\n" "potentially confuse the foe."), .effect = EFFECT_HIT, @@ -16911,11 +16618,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SURRENDER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("False Surrender"), - #else - .name = MOVE_NAME("FalsSurrendr"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("FalsSurrendr", "False Surrender"), .description = COMPOUND_STRING("Bows to stab the foe\n" "with hair. It never misses."), .effect = EFFECT_HIT, @@ -16936,11 +16639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_ASSAULT] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Meteor Assault"), - #else - .name = MOVE_NAME("MeteorAssalt"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MeteorAssalt", "Meteor Assault"), .description = COMPOUND_STRING("Attacks with a thick leek.\n" "The user must then rest."), .effect = EFFECT_HIT, @@ -17009,11 +16708,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EXPANDING_FORCE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Expanding Force"), - #else - .name = MOVE_NAME("ExpandngForc"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ExpandngForc", "Expanding Force"), .description = COMPOUND_STRING("Power goes up and damages\n" "all foes on Psychic Terrain."), .effect = EFFECT_EXPANDING_FORCE, @@ -17100,11 +16795,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SIDE_ARM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Shell Side Arm"), - #else - .name = MOVE_NAME("ShellSideArm"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ShellSideArm", "Shell Side Arm"), .description = COMPOUND_STRING("Deals better of physical and\n" "special damage. May poison."), .effect = EFFECT_SHELL_SIDE_ARM, @@ -17128,11 +16819,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_EXPLOSION] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Misty Explosion"), - #else - .name = MOVE_NAME("MstyExplsion"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MstyExplsion", "Misty Explosion"), .description = COMPOUND_STRING("Hit everything and faint.\n" "Powers up on Misty Terrain."), .effect = EFFECT_EXPLOSION, @@ -17172,11 +16859,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RISING_VOLTAGE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Rising Voltage"), - #else - .name = MOVE_NAME("RisngVoltage"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("RisngVoltage", "Rising Voltage"), .description = COMPOUND_STRING("This move's power doubles\n" "when on Electric Terrain."), .effect = EFFECT_RISING_VOLTAGE, @@ -17195,11 +16878,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TERRAIN_PULSE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Terrain Pulse"), - #else - .name = MOVE_NAME("TerrainPulse"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("TerrainPulse", "Terrain Pulse"), .description = COMPOUND_STRING("Type and power changes\n" "depending on the terrain."), .effect = EFFECT_TERRAIN_PULSE, @@ -17219,11 +16898,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SKITTER_SMACK] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Skitter Smack"), - #else - .name = MOVE_NAME("SkitterSmack"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SkitterSmack", "Skitter Smack"), .description = COMPOUND_STRING("User skitters behind foe to\n" "attack. Lowers foe's Sp. Atk."), .effect = EFFECT_HIT, @@ -17248,11 +16923,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_JEALOUSY] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Burning Jealousy"), - #else - .name = MOVE_NAME("BrningJelosy"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BrningJelosy", "Burning Jealousy"), .description = COMPOUND_STRING("Foes that have stats upped\n" "during the turn get burned."), .effect = EFFECT_HIT, @@ -17316,11 +16987,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CORROSIVE_GAS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Corrosive Gas"), - #else - .name = MOVE_NAME("CorrosiveGas"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("CorrosiveGas", "Corrosive Gas"), .description = COMPOUND_STRING("Highly acidic gas melts items\n" "held by surrounding Pokémon."), .effect = EFFECT_CORROSIVE_GAS, @@ -17403,11 +17070,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_WINGBEAT] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Dual Wingbeat"), - #else - .name = MOVE_NAME("DualWingbeat"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DualWingbeat", "Dual Wingbeat"), .description = COMPOUND_STRING("User slams the target with\n" "wings and hits twice in a row."), .effect = EFFECT_HIT, @@ -17428,11 +17091,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SCORCHING_SANDS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Scorching Sands"), - #else - .name = MOVE_NAME("ScorchngSnds"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ScorchngSnds", "Scorching Sands"), .description = COMPOUND_STRING("Throws scorching sand at\n" "the target. May leave a burn."), .effect = EFFECT_HIT, @@ -17457,11 +17116,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_JUNGLE_HEALING] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Jungle Healng"), - #else - .name = MOVE_NAME("JungleHealng"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("JungleHealng", "Jungle Healng"), .description = COMPOUND_STRING("Heals HP and status of\n" "itself and allies in battle."), .effect = EFFECT_JUNGLE_HEALING, @@ -17508,11 +17163,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SURGING_STRIKES] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Surging Strikes"), - #else - .name = MOVE_NAME("SurgngStrkes"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SurgngStrkes", "Surging Strikes"), .description = COMPOUND_STRING("Mastering the Water style,\n" "strikes with 3 critical hits."), .effect = EFFECT_HIT, @@ -17559,11 +17210,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ENERGY] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Dragon Energy"), - #else - .name = MOVE_NAME("DragonEnergy"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("DragonEnergy", "Dragon Energy"), .description = COMPOUND_STRING("The higher the user's HP\n" "the more damage caused."), .effect = EFFECT_ERUPTION, @@ -17583,11 +17230,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZING_GLARE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Freezing Glare"), - #else - .name = MOVE_NAME("FreezngGlare"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("FreezngGlare", "Freezing Glare"), .description = COMPOUND_STRING("Shoots psychic power from\n" #if B_USE_FROSTBITE == TRUE "the eyes. May frostbite."), @@ -17640,11 +17283,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDEROUS_KICK] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Thunderous Kick"), - #else - .name = MOVE_NAME("ThnderusKick"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ThnderusKick", "Thunderous Kick"), .description = COMPOUND_STRING("Uses a lightning-like kick\n" "to hit. Lowers foe's Defense."), .effect = EFFECT_HIT, @@ -17670,11 +17309,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIAL_LANCE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Glacial Lance"), - #else - .name = MOVE_NAME("GlacialLance"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("GlacialLance", "Glacial Lance"), .description = COMPOUND_STRING("Strikes by hurling a blizzard-\n" "cloaked icicle lance at foes."), .effect = EFFECT_HIT, @@ -17694,11 +17329,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ASTRAL_BARRAGE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Astral Barrage"), - #else - .name = MOVE_NAME("AstrlBarrage"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("AstrlBarrage", "Astral Barrage"), .description = COMPOUND_STRING("Strikes by sending a frightful\n" "amount of ghosts at foes."), .effect = EFFECT_HIT, @@ -17761,11 +17392,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHIELD_BASH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Psyshield Bash"), - #else - .name = MOVE_NAME("PsyshieldBsh"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PsyshieldBsh", "Psyshield Bash"), .description = COMPOUND_STRING("Hits a foe with psychic\n" "energy. May raise Defense."), .effect = EFFECT_HIT, @@ -17828,11 +17455,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPRINGTIDE_STORM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Springtide Storm"), - #else - .name = MOVE_NAME("SprngtdeStrm"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SprngtdeStrm", "Springtide Storm"), .description = COMPOUND_STRING("Wraps a foe in fierce winds.\n" "Varies with the user's form."), .effect = EFFECT_HIT, @@ -17854,11 +17477,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_POWER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Mystical Power"), - #else - .name = MOVE_NAME("MystcalPower"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MystcalPower", "Mystical Power"), .description = COMPOUND_STRING("A mysterious power strikes,\n" "raising the user's Sp. Atk."), .effect = EFFECT_HIT, @@ -17932,11 +17551,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MOUNTAIN_GALE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Mountain Gale"), - #else - .name = MOVE_NAME("MountainGale"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MountainGale", "Mountain Gale"), .description = COMPOUND_STRING("Giant chunks of ice damage\n" "the foe. It may flinch."), .effect = EFFECT_HIT, @@ -17956,11 +17571,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VICTORY_DANCE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Victory Dance"), - #else - .name = MOVE_NAME("VictoryDance"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("VictoryDance", "Victory Dance"), .description = COMPOUND_STRING("Dances to raise Attack,\n" "Defense and Speed."), .effect = EFFECT_VICTORY_DANCE, @@ -17979,11 +17590,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEADLONG_RUSH] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Headlong Rush"), - #else - .name = MOVE_NAME("HeadlongRush"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("HeadlongRush", "Headlong Rush"), .description = COMPOUND_STRING("Hits with a full-body tackle.\n" "Lowers the users's defenses."), .effect = EFFECT_HIT, @@ -18047,11 +17654,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_MALICE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Bitter Malice"), - #else - .name = MOVE_NAME("BitterMalice"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BitterMalice", "Bitter Malice"), .description = COMPOUND_STRING("A spine-chilling resentment.\n" "May lower the foe's Attack."), .effect = EFFECT_HIT, @@ -18089,11 +17692,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_ARROWS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Triple Arrows"), - #else - .name = MOVE_NAME("TripleArrows"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("TripleArrows", "Triple Arrows"), .description = COMPOUND_STRING("High critical hit ratio.\n" "May lower Defense or flinch."), .effect = EFFECT_HIT, @@ -18118,11 +17717,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNAL_PARADE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Infernal Parade"), - #else - .name = MOVE_NAME("InfrnlParade"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("InfrnlParade", "Infernal Parade"), .description = COMPOUND_STRING("Hurts a foe harder if it has\n" "an ailment. May leave a burn."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, @@ -18143,11 +17738,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CEASELESS_EDGE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Ceaseless Edge"), - #else - .name = MOVE_NAME("CeaslessEdge"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("CeaslessEdge", "Ceaseless Edge"), .description = COMPOUND_STRING("High critical hit ratio. Sets\n" "Splinters that hurt the foe."), .effect = EFFECT_HIT, @@ -18169,11 +17760,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLEAKWIND_STORM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Bleakwind Storm"), - #else - .name = MOVE_NAME("BlekwndStorm"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BlekwndStorm", "Bleakwind Storm"), .description = COMPOUND_STRING("Hits with brutal, cold winds.\n" "May lower the foe's Speed."), .effect = EFFECT_RAIN_ALWAYS_HIT, @@ -18194,11 +17781,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WILDBOLT_STORM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Wildbolt Storm"), - #else - .name = MOVE_NAME("WildbltStorm"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("WildbltStorm", "Wildbolt Storm"), .description = COMPOUND_STRING("Hits with a brutal tempest.\n" "May inflict paralysis."), .effect = EFFECT_RAIN_ALWAYS_HIT, @@ -18219,11 +17802,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSEAR_STORM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Sandsear Storm"), - #else - .name = MOVE_NAME("SndsearStorm"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SndsearStorm", "Sandsear Storm"), .description = COMPOUND_STRING("Hits with brutally hot sand.\n" "May inflict a burn."), .effect = EFFECT_RAIN_ALWAYS_HIT, @@ -18244,11 +17823,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_BLESSING] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Lunar Blessing"), - #else - .name = MOVE_NAME("LunarBlessng"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("LunarBlessng", "Lunar Blessing"), .description = COMPOUND_STRING("The user heals and cures\n" "itself and its ally."), .effect = EFFECT_JUNGLE_HEALING, @@ -18342,11 +17917,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESPECTS] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Last Respects"), - #else - .name = MOVE_NAME("LastRespects"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("LastRespects", "Last Respects"), .description = COMPOUND_STRING("This move deals more damage\n" "for each defeated ally."), .effect = EFFECT_PLACEHOLDER, // EFFECT_LAST_RESPECTS @@ -18419,11 +17990,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPICY_EXTRACT] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Spicy Extract"), - #else - .name = MOVE_NAME("SpicyExtract"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SpicyExtract", "Spicy Extract"), .description = COMPOUND_STRING("Sharply ups target's Attack,\n" "harshly lowers its Defense."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SPICY_EXTRACT @@ -18461,11 +18028,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POPULATION_BOMB] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Population Bomb"), - #else - .name = MOVE_NAME("PoplatinBomb"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PoplatinBomb", "Population Bomb"), .description = COMPOUND_STRING("The user's fellows hit one\n" "to ten times in a row."), .effect = EFFECT_POPULATION_BOMB, @@ -18519,11 +18082,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REVIVAL_BLESSING] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Revival Blessing"), - #else - .name = MOVE_NAME("RevivlBlesng"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("RevivlBlesng", "Revival Blessing"), .description = COMPOUND_STRING("Revives a fainted party {PKMN}\n" "and restores half of its HP."), .effect = EFFECT_REVIVAL_BLESSING, @@ -18640,11 +18199,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_KOWTOW_CLEAVE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Kowtow Cleave"), - #else - .name = MOVE_NAME("KowtowCleave"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("KowtowCleave", "Kowtow Cleave"), .description = COMPOUND_STRING("User slashes the foe after\n" "kowtowing. It never misses."), .effect = EFFECT_HIT, @@ -18779,11 +18334,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COLLISION_COURSE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Collision Course"), - #else - .name = MOVE_NAME("ColisinCours"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ColisinCours", "Collision Course"), .description = COMPOUND_STRING("Prehistoric explosion that's\n" "stronger if supereffective."), .effect = EFFECT_COLLISION_COURSE, @@ -18800,11 +18351,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_DRIFT] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Electro Drift"), - #else - .name = MOVE_NAME("ElectroDrift"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ElectroDrift", "Electro Drift"), .description = COMPOUND_STRING("Futuristic electricity. It's\n" "stronger if supereffective."), .effect = EFFECT_COLLISION_COURSE, @@ -18840,11 +18387,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLY_RECEPTION] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Chilly Reception"), - #else - .name = MOVE_NAME("ChilReceptin"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ChilReceptin", "Chilly Reception"), .description = COMPOUND_STRING("Bad joke summons snowstorm.\n" "The user also switches out."), .effect = EFFECT_CHILLY_RECEPTION, @@ -18944,11 +18487,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLING_WATER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Chilling Water"), - #else - .name = MOVE_NAME("ChillingWatr"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("ChillingWatr", "Chilling Water"), .description = COMPOUND_STRING("A shower with ice-cold water\n" "lowers the target's Attack."), .effect = EFFECT_HIT, @@ -19081,11 +18620,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GIGATON_HAMMER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Gigaton Hammer"), - #else - .name = MOVE_NAME("GigatonHammr"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("GigatonHammr", "Gigaton Hammer"), .description = COMPOUND_STRING("Swings a huge hammer. Can't\n" "be used twice in a row."), .effect = EFFECT_HIT, @@ -19136,11 +18671,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZING_TORQUE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Blazing Torque"), - #else - .name = MOVE_NAME("BlazngTorque"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BlazngTorque", "Blazing Torque"), .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 80, @@ -19169,11 +18700,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_TORQUE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Wicked Torque"), - #else - .name = MOVE_NAME("WickedTorque"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("WickedTorque", "Wicked Torque"), .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 80, @@ -19202,11 +18729,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NOXIOUS_TORQUE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Noxious Torque"), - #else - .name = MOVE_NAME("NoxiusTorque"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("NoxiusTorque", "Noxious Torque"), .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 100, @@ -19235,11 +18758,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COMBAT_TORQUE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Combat Torque"), - #else - .name = MOVE_NAME("CombatTorque"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("CombatTorque", "Combat Torque"), .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 100, @@ -19268,11 +18787,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_TORQUE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Magical Torque"), - #else - .name = MOVE_NAME("MagiclTorque"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MagiclTorque", "Magical Torque"), .description = COMPOUND_STRING("---"), .effect = EFFECT_HIT, .power = 100, @@ -19350,11 +18865,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MATCHA_GOTCHA] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Matcha Gotcha"), - #else - .name = MOVE_NAME("MatchaGotcha"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MatchaGotcha", "Matcha Gotcha"), .description = COMPOUND_STRING("Absorbs half the damage\n" "inflicted. May cause a burn."), .effect = EFFECT_ABSORB, @@ -19435,11 +18946,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_STARSTORM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Tera Starstorm"), - #else - .name = MOVE_NAME("TeraStarstrm"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("TeraStarstrm", "Tera Starstorm"), .description = COMPOUND_STRING("Damages all opponents if user is\n" "Stellar form Terapagos."), .effect = EFFECT_PLACEHOLDER, //EFFECT_TERA_STARSTORM @@ -19473,11 +18980,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_BULWARK] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Burning Bulwark"), - #else - .name = MOVE_NAME("BurnngBulwrk"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("BurnngBulwrk", "Burning Bulwark"), .description = COMPOUND_STRING("Evades attack, and burns\n" "the foe if struck."), .effect = EFFECT_PROTECT, @@ -19513,11 +19016,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIGHTY_CLEAVE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Mighty Cleave"), - #else - .name = MOVE_NAME("MightyCleave"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MightyCleave", "Mighty Cleave"), .description = sFeintDescription, .effect = EFFECT_HIT, .power = 95, @@ -19534,11 +19033,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TACHYON_CUTTER] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Tachyon Cutter"), - #else - .name = MOVE_NAME("TachyonCuttr"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("TachyonCuttr", "Tachyon Cutter"), .description = COMPOUND_STRING("Launches particle blades at\n" "the target. Strikes twice."), .effect = EFFECT_HIT, @@ -19586,11 +19081,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ALLURING_VOICE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Alluring Voice"), - #else - .name = MOVE_NAME("AllurngVoice"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("AllurngVoice", "Alluring Voice"), .description = COMPOUND_STRING("Confuses the target if their\n" "stats were boosted this turn."), .effect = EFFECT_HIT, @@ -19629,11 +19120,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERCELL_SLAM] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Supercell Slam"), - #else - .name = MOVE_NAME("SuprcellSlam"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("SuprcellSlam", "Supercell Slam"), .description = COMPOUND_STRING("An electrified slam. If it\n" "misses, the user is hurt."), .effect = EFFECT_RECOIL_IF_MISS, @@ -19649,11 +19136,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_NOISE] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Psychic Noise"), - #else - .name = MOVE_NAME("PsychicNoise"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("PsychicNoise", "Psychic Noise"), .description = COMPOUND_STRING("Unpleasant sound waves that\n" "damage and prevent healing."), .effect = EFFECT_HIT, @@ -19690,11 +19173,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MALIGNANT_CHAIN] = { - #if B_EXPANDED_MOVE_NAMES == TRUE - .name = MOVE_NAME("Malignant Chain"), - #else - .name = MOVE_NAME("MalignntChan"), - #endif + .name = HANDLE_EXPANDED_MOVE_NAME("MalignntChan", "Malignant Chain"), .description = COMPOUND_STRING("A corrosive chain attack\n" "that may badly poison."), .effect = EFFECT_HIT, From b37899d86faccb24adfb2b14d5b883e735a65089 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 27 Jan 2024 10:13:39 -0300 Subject: [PATCH 24/30] Renamed GetBattleMoveName to GetMoveName --- include/pokemon.h | 2 +- src/apprentice.c | 8 ++++---- src/battle_controller_player.c | 4 ++-- src/battle_debug.c | 6 +++--- src/battle_dome.c | 2 +- src/battle_message.c | 8 ++++---- src/battle_tower.c | 2 +- src/battle_z_move.c | 6 +++--- src/contest.c | 12 ++++++------ src/debug.c | 6 +++--- src/easy_chat.c | 2 +- src/field_specials.c | 4 ++-- src/item_menu.c | 2 +- src/item_use.c | 2 +- src/move_relearner.c | 10 +++++----- src/party_menu.c | 26 +++++++++++++------------- src/pokedex_plus_hgss.c | 4 ++-- src/pokemon.c | 2 +- src/pokemon_summary_screen.c | 6 +++--- src/scrcmd.c | 2 +- src/shop.c | 2 +- src/trade.c | 2 +- src/tv.c | 32 ++++++++++++++++---------------- test/test_runner_battle.c | 26 +++++++++++++------------- 24 files changed, 89 insertions(+), 89 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index 123abf9f363a..d1203c55039f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -803,6 +803,6 @@ u16 GetCryIdBySpecies(u16 species); u16 GetSpeciesPreEvolution(u16 species); void HealPokemon(struct Pokemon *mon); void HealBoxPokemon(struct BoxPokemon *boxMon); -const u8 *GetBattleMoveName(u16 moveId); +const u8 *GetMoveName(u16 moveId); #endif // GUARD_POKEMON_H diff --git a/src/apprentice.c b/src/apprentice.c index ddba9c097e17..6a7137606347 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -584,8 +584,8 @@ static void CreateApprenticeMenu(u8 menu) case APPRENTICE_ASK_MOVES: left = 17; top = 8; - strings[0] = GetBattleMoveName(gApprenticeQuestionData->moveId1); - strings[1] = GetBattleMoveName(gApprenticeQuestionData->moveId2); + strings[0] = GetMoveName(gApprenticeQuestionData->moveId1); + strings[1] = GetMoveName(gApprenticeQuestionData->moveId2); break; case APPRENTICE_ASK_GIVE: left = 18; @@ -1041,10 +1041,10 @@ static void ApprenticeBufferString(void) StringCopy(stringDst, GetSpeciesName(gApprenticeQuestionData->speciesId)); break; case APPRENTICE_BUFF_MOVE1: - StringCopy(stringDst, GetBattleMoveName(gApprenticeQuestionData->moveId1)); + StringCopy(stringDst, GetMoveName(gApprenticeQuestionData->moveId1)); break; case APPRENTICE_BUFF_MOVE2: - StringCopy(stringDst, GetBattleMoveName(gApprenticeQuestionData->moveId2)); + StringCopy(stringDst, GetMoveName(gApprenticeQuestionData->moveId2)); break; case APPRENTICE_BUFF_ITEM: StringCopy(stringDst, ItemId_GetName(PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data)); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index ea271e440ed4..b0cc14dc838e 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1694,9 +1694,9 @@ static void MoveSelectionDisplayMoveNames(u32 battler) MoveSelectionDestroyCursorAt(i); if ((gBattleStruct->dynamax.playerSelect && CanDynamax(battler)) || IsDynamaxed(battler)) - StringCopy(gDisplayedStringBattle, GetBattleMoveName(GetMaxMove(battler, moveInfo->moves[i]))); + StringCopy(gDisplayedStringBattle, GetMoveName(GetMaxMove(battler, moveInfo->moves[i]))); else - StringCopy(gDisplayedStringBattle, GetBattleMoveName(moveInfo->moves[i])); + StringCopy(gDisplayedStringBattle, GetMoveName(moveInfo->moves[i])); // Prints on windows B_WIN_MOVE_NAME_1, B_WIN_MOVE_NAME_2, B_WIN_MOVE_NAME_3, B_WIN_MOVE_NAME_4 BattlePutTextOnWindow(gDisplayedStringBattle, i + B_WIN_MOVE_NAME_1); if (moveInfo->moves[i] != MOVE_NONE) diff --git a/src/battle_debug.c b/src/battle_debug.c index 7b681e0c8b40..b01ff6bd5e85 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -739,7 +739,7 @@ static void PutMovesPointsText(struct BattleDebugMenu *data) for (i = 0; i < MAX_MON_MOVES; i++) { text[0] = CHAR_SPACE; - StringCopy(text + 1, GetBattleMoveName(gBattleMons[data->aiBattlerId].moves[i])); + StringCopy(text + 1, GetMoveName(gBattleMons[data->aiBattlerId].moves[i])); AddTextPrinterParameterized(data->aiMovesWindowId, FONT_NORMAL, text, 0, i * 15, 0, NULL); for (count = 0, j = 0; j < MAX_BATTLERS_COUNT; j++) { @@ -907,7 +907,7 @@ static void PutAiPartyText(struct BattleDebugMenu *data) for (j = 0; j < MAX_MON_MOVES; j++) { - txtPtr = StringCopyN(text, GetBattleMoveName(aiMons[i].moves[j]), 8); + txtPtr = StringCopyN(text, GetMoveName(aiMons[i].moves[j]), 8); *txtPtr = EOS; AddTextPrinterParameterized5(data->aiMovesWindowId, FONT_SMALL_NARROW, text, i * 41, 35 + j * 15, 0, NULL, 0, 0); } @@ -1428,7 +1428,7 @@ static void PrintSecondaryEntries(struct BattleDebugMenu *data) case LIST_ITEM_PP: for (i = 0; i < 4; i++) { - PadString(GetBattleMoveName(gBattleMons[data->battlerId].moves[i]), text); + PadString(GetMoveName(gBattleMons[data->battlerId].moves[i]), text); printer.currentY = printer.y = (i * yMultiplier) + sSecondaryListTemplate.upText_Y; AddTextPrinter(&printer, 0, NULL); } diff --git a/src/battle_dome.c b/src/battle_dome.c index a5cbb320da0f..23d844a30f30 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -4655,7 +4655,7 @@ static int BufferDomeWinString(u8 matchNum, u8 *tournamentIds) if (DOME_TRAINERS[tournamentId].eliminatedAt == sCompetitorRangeByMatch[matchNum][2]) { // Set initial winStringId offset - StringCopy(gStringVar2, GetBattleMoveName(gSaveBlock2Ptr->frontier.domeWinningMoves[tournamentId])); + StringCopy(gStringVar2, GetMoveName(gSaveBlock2Ptr->frontier.domeWinningMoves[tournamentId])); winStringId = DOME_TRAINERS[tournamentId].forfeited * 2; // (DOME_TEXT_WON_USING_MOVE - 1) or (DOME_TEXT_WON_ON_FORFEIT - 1) if (gSaveBlock2Ptr->frontier.domeWinningMoves[tournamentId] == MOVE_NONE && DOME_TRAINERS[tournamentId].forfeited == FALSE) diff --git a/src/battle_message.c b/src/battle_message.c index 4715e44fca2a..ac48b83012a5 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2936,7 +2936,7 @@ void BufferStringBattle(u16 stringID, u32 battler) && !IsMaxMove(gBattleMsgDataPtr->currentMove)) StringCopy(gBattleTextBuff3, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else - StringCopy(gBattleTextBuff3, GetBattleMoveName(gBattleMsgDataPtr->currentMove)); + StringCopy(gBattleTextBuff3, GetMoveName(gBattleMsgDataPtr->currentMove)); stringPtr = sText_AttackerUsedX; break; case STRINGID_BATTLEEND: // battle end @@ -3366,7 +3366,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) && !IsMaxMove(gBattleMsgDataPtr->currentMove)) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else - toCpy = GetBattleMoveName(gBattleMsgDataPtr->currentMove); + toCpy = GetMoveName(gBattleMsgDataPtr->currentMove); break; case B_TXT_LAST_MOVE: // originally used move name if (gBattleMsgDataPtr->originallyUsedMove >= MOVES_COUNT @@ -3374,7 +3374,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) && !IsMaxMove(gBattleMsgDataPtr->currentMove)) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else - toCpy = GetBattleMoveName(gBattleMsgDataPtr->originallyUsedMove); + toCpy = GetMoveName(gBattleMsgDataPtr->originallyUsedMove); break; case B_TXT_LAST_ITEM: // last used item if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) @@ -3752,7 +3752,7 @@ void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) srcID += src[srcID + 1] + 3; break; case B_BUFF_MOVE: // move name - StringAppend(dst, GetBattleMoveName(T1_READ_16(&src[srcID + 1]))); + StringAppend(dst, GetMoveName(T1_READ_16(&src[srcID + 1]))); srcID += 3; break; case B_BUFF_TYPE: // type name diff --git a/src/battle_tower.c b/src/battle_tower.c index a3916dba3331..40696e2a66fb 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -2436,7 +2436,7 @@ static void GetPotentialPartnerMoveAndSpecies(u16 trainerId, u16 monId) } } - StringCopy(gStringVar1, GetBattleMoveName(move)); + StringCopy(gStringVar1, GetMoveName(move)); StringCopy(gStringVar2, GetSpeciesName(species)); } diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 8b5b9a2811b7..50ba075ea117 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -486,19 +486,19 @@ bool32 MoveSelectionDisplayZMove(u16 zmove, u32 battler) BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3); gDisplayedStringBattle[0] = CHAR_Z; gDisplayedStringBattle[1] = CHAR_HYPHEN; - StringCopy(gDisplayedStringBattle + 2, GetBattleMoveName(move)); + StringCopy(gDisplayedStringBattle + 2, GetMoveName(move)); } else if (zmove == MOVE_EXTREME_EVOBOOST) { // Damaging move -> status z move StringCopy(gDisplayedStringBattle, sText_StatsPlus2); BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3); - StringCopy(gDisplayedStringBattle, GetBattleMoveName(zmove)); + StringCopy(gDisplayedStringBattle, GetMoveName(zmove)); } else { ZMoveSelectionDisplayPower(move, zmove); - StringCopy(gDisplayedStringBattle, GetBattleMoveName(zmove)); + StringCopy(gDisplayedStringBattle, GetMoveName(zmove)); } BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_1); diff --git a/src/contest.c b/src/contest.c index b4312231076a..61f69e185667 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1542,7 +1542,7 @@ static void Task_ShowMoveSelectScreen(u8 taskId) // Gray the text because it's a repeated move moveNameBuffer = StringCopy(moveName, gText_ColorBlue); } - moveNameBuffer = StringCopy(moveNameBuffer, GetBattleMoveName(move)); + moveNameBuffer = StringCopy(moveNameBuffer, GetMoveName(move)); FillWindowPixelBuffer(i + MOVE_WINDOWS_START, PIXEL_FILL(0)); Contest_PrintTextToBg0WindowAt(i + MOVE_WINDOWS_START, moveName, 5, 1, FONT_NARROW); @@ -1810,7 +1810,7 @@ static void Task_DoAppeals(u8 taskId) ContestClearGeneralTextWindow(); StringCopy(gStringVar1, gContestMons[contestant].nickname); if (eContestantStatus[contestant].currMove < MOVES_COUNT) - StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); + StringCopy(gStringVar2, GetMoveName(eContestantStatus[contestant].currMove)); else StringCopy(gStringVar2, sInvalidContestMoveNames[eContestantStatus[contestant].moveCategory]); StringExpandPlaceholders(gStringVar4, gText_MonAppealedWithMove); @@ -2204,7 +2204,7 @@ static void Task_DoAppeals(u8 taskId) if (eContestantStatus[contestant].overrideCategoryExcitementMod) { r3 = 1; - StringCopy(gStringVar3, GetBattleMoveName(eContestantStatus[contestant].currMove)); + StringCopy(gStringVar3, GetMoveName(eContestantStatus[contestant].currMove)); } else { @@ -2339,7 +2339,7 @@ static void Task_DoAppeals(u8 taskId) ContestClearGeneralTextWindow(); StringCopy(gStringVar3, gContestMons[eContestExcitement.freezer].nickname); StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); + StringCopy(gStringVar2, GetMoveName(eContestantStatus[contestant].currMove)); StringExpandPlaceholders(gStringVar4, gText_CrowdContinuesToWatchMon); Contest_StartTextPrinter(gStringVar4, TRUE); gTasks[taskId].tState = APPEALSTATE_PRINT_MON_MOVE_IGNORED_MSG; @@ -2365,7 +2365,7 @@ static void Task_DoAppeals(u8 taskId) eContestantStatus[contestant].hasJudgesAttention = FALSE; StartStopFlashJudgeAttentionEye(contestant); StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); + StringCopy(gStringVar2, GetMoveName(eContestantStatus[contestant].currMove)); StringExpandPlaceholders(gStringVar4, gText_MonWasTooNervousToMove); Contest_StartTextPrinter(gStringVar4, TRUE); gTasks[taskId].tState = APPEALSTATE_WAIT_TOO_NERVOUS_MSG; @@ -4558,7 +4558,7 @@ void SetStartledString(u8 contestant, u8 jam) static void PrintAppealMoveResultText(u8 contestant, u8 stringId) { StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringCopy(gStringVar2, GetBattleMoveName(eContestantStatus[contestant].currMove)); + StringCopy(gStringVar2, GetMoveName(eContestantStatus[contestant].currMove)); if (gMovesInfo[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_COOL) StringCopy(gStringVar3, gText_Contest_Shyness); else if (gMovesInfo[eContestantStatus[eContestAppealResults.contestant].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) diff --git a/src/debug.c b/src/debug.c index 42df8a9ffb5b..70792fd569e5 100644 --- a/src/debug.c +++ b/src/debug.c @@ -3750,7 +3750,7 @@ static void DebugAction_Give_Pokemon_SelectEVs(u8 taskId) else { StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); - StringCopy(gStringVar1, GetBattleMoveName(gTasks[taskId].tInput)); + StringCopy(gStringVar1, GetMoveName(gTasks[taskId].tInput)); StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); StringExpandPlaceholders(gStringVar4, sDebugText_PokemonMove_0); @@ -3798,7 +3798,7 @@ static void DebugAction_Give_Pokemon_Move(u8 taskId) } StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); - StringCopy(gStringVar1, GetBattleMoveName(gTasks[taskId].tInput)); + StringCopy(gStringVar1, GetMoveName(gTasks[taskId].tInput)); StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); switch (gTasks[taskId].tIterator) @@ -3850,7 +3850,7 @@ static void DebugAction_Give_Pokemon_Move(u8 taskId) gTasks[taskId].tDigit = 0; StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); - StringCopy(gStringVar1, GetBattleMoveName(gTasks[taskId].tInput)); + StringCopy(gStringVar1, GetMoveName(gTasks[taskId].tInput)); StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); switch (gTasks[taskId].tIterator) diff --git a/src/easy_chat.c b/src/easy_chat.c index e08044f159eb..dbdd80be6385 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -5209,7 +5209,7 @@ static const u8 *GetEasyChatWord(u8 groupId, u16 index) return GetSpeciesName(index); case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_2: - return GetBattleMoveName(index); + return GetMoveName(index); default: return gEasyChatGroups[groupId].wordData.words[index].text; } diff --git a/src/field_specials.c b/src/field_specials.c index 7627923d8e5e..718a2d26b80c 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1648,7 +1648,7 @@ bool8 BufferTMHMMoveName(void) { if (gSpecialVar_0x8004 >= ITEM_TM01 && gSpecialVar_0x8004 <= ITEM_HM08) { - StringCopy(gStringVar2, GetBattleMoveName(ItemIdToBattleMoveId(gSpecialVar_0x8004))); + StringCopy(gStringVar2, GetMoveName(ItemIdToBattleMoveId(gSpecialVar_0x8004))); return TRUE; } @@ -3069,7 +3069,7 @@ static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused) void BufferBattleFrontierTutorMoveName(void) { - StringCopy(gStringVar1, GetBattleMoveName(gSpecialVar_0x8005)); + StringCopy(gStringVar1, GetMoveName(gSpecialVar_0x8005)); } static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection) diff --git a/src/item_menu.c b/src/item_menu.c index 35e8cadb7db6..569712cfe625 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -908,7 +908,7 @@ static void GetItemName(u8 *dest, u16 itemId) switch (gBagPosition.pocket) { case TMHM_POCKET: - StringCopy(gStringVar2, GetBattleMoveName(ItemIdToBattleMoveId(itemId))); + StringCopy(gStringVar2, GetMoveName(ItemIdToBattleMoveId(itemId))); if (itemId >= ITEM_HM01) { // Get HM number diff --git a/src/item_use.c b/src/item_use.c index ab95c18e5a63..f9badda639a2 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -876,7 +876,7 @@ static void Task_ShowTMHMContainedMessage(u8 taskId) { if (JOY_NEW(A_BUTTON | B_BUTTON)) { - StringCopy(gStringVar1, GetBattleMoveName(ItemIdToBattleMoveId(gSpecialVar_ItemId))); + StringCopy(gStringVar1, GetMoveName(ItemIdToBattleMoveId(gSpecialVar_ItemId))); StringExpandPlaceholders(gStringVar4, gText_TMHMContainedVar1); DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, UseTMHMYesNo); } diff --git a/src/move_relearner.c b/src/move_relearner.c index c049f6b6325c..e27b46fdf7ca 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -600,7 +600,7 @@ static void DoMoveRelearnerMain(void) } break; case MENU_STATE_PRINT_STOP_TEACHING: - StringCopy(gStringVar2, GetBattleMoveName(GetCurrentSelectedMove())); + StringCopy(gStringVar2, GetMoveName(GetCurrentSelectedMove())); PrintMessageWithPlaceholders(gText_MoveRelearnerStopTryingToTeachMove); sMoveRelearnerStruct->state++; break; @@ -707,10 +707,10 @@ static void DoMoveRelearnerMain(void) { u16 moveId = GetMonData(&gPlayerParty[sMoveRelearnerStruct->partyMon], MON_DATA_MOVE1 + sMoveRelearnerStruct->moveSlot); - StringCopy(gStringVar3, GetBattleMoveName(moveId)); + StringCopy(gStringVar3, GetMoveName(moveId)); RemoveMonPPBonus(&gPlayerParty[sMoveRelearnerStruct->partyMon], sMoveRelearnerStruct->moveSlot); SetMonMoveSlot(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove(), sMoveRelearnerStruct->moveSlot); - StringCopy(gStringVar2, GetBattleMoveName(GetCurrentSelectedMove())); + StringCopy(gStringVar2, GetMoveName(GetCurrentSelectedMove())); PrintMessageWithPlaceholders(gText_MoveRelearnerAndPoof); sMoveRelearnerStruct->state = MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE; gSpecialVar_0x8004 = TRUE; @@ -815,7 +815,7 @@ static void HandleInput(bool8 showContest) PlaySE(SE_SELECT); RemoveScrollArrows(); sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEACH_MOVE_PROMPT; - StringCopy(gStringVar2, GetBattleMoveName(itemId)); + StringCopy(gStringVar2, GetMoveName(itemId)); StringExpandPlaceholders(gStringVar4, gText_MoveRelearnerTeachMoveConfirm); MoveRelearnerPrintMessage(gStringVar4); break; @@ -904,7 +904,7 @@ static void CreateLearnableMovesList(void) for (i = 0; i < sMoveRelearnerStruct->numMenuChoices; i++) { - sMoveRelearnerStruct->menuItems[i].name = GetBattleMoveName(sMoveRelearnerStruct->movesToLearn[i]); + sMoveRelearnerStruct->menuItems[i].name = GetMoveName(sMoveRelearnerStruct->movesToLearn[i]); sMoveRelearnerStruct->menuItems[i].id = sMoveRelearnerStruct->movesToLearn[i]; } diff --git a/src/party_menu.c b/src/party_menu.c index 891c993b3864..4f143bfab510 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -5110,7 +5110,7 @@ static void ShowMoveSelectWindow(u8 slot) for (i = 0; i < MAX_MON_MOVES; i++) { move = GetMonData(&gPlayerParty[slot], MON_DATA_MOVE1 + i); - AddTextPrinterParameterized(windowId, fontId, GetBattleMoveName(move), 8, (i * 16) + 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, fontId, GetMoveName(move), 8, (i * 16) + 1, TEXT_SKIP_DRAW, NULL); if (move != MOVE_NONE) moveCount++; } @@ -5216,7 +5216,7 @@ static void TryUseItemOnMove(u8 taskId) PlaySE(SE_USE_ITEM); RemoveBagItem(item, 1); move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot); - StringCopy(gStringVar1, GetBattleMoveName(move)); + StringCopy(gStringVar1, GetMoveName(move)); GetMedicineItemEffectMessage(item, 0); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5290,7 +5290,7 @@ void ItemUseCB_TMHM(u8 taskId, TaskFunc task) mon = &gPlayerParty[gPartyMenu.slotId]; GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(move)); + StringCopy(gStringVar2, GetMoveName(move)); switch (CanTeachMove(mon, move)) { @@ -5326,7 +5326,7 @@ static void Task_LearnedMove(u8 taskId) RemoveBagItem(item, 1); } GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(move[0])); + StringCopy(gStringVar2, GetMoveName(move[0])); StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5424,7 +5424,7 @@ static void DisplayPartyMenuForgotMoveMessage(u8 taskId) u16 move = GetMonData(mon, MON_DATA_MOVE1 + GetMoveSlotToReplace()); GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(move)); + StringCopy(gStringVar2, GetMoveName(move)); DisplayLearnMoveMessage(gText_12PoofForgotMove); gTasks[taskId].func = Task_PartyMenuReplaceMove; } @@ -5446,7 +5446,7 @@ static void Task_PartyMenuReplaceMove(u8 taskId) static void StopLearningMovePrompt(u8 taskId) { - StringCopy(gStringVar2, GetBattleMoveName(gPartyMenu.data1)); + StringCopy(gStringVar2, GetMoveName(gPartyMenu.data1)); StringExpandPlaceholders(gStringVar4, gText_StopLearningMove2); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5470,7 +5470,7 @@ static void Task_HandleStopLearningMoveYesNoInput(u8 taskId) { case 0: GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(gPartyMenu.data1)); + StringCopy(gStringVar2, GetMoveName(gPartyMenu.data1)); StringExpandPlaceholders(gStringVar4, gText_MoveNotLearned); DisplayPartyMenuMessage(gStringVar4, TRUE); if (gPartyMenu.learnMoveState == 1) @@ -5489,7 +5489,7 @@ static void Task_HandleStopLearningMoveYesNoInput(u8 taskId) // fallthrough case 1: GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(gPartyMenu.data1)); + StringCopy(gStringVar2, GetMoveName(gPartyMenu.data1)); DisplayLearnMoveMessage(gText_PkmnNeedsToReplaceMove); gTasks[taskId].func = Task_ReplaceMoveYesNo; break; @@ -5751,7 +5751,7 @@ static void PartyMenuTryEvolution(u8 taskId) static void DisplayMonNeedsToReplaceMove(u8 taskId) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(gMoveToLearn)); + StringCopy(gStringVar2, GetMoveName(gMoveToLearn)); StringExpandPlaceholders(gStringVar4, gText_PkmnNeedsToReplaceMove); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -5762,7 +5762,7 @@ static void DisplayMonNeedsToReplaceMove(u8 taskId) static void DisplayMonLearnedMove(u8 taskId, u16 move) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(move)); + StringCopy(gStringVar2, GetMoveName(move)); StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); @@ -6000,7 +6000,7 @@ void FormChangeTeachMove(u8 taskId, u32 move, u32 slot) PlaySE(SE_SELECT); mon = &gPlayerParty[slot]; GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(move)); + StringCopy(gStringVar2, GetMoveName(move)); if (GiveMoveToMon(mon, move) != MON_HAS_MAX_MOVES) { @@ -6633,7 +6633,7 @@ static void TryTutorSelectedMon(u8 taskId) move = &gPartyMenu.data1; GetMonNickname(mon, gStringVar1); gPartyMenu.data1 = gSpecialVar_0x8005; - StringCopy(gStringVar2, GetBattleMoveName(gPartyMenu.data1)); + StringCopy(gStringVar2, GetMoveName(gPartyMenu.data1)); move[1] = 2; switch (CanTeachMove(mon, gPartyMenu.data1)) { @@ -7669,7 +7669,7 @@ void BufferMoveDeleterNicknameAndMove(void) u16 move = GetMonData(mon, MON_DATA_MOVE1 + gSpecialVar_0x8005); GetMonNickname(mon, gStringVar1); - StringCopy(gStringVar2, GetBattleMoveName(move)); + StringCopy(gStringVar2, GetMoveName(move)); } void MoveDeleterForgetMove(void) diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 115e8629ca8c..2002060653e7 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -5340,7 +5340,7 @@ static void PrintStatsScreen_Moves_Top(u8 taskId) PrintStatsScreenTextSmallWhite(WIN_STATS_MOVES_TOP, gStringVar1, moves_x-1, moves_y+1); //Move name - StringCopy(gStringVar3, GetBattleMoveName(move)); + StringCopy(gStringVar3, GetMoveName(move)); StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 20); PrintStatsScreenTextSmall(WIN_STATS_MOVES_TOP, gStringVar3, moves_x, moves_y + 17); @@ -6688,7 +6688,7 @@ static u8 PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 depth, StringExpandPlaceholders(gStringVar4, sText_EVO_ITEM_HOLD_NIGHT ); break; case EVO_MOVE: - StringCopy(gStringVar2, GetBattleMoveName(evolutions[i].param)); + StringCopy(gStringVar2, GetMoveName(evolutions[i].param)); StringExpandPlaceholders(gStringVar4, sText_EVO_MOVE ); break; case EVO_FRIENDSHIP_MOVE_TYPE: diff --git a/src/pokemon.c b/src/pokemon.c index 560325677eaa..3f0aaf634c13 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6465,7 +6465,7 @@ u16 GetSpeciesPreEvolution(u16 species) return SPECIES_NONE; } -const u8 *GetBattleMoveName(u16 moveId) +const u8 *GetMoveName(u16 moveId) { if (IsZMove(moveId) || IsMaxMove(moveId)) return gMovesInfo[moveId].name.longMoveName; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 868f1a7660a5..ca84d5b390c7 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3640,7 +3640,7 @@ static void PrintMoveNameAndPP(u8 moveIndex) if (move != 0) { pp = CalculatePPWithBonus(move, summary->ppBonuses, moveIndex); - PrintTextOnWindow(moveNameWindowId, GetBattleMoveName(move), 0, moveIndex * 16 + 1, 0, 1); + PrintTextOnWindow(moveNameWindowId, GetMoveName(move), 0, moveIndex * 16 + 1, 0, 1); ConvertIntToDecimalStringN(gStringVar1, summary->pp[moveIndex], STR_CONV_MODE_RIGHT_ALIGN, 2); ConvertIntToDecimalStringN(gStringVar2, pp, STR_CONV_MODE_RIGHT_ALIGN, 2); DynamicPlaceholderTextUtil_Reset(); @@ -3808,9 +3808,9 @@ static void PrintNewMoveDetailsOrCancelText(void) u16 move = sMonSummaryScreen->newMove; if (sMonSummaryScreen->currPageIndex == PSS_PAGE_BATTLE_MOVES) - PrintTextOnWindow(windowId1, GetBattleMoveName(move), 0, 65, 0, 6); + PrintTextOnWindow(windowId1, GetMoveName(move), 0, 65, 0, 6); else - PrintTextOnWindow(windowId1, GetBattleMoveName(move), 0, 65, 0, 5); + PrintTextOnWindow(windowId1, GetMoveName(move), 0, 65, 0, 5); ConvertIntToDecimalStringN(gStringVar1, gMovesInfo[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 2); DynamicPlaceholderTextUtil_Reset(); diff --git a/src/scrcmd.c b/src/scrcmd.c index 0328ea945094..9ffabb6f8fa8 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1708,7 +1708,7 @@ bool8 ScrCmd_buffermovename(struct ScriptContext *ctx) u8 stringVarIndex = ScriptReadByte(ctx); u16 moveId = VarGet(ScriptReadHalfword(ctx)); - StringCopy(sScriptStringVars[stringVarIndex], GetBattleMoveName(moveId)); + StringCopy(sScriptStringVars[stringVarIndex], GetMoveName(moveId)); return FALSE; } diff --git a/src/shop.c b/src/shop.c index 1df635a3ac22..b1557068b816 100644 --- a/src/shop.c +++ b/src/shop.c @@ -1013,7 +1013,7 @@ static void Task_BuyMenu(u8 taskId) } else if (ItemId_GetPocket(itemId) == POCKET_TM_HM) { - StringCopy(gStringVar2, GetBattleMoveName(ItemIdToBattleMoveId(itemId))); + StringCopy(gStringVar2, GetMoveName(ItemIdToBattleMoveId(itemId))); BuyMenuDisplayMessage(taskId, gText_Var1CertainlyHowMany2, Task_BuyHowManyDialogueInit); } else diff --git a/src/trade.c b/src/trade.c index b72e2b890809..d3345cb06e93 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1974,7 +1974,7 @@ static void BufferMovesString(u8 *str, u8 whichParty, u8 partyIdx) for (i = 0; i < MAX_MON_MOVES; i++) { if (moves[i] != MOVE_NONE) - StringAppend(str, GetBattleMoveName(moves[i])); + StringAppend(str, GetMoveName(moves[i])); StringAppend(str, sText_NewLine); } diff --git a/src/tv.c b/src/tv.c index 4bcf50bc9478..bd4b613cfea0 100644 --- a/src/tv.c +++ b/src/tv.c @@ -4319,7 +4319,7 @@ static void DoTVShowBravoTrainerPokemonProfile(void) break; case 6: StringCopy(gStringVar1, GetSpeciesName(show->bravoTrainer.species)); - StringCopy(gStringVar2, GetBattleMoveName(show->bravoTrainer.move)); + StringCopy(gStringVar2, GetMoveName(show->bravoTrainer.move)); CopyEasyChatWord(gStringVar3, show->bravoTrainer.words[1]); sTVShowState = 7; break; @@ -5149,7 +5149,7 @@ static void DoTVShowPokemonContestLiveUpdates(void) break; case CONTESTLIVE_STATE_USED_MOVE: StringCopy(gStringVar2, GetSpeciesName(show->contestLiveUpdates.winningSpecies)); - StringCopy(gStringVar3, GetBattleMoveName(show->contestLiveUpdates.move)); + StringCopy(gStringVar3, GetMoveName(show->contestLiveUpdates.move)); sTVShowState = CONTESTLIVE_STATE_TALK_ABOUT_LOSER; break; case CONTESTLIVE_STATE_TALK_ABOUT_LOSER: @@ -5256,7 +5256,7 @@ static void DoTVShowPokemonBattleUpdate(void) case 2: TVShowConvertInternationalString(gStringVar1, show->battleUpdate.playerName, show->battleUpdate.language); StringCopy(gStringVar2, GetSpeciesName(show->battleUpdate.speciesPlayer)); - StringCopy(gStringVar3, GetBattleMoveName(show->battleUpdate.move)); + StringCopy(gStringVar3, GetMoveName(show->battleUpdate.move)); sTVShowState = 3; break; case 3: @@ -5277,7 +5277,7 @@ static void DoTVShowPokemonBattleUpdate(void) case 6: TVShowConvertInternationalString(gStringVar1, show->battleUpdate.playerName, show->battleUpdate.language); StringCopy(gStringVar2, GetSpeciesName(show->battleUpdate.speciesPlayer)); - StringCopy(gStringVar3, GetBattleMoveName(show->battleUpdate.move)); + StringCopy(gStringVar3, GetMoveName(show->battleUpdate.move)); sTVShowState = 7; break; case 7: @@ -5418,7 +5418,7 @@ void DoTVShowInSearchOfTrainers(void) break; case 3: StringCopy(gStringVar1, GetSpeciesName(gSaveBlock1Ptr->gabbyAndTyData.mon1)); - StringCopy(gStringVar2, GetBattleMoveName(gSaveBlock1Ptr->gabbyAndTyData.lastMove)); + StringCopy(gStringVar2, GetMoveName(gSaveBlock1Ptr->gabbyAndTyData.lastMove)); StringCopy(gStringVar3, GetSpeciesName(gSaveBlock1Ptr->gabbyAndTyData.mon2)); sTVShowState = 8; break; @@ -5848,7 +5848,7 @@ static void DoTVShowBreakingNewsTV(void) } break; case 7: - StringCopy(gStringVar1, GetBattleMoveName(show->breakingNews.lastUsedMove)); + StringCopy(gStringVar1, GetMoveName(show->breakingNews.lastUsedMove)); StringCopy(gStringVar2, GetSpeciesName(show->breakingNews.poke1Species)); sTVShowState = 8; break; @@ -5948,7 +5948,7 @@ static void DoTVShowSecretBaseVisit(void) case 12: TVShowConvertInternationalString(gStringVar1, show->secretBaseVisit.playerName, show->secretBaseVisit.language); StringCopy(gStringVar2, GetSpeciesName(show->secretBaseVisit.species)); - StringCopy(gStringVar3, GetBattleMoveName(show->secretBaseVisit.move)); + StringCopy(gStringVar3, GetMoveName(show->secretBaseVisit.move)); sTVShowState = 13; break; case 13: @@ -5999,7 +5999,7 @@ static void DoTVShowThePokemonBattleSeminar(void) case 1: TVShowConvertInternationalString(gStringVar1, show->battleSeminar.playerName, show->battleSeminar.language); StringCopy(gStringVar2, GetSpeciesName(show->battleSeminar.foeSpecies)); - StringCopy(gStringVar3, GetBattleMoveName(show->battleSeminar.move)); + StringCopy(gStringVar3, GetMoveName(show->battleSeminar.move)); sTVShowState = 2; break; case 2: @@ -6021,23 +6021,23 @@ static void DoTVShowThePokemonBattleSeminar(void) } break; case 3: - StringCopy(gStringVar1, GetBattleMoveName(show->battleSeminar.otherMoves[0])); - StringCopy(gStringVar2, GetBattleMoveName(show->battleSeminar.otherMoves[1])); - StringCopy(gStringVar3, GetBattleMoveName(show->battleSeminar.otherMoves[2])); + StringCopy(gStringVar1, GetMoveName(show->battleSeminar.otherMoves[0])); + StringCopy(gStringVar2, GetMoveName(show->battleSeminar.otherMoves[1])); + StringCopy(gStringVar3, GetMoveName(show->battleSeminar.otherMoves[2])); sTVShowState = 6; break; case 4: - StringCopy(gStringVar1, GetBattleMoveName(show->battleSeminar.otherMoves[0])); - StringCopy(gStringVar2, GetBattleMoveName(show->battleSeminar.otherMoves[1])); + StringCopy(gStringVar1, GetMoveName(show->battleSeminar.otherMoves[0])); + StringCopy(gStringVar2, GetMoveName(show->battleSeminar.otherMoves[1])); sTVShowState = 6; break; case 5: - StringCopy(gStringVar2, GetBattleMoveName(show->battleSeminar.otherMoves[0])); + StringCopy(gStringVar2, GetMoveName(show->battleSeminar.otherMoves[0])); sTVShowState = 6; break; case 6: - StringCopy(gStringVar1, GetBattleMoveName(show->battleSeminar.betterMove)); - StringCopy(gStringVar2, GetBattleMoveName(show->battleSeminar.move)); + StringCopy(gStringVar1, GetMoveName(show->battleSeminar.betterMove)); + StringCopy(gStringVar2, GetMoveName(show->battleSeminar.move)); TVShowDone(); break; } diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c index ccd9180a4a79..3adebd78ab4b 100644 --- a/test/test_runner_battle.c +++ b/test/test_runner_battle.c @@ -845,16 +845,16 @@ void TestRunner_Battle_CheckChosenMove(u32 battlerId, u32 moveId, u32 target) u32 moveSlot = GetMoveSlot(gBattleMons[battlerId].moves, moveId); PrintAiMoveLog(battlerId, moveSlot, moveId, gBattleStruct->aiFinalScore[battlerId][expectedAction->target][moveSlot]); if (countExpected > 1) - Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched EXPECT_MOVES %S, got %S", filename, expectedAction->sourceLine, GetBattleMoveName(expectedMoveId), GetBattleMoveName(moveId)); + Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched EXPECT_MOVES %S, got %S", filename, expectedAction->sourceLine, GetMoveName(expectedMoveId), GetMoveName(moveId)); else - Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched EXPECT_MOVE %S, got %S", filename, expectedAction->sourceLine, GetBattleMoveName(expectedMoveId), GetBattleMoveName(moveId)); + Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched EXPECT_MOVE %S, got %S", filename, expectedAction->sourceLine, GetMoveName(expectedMoveId), GetMoveName(moveId)); } if (expectedAction->notMove && !movePasses) { if (countExpected > 1) - Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched NOT_EXPECT_MOVES %S", filename, expectedAction->sourceLine, GetBattleMoveName(expectedMoveId)); + Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched NOT_EXPECT_MOVES %S", filename, expectedAction->sourceLine, GetMoveName(expectedMoveId)); else - Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched NOT_EXPECT_MOVE %S", filename, expectedAction->sourceLine, GetBattleMoveName(expectedMoveId)); + Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched NOT_EXPECT_MOVE %S", filename, expectedAction->sourceLine, GetMoveName(expectedMoveId)); } } // Turn passed, clear logs from the turn @@ -935,7 +935,7 @@ static void CheckIfMaxScoreEqualExpectMove(u32 battlerId, s32 target, struct Exp && !(aiAction->moveSlots & gBitTable[bestScoreId])) { Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: EXPECT_MOVE %S has the same best score(%d) as not expected MOVE %S", filename, - aiAction->sourceLine, GetBattleMoveName(moves[i]), scores[i], GetBattleMoveName(moves[bestScoreId])); + aiAction->sourceLine, GetMoveName(moves[i]), scores[i], GetMoveName(moves[bestScoreId])); } // We DO NOT expect move 'i', but it has the same best score as another move. if (scores[i] == scores[bestScoreId] @@ -944,7 +944,7 @@ static void CheckIfMaxScoreEqualExpectMove(u32 battlerId, s32 target, struct Exp && !(aiAction->moveSlots & gBitTable[bestScoreId])) { Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: NOT_EXPECT_MOVE %S has the same best score(%d) as MOVE %S", filename, - aiAction->sourceLine, GetBattleMoveName(moves[i]), scores[i], GetBattleMoveName(moves[bestScoreId])); + aiAction->sourceLine, GetMoveName(moves[i]), scores[i], GetMoveName(moves[bestScoreId])); } } } @@ -957,7 +957,7 @@ static void PrintAiMoveLog(u32 battlerId, u32 moveSlot, u32 moveId, s32 totalSco if (DATA.aiLogPrintedForMove[battlerId] & gBitTable[moveSlot]) return; DATA.aiLogPrintedForMove[battlerId] |= gBitTable[moveSlot]; - MgbaPrintf_("Score Log for move %S:\n", GetBattleMoveName(moveId)); + MgbaPrintf_("Score Log for move %S:\n", GetMoveName(moveId)); for (i = 0; i < MAX_AI_LOG_LINES; i++) { struct AILogLine *log = &DATA.aiLogLines[battlerId][moveSlot][i]; @@ -1025,7 +1025,7 @@ void TestRunner_Battle_CheckAiMoveScores(u32 battlerId) if (!CheckComparision(scores[scoreCtx->moveSlot1], scoreCtx->value, scoreCtx->cmp)) { Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched SCORE_%s_VAL %S %d, got %d", - filename, scoreCtx->sourceLine, sCmpToStringTable[scoreCtx->cmp], GetBattleMoveName(moveId1), scoreCtx->value, scores[scoreCtx->moveSlot1]); + filename, scoreCtx->sourceLine, sCmpToStringTable[scoreCtx->cmp], GetMoveName(moveId1), scoreCtx->value, scores[scoreCtx->moveSlot1]); } } else @@ -1036,7 +1036,7 @@ void TestRunner_Battle_CheckAiMoveScores(u32 battlerId) if (!CheckComparision(scores[scoreCtx->moveSlot1], scores[scoreCtx->moveSlot2], scoreCtx->cmp)) { Test_ExitWithResult(TEST_RESULT_FAIL, "%s:%d: Unmatched SCORE_%s, got %S: %d, %S: %d", - filename, scoreCtx->sourceLine, sCmpToStringTable[scoreCtx->cmp], GetBattleMoveName(moveId1), scores[scoreCtx->moveSlot1], GetBattleMoveName(moveId2), scores[scoreCtx->moveSlot2]); + filename, scoreCtx->sourceLine, sCmpToStringTable[scoreCtx->cmp], GetMoveName(moveId1), scores[scoreCtx->moveSlot1], GetMoveName(moveId2), scores[scoreCtx->moveSlot2]); } } } @@ -2003,7 +2003,7 @@ s32 MoveGetTarget(s32 battlerId, u32 moveId, struct MoveContext *ctx, u32 source // In AI Doubles not specified target allows any target for EXPECT_MOVE. if (GetBattleTest()->type != BATTLE_TEST_AI_DOUBLES) { - INVALID_IF(STATE->battlersCount > 2, "%S requires explicit target", GetBattleMoveName(moveId)); + INVALID_IF(STATE->battlersCount > 2, "%S requires explicit target", GetMoveName(moveId)); } target = BATTLE_OPPOSITE(battlerId); @@ -2021,7 +2021,7 @@ s32 MoveGetTarget(s32 battlerId, u32 moveId, struct MoveContext *ctx, u32 source // In AI Doubles not specified target allows any target for EXPECT_MOVE. if (GetBattleTest()->type != BATTLE_TEST_AI_DOUBLES) { - INVALID("%S requires explicit target", GetBattleMoveName(moveId)); + INVALID("%S requires explicit target", GetMoveName(moveId)); } } } @@ -2046,7 +2046,7 @@ void MoveGetIdAndSlot(s32 battlerId, struct MoveContext *ctx, u32 *moveId, u32 * } else if (*moveId == MOVE_NONE) { - INVALID_IF(DATA.explicitMoves[battlerId & BIT_SIDE] & (1 << DATA.currentMonIndexes[battlerId]), "Missing explicit %S", GetBattleMoveName(ctx->move)); + INVALID_IF(DATA.explicitMoves[battlerId & BIT_SIDE] & (1 << DATA.currentMonIndexes[battlerId]), "Missing explicit %S", GetMoveName(ctx->move)); SetMonData(mon, MON_DATA_MOVE1 + i, &ctx->move); SetMonData(DATA.currentMon, MON_DATA_PP1 + i, &gMovesInfo[ctx->move].pp); *moveSlot = i; @@ -2209,7 +2209,7 @@ s32 GetAiMoveTargetForScoreCompare(u32 battlerId, u32 moveId, struct MoveContext else { // TODO: Fix ai targeting self in double battles. - INVALID_IF(!ctx->explicitTarget, "%S requires explicit target for score comparison in doubles", GetBattleMoveName(moveId)); + INVALID_IF(!ctx->explicitTarget, "%S requires explicit target for score comparison in doubles", GetMoveName(moveId)); target = MoveGetTarget(battlerId, moveId, ctx, sourceLine); } return target; From 1b0df2cd3f41ecf150d5e4512d420561b60bd0e9 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 27 Jan 2024 22:02:30 -0300 Subject: [PATCH 25/30] Added a comment pointing out that the shared move descriptions are shared move descriptions --- src/data/battle_moves.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index ccc3cf88eaea..dd088583b4de 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -25,6 +25,8 @@ #define BINDING_TURNS "2 to 5" #endif +// Shared Move Description entries + const u8 gNotDoneYetDescription[] = _( "This move can't be used. Its\n" "effect is in development."); From 2589f0df5ed9db9566c2b8f7be45898a16a218f7 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 27 Jan 2024 22:03:48 -0300 Subject: [PATCH 26/30] Re-aligned one of the escape characters of CHECK_MOVE_FLAG --- src/battle_ai_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index d79a180c182f..4995999bb51e 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -27,7 +27,7 @@ u16 *moves = GetMovesArray(battler); \ for (i = 0; i < MAX_MON_MOVES; i++) \ { \ - if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gMovesInfo[moves[i]].flag) \ + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gMovesInfo[moves[i]].flag) \ return TRUE; \ } \ return FALSE From 0566ffdd7edb7d0ad1f1ef538f1bbb8cd82099f2 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 27 Jan 2024 22:53:49 -0300 Subject: [PATCH 27/30] Renamed the battle_moves.h file to moves_info.h instead for consistency's sake --- src/data/{battle_moves.h => moves_info.h} | 0 src/pokemon.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/data/{battle_moves.h => moves_info.h} (100%) diff --git a/src/data/battle_moves.h b/src/data/moves_info.h similarity index 100% rename from src/data/battle_moves.h rename to src/data/moves_info.h diff --git a/src/pokemon.c b/src/pokemon.c index 3f0aaf634c13..d5ab45c60343 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -83,7 +83,7 @@ EWRAM_DATA struct SpriteTemplate gMultiuseSpriteTemplate = {0}; EWRAM_DATA static struct MonSpritesGfxManager *sMonSpritesGfxManagers[MON_SPR_GFX_MANAGERS_COUNT] = {NULL}; EWRAM_DATA static u8 sTriedEvolving = 0; -#include "data/battle_moves.h" +#include "data/moves_info.h" #include "data/abilities.h" // Used in an unreferenced function in RS. From 8b149a8945911bc99cf5d05e6a6ea46a015abfaa Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sun, 28 Jan 2024 23:30:11 -0300 Subject: [PATCH 28/30] Applied Eduardo's adjustments * Using compound string for regular move names as well, saving 1180 bytes and making their use consistent * Move description formatting --- include/pokemon.h | 5 +- src/data/moves_info.h | 5659 +++++++++++++++++++++++------------------ src/data/party_menu.h | 16 +- src/party_menu.c | 18 +- src/pokemon.c | 5 +- 5 files changed, 3245 insertions(+), 2458 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index d1203c55039f..aeed6bacf9e0 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -446,10 +446,7 @@ struct SpeciesInfo /*0x8C*/ struct MoveInfo { - union { - u8 moveName[MOVE_NAME_LENGTH + 1]; - const u8 *longMoveName; - } name; + const u8 *name; const u8 *description; u16 effect; u8 power; diff --git a/src/data/moves_info.h b/src/data/moves_info.h index dd088583b4de..5282694f55cf 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -9,14 +9,11 @@ // The Gen. 4+ contest data comes from urpg's contest movedex. -#define MOVE_NAME(nameOfMove) { .moveName = _(nameOfMove) } -#define LONG_MOVE_NAME(longNameOfMove) { .longMoveName = COMPOUND_STRING(longNameOfMove) } - #define FIRST(a, ...) a #if B_EXPANDED_MOVE_NAMES == TRUE -#define HANDLE_EXPANDED_MOVE_NAME(_name, ...) MOVE_NAME(FIRST(__VA_OPT__(__VA_ARGS__, ) _name)) +#define HANDLE_EXPANDED_MOVE_NAME(_name, ...) COMPOUND_STRING(FIRST(__VA_OPT__(__VA_ARGS__, ) _name)) #else -#define HANDLE_EXPANDED_MOVE_NAME(_name, ...) MOVE_NAME(_name) +#define HANDLE_EXPANDED_MOVE_NAME(_name, ...) COMPOUND_STRING(_name) #endif #if B_BINDING_TURNS >= GEN_5 @@ -117,7 +114,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { - .name = MOVE_NAME("-"), + .name = COMPOUND_STRING("-"), .description = COMPOUND_STRING(""), .effect = EFFECT_HIT, .power = 0, @@ -134,9 +131,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POUND] = { - .name = MOVE_NAME("Pound"), - .description = COMPOUND_STRING("Pounds the foe with\n" - "forelegs or tail."), + .name = COMPOUND_STRING("Pound"), + .description = COMPOUND_STRING( + "Pounds the foe with\n" + "forelegs or tail."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -155,9 +153,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_KARATE_CHOP] = { - .name = MOVE_NAME("Karate Chop"), - .description = COMPOUND_STRING("A chopping attack with a\n" - "high critical-hit ratio."), + .name = COMPOUND_STRING("Karate Chop"), + .description = COMPOUND_STRING( + "A chopping attack with a\n" + "high critical-hit ratio."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_FIGHTING, @@ -176,9 +175,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SLAP] = { - .name = MOVE_NAME("Double Slap"), - .description = COMPOUND_STRING("Repeatedly slaps the foe\n" - "2 to 5 times."), + .name = COMPOUND_STRING("Double Slap"), + .description = COMPOUND_STRING( + "Repeatedly slaps the foe\n" + "2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -196,9 +196,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COMET_PUNCH] = { - .name = MOVE_NAME("Comet Punch"), - .description = COMPOUND_STRING("Repeatedly punches the foe\n" - "2 to 5 times."), + .name = COMPOUND_STRING("Comet Punch"), + .description = COMPOUND_STRING( + "Repeatedly punches the foe\n" + "2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -217,9 +218,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_PUNCH] = { - .name = MOVE_NAME("Mega Punch"), - .description = COMPOUND_STRING("A strong punch thrown with\n" - "incredible power."), + .name = COMPOUND_STRING("Mega Punch"), + .description = COMPOUND_STRING( + "A strong punch thrown with\n" + "incredible power."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -238,9 +240,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PAY_DAY] = { - .name = MOVE_NAME("Pay Day"), - .description = COMPOUND_STRING("Throws coins at the foe.\n" - "Money is recovered after."), + .name = COMPOUND_STRING("Pay Day"), + .description = COMPOUND_STRING( + "Throws coins at the foe.\n" + "Money is recovered after."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -260,9 +263,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PUNCH] = { - .name = MOVE_NAME("Fire Punch"), - .description = COMPOUND_STRING("A fiery punch that may burn\n" - "the foe."), + .name = COMPOUND_STRING("Fire Punch"), + .description = COMPOUND_STRING( + "A fiery punch that may burn\n" + "the foe."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_FIRE, @@ -286,13 +290,14 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_PUNCH] = { - .name = MOVE_NAME("Ice Punch"), - .description = COMPOUND_STRING("An icy punch that may\n" - #if B_USE_FROSTBITE == TRUE - "leave the foe with frostbite."), - #else - "freeze the foe."), - #endif + .name = COMPOUND_STRING("Ice Punch"), + .description = COMPOUND_STRING( + "An icy punch that may\n" + #if B_USE_FROSTBITE == TRUE + "leave the foe with frostbite."), + #else + "freeze the foe."), + #endif .effect = EFFECT_HIT, .power = 75, .type = TYPE_ICE, @@ -317,8 +322,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_PUNCH] = { .name = HANDLE_EXPANDED_MOVE_NAME("ThunderPunch", "Thunder Punch"), - .description = COMPOUND_STRING("An electrified punch that\n" - "may paralyze the foe."), + .description = COMPOUND_STRING( + "An electrified punch that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_ELECTRIC, @@ -342,9 +348,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SCRATCH] = { - .name = MOVE_NAME("Scratch"), - .description = COMPOUND_STRING("Scratches the foe with\n" - "sharp claws."), + .name = COMPOUND_STRING("Scratch"), + .description = COMPOUND_STRING( + "Scratches the foe with\n" + "sharp claws."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -362,9 +369,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VISE_GRIP] = { - .name = MOVE_NAME("Vise Grip"), - .description = COMPOUND_STRING("Grips the foe with large and\n" - "powerful pincers."), + .name = COMPOUND_STRING("Vise Grip"), + .description = COMPOUND_STRING( + "Grips the foe with large and\n" + "powerful pincers."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_NORMAL, @@ -382,9 +390,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GUILLOTINE] = { - .name = MOVE_NAME("Guillotine"), - .description = COMPOUND_STRING("A powerful pincer attack\n" - "that may cause fainting."), + .name = COMPOUND_STRING("Guillotine"), + .description = COMPOUND_STRING( + "A powerful pincer attack\n" + "that may cause fainting."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -402,9 +411,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_WIND] = { - .name = MOVE_NAME("Razor Wind"), - .description = COMPOUND_STRING("A 2-turn move that strikes\n" - "the foe on the 2nd turn."), + .name = COMPOUND_STRING("Razor Wind"), + .description = COMPOUND_STRING( + "A 2-turn move that strikes\n" + "the foe on the 2nd turn."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -426,9 +436,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SWORDS_DANCE] = { - .name = MOVE_NAME("Swords Dance"), - .description = COMPOUND_STRING("A fighting dance that\n" - "sharply raises Attack."), + .name = COMPOUND_STRING("Swords Dance"), + .description = COMPOUND_STRING( + "A fighting dance that\n" + "sharply raises Attack."), .effect = EFFECT_ATTACK_UP_2, .power = 0, .type = TYPE_NORMAL, @@ -448,9 +459,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CUT] = { - .name = MOVE_NAME("Cut"), - .description = COMPOUND_STRING("Cuts the foe with sharp\n" - "scythes, claws, etc."), + .name = COMPOUND_STRING("Cut"), + .description = COMPOUND_STRING( + "Cuts the foe with sharp\n" + "scythes, claws, etc."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_NORMAL, @@ -469,9 +481,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GUST] = { - .name = MOVE_NAME("Gust"), - .description = COMPOUND_STRING("Strikes the foe with a gust\n" - "of wind whipped up by wings."), + .name = COMPOUND_STRING("Gust"), + .description = COMPOUND_STRING( + "Strikes the foe with a gust\n" + "of wind whipped up by wings."), .effect = EFFECT_GUST, .power = 40, .type = TYPE_FLYING, @@ -491,9 +504,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WING_ATTACK] = { - .name = MOVE_NAME("Wing Attack"), - .description = COMPOUND_STRING("Strikes the foe with wings\n" - "spread wide."), + .name = COMPOUND_STRING("Wing Attack"), + .description = COMPOUND_STRING( + "Strikes the foe with wings\n" + "spread wide."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -511,9 +525,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLWIND] = { - .name = MOVE_NAME("Whirlwind"), - .description = COMPOUND_STRING("Blows away the foe with\n" - "wind and ends the battle."), + .name = COMPOUND_STRING("Whirlwind"), + .description = COMPOUND_STRING( + "Blows away the foe with\n" + "wind and ends the battle."), .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -537,9 +552,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLY] = { - .name = MOVE_NAME("Fly"), - .description = COMPOUND_STRING("Flies up on the first turn,\n" - "then strikes the next turn."), + .name = COMPOUND_STRING("Fly"), + .description = COMPOUND_STRING( + "Flies up on the first turn,\n" + "then strikes the next turn."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 90 : 70, .type = TYPE_FLYING, @@ -562,9 +578,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BIND] = { - .name = MOVE_NAME("Bind"), - .description = COMPOUND_STRING("Binds and squeezes the foe\n" - "for "BINDING_TURNS" turns."), + .name = COMPOUND_STRING("Bind"), + .description = COMPOUND_STRING( + "Binds and squeezes the foe\n" + "for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = 15, .type = TYPE_NORMAL, @@ -586,9 +603,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SLAM] = { - .name = MOVE_NAME("Slam"), - .description = COMPOUND_STRING("Slams the foe with a long\n" - "tail, vine, etc."), + .name = COMPOUND_STRING("Slam"), + .description = COMPOUND_STRING( + "Slams the foe with a long\n" + "tail, vine, etc."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -607,9 +625,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VINE_WHIP] = { - .name = MOVE_NAME("Vine Whip"), - .description = COMPOUND_STRING("Strikes the foe with\n" - "slender, whiplike vines."), + .name = COMPOUND_STRING("Vine Whip"), + .description = COMPOUND_STRING( + "Strikes the foe with\n" + "slender, whiplike vines."), #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 25, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -633,9 +652,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STOMP] = { - .name = MOVE_NAME("Stomp"), - .description = COMPOUND_STRING("Stomps the enemy with a big\n" - "foot. May cause flinching."), + .name = COMPOUND_STRING("Stomp"), + .description = COMPOUND_STRING( + "Stomps the enemy with a big\n" + "foot. May cause flinching."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_NORMAL, @@ -660,9 +680,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_KICK] = { - .name = MOVE_NAME("Double Kick"), - .description = COMPOUND_STRING("A double-kicking attack\n" - "that strikes the foe twice."), + .name = COMPOUND_STRING("Double Kick"), + .description = COMPOUND_STRING( + "A double-kicking attack\n" + "that strikes the foe twice."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_FIGHTING, @@ -681,9 +702,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_KICK] = { - .name = MOVE_NAME("Mega Kick"), - .description = COMPOUND_STRING("An extremely powerful kick\n" - "with intense force."), + .name = COMPOUND_STRING("Mega Kick"), + .description = COMPOUND_STRING( + "An extremely powerful kick\n" + "with intense force."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -701,9 +723,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_JUMP_KICK] = { - .name = MOVE_NAME("Jump Kick"), - .description = COMPOUND_STRING("A strong jumping kick. May\n" - "miss and hurt the kicker."), + .name = COMPOUND_STRING("Jump Kick"), + .description = COMPOUND_STRING( + "A strong jumping kick. May\n" + "miss and hurt the kicker."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 100, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -728,9 +751,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLING_KICK] = { - .name = MOVE_NAME("Rolling Kick"), - .description = COMPOUND_STRING("A fast kick delivered from\n" - "a rapid spin."), + .name = COMPOUND_STRING("Rolling Kick"), + .description = COMPOUND_STRING( + "A fast kick delivered from\n" + "a rapid spin."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -754,9 +778,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_ATTACK] = { - .name = MOVE_NAME("Sand Attack"), - .description = COMPOUND_STRING("Reduces the foe's accuracy\n" - "by hurling sand in its face."), + .name = COMPOUND_STRING("Sand Attack"), + .description = COMPOUND_STRING( + "Reduces the foe's accuracy\n" + "by hurling sand in its face."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_GROUND, @@ -775,9 +800,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEADBUTT] = { - .name = MOVE_NAME("Headbutt"), - .description = COMPOUND_STRING("A ramming attack that may\n" - "cause flinching."), + .name = COMPOUND_STRING("Headbutt"), + .description = COMPOUND_STRING( + "A ramming attack that may\n" + "cause flinching."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -800,9 +826,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_ATTACK] = { - .name = MOVE_NAME("Horn Attack"), - .description = COMPOUND_STRING("Jabs the foe with sharp\n" - "horns."), + .name = COMPOUND_STRING("Horn Attack"), + .description = COMPOUND_STRING( + "Jabs the foe with sharp\n" + "horns."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_NORMAL, @@ -820,9 +847,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_ATTACK] = { - .name = MOVE_NAME("Fury Attack"), - .description = COMPOUND_STRING("Jabs the foe 2 to 5 times\n" - "with sharp horns, etc."), + .name = COMPOUND_STRING("Fury Attack"), + .description = COMPOUND_STRING( + "Jabs the foe 2 to 5 times\n" + "with sharp horns, etc."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -840,9 +868,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_DRILL] = { - .name = MOVE_NAME("Horn Drill"), - .description = COMPOUND_STRING("A one-hit KO attack that\n" - "uses a horn like a drill."), + .name = COMPOUND_STRING("Horn Drill"), + .description = COMPOUND_STRING( + "A one-hit KO attack that\n" + "uses a horn like a drill."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -860,9 +889,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TACKLE] = { - .name = MOVE_NAME("Tackle"), - .description = COMPOUND_STRING("Charges the foe with a full-\n" - "body tackle."), + .name = COMPOUND_STRING("Tackle"), + .description = COMPOUND_STRING( + "Charges the foe with a full-\n" + "body tackle."), #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 40, #elif B_UPDATED_MOVE_DATA >= GEN_5 @@ -886,9 +916,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_SLAM] = { - .name = MOVE_NAME("Body Slam"), - .description = COMPOUND_STRING("A full-body slam that may\n" - "cause paralysis."), + .name = COMPOUND_STRING("Body Slam"), + .description = COMPOUND_STRING( + "A full-body slam that may\n" + "cause paralysis."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_NORMAL, @@ -913,9 +944,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WRAP] = { - .name = MOVE_NAME("Wrap"), - .description = COMPOUND_STRING("Wraps and squeezes the foe\n" - BINDING_TURNS" times with vines, etc."), + .name = COMPOUND_STRING("Wrap"), + .description = COMPOUND_STRING( + "Wraps and squeezes the foe\n" + BINDING_TURNS" times with vines, etc."), .effect = EFFECT_HIT, .power = 15, .type = TYPE_NORMAL, @@ -936,9 +968,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_DOWN] = { - .name = MOVE_NAME("Take Down"), - .description = COMPOUND_STRING("A reckless charge attack\n" - "that also hurts the user."), + .name = COMPOUND_STRING("Take Down"), + .description = COMPOUND_STRING( + "A reckless charge attack\n" + "that also hurts the user."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -957,9 +990,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THRASH] = { - .name = MOVE_NAME("Thrash"), - .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" - "that confuses the user."), + .name = COMPOUND_STRING("Thrash"), + .description = COMPOUND_STRING( + "A rampage of 2 to 3 turns\n" + "that confuses the user."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 120 : 90, .type = TYPE_NORMAL, @@ -982,9 +1016,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_EDGE] = { - .name = MOVE_NAME("Double-Edge"), - .description = COMPOUND_STRING("A life-risking tackle that\n" - "also hurts the user."), + .name = COMPOUND_STRING("Double-Edge"), + .description = COMPOUND_STRING( + "A life-risking tackle that\n" + "also hurts the user."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -1003,9 +1038,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_WHIP] = { - .name = MOVE_NAME("Tail Whip"), - .description = COMPOUND_STRING("Wags the tail to lower the\n" - "foe's Defense."), + .name = COMPOUND_STRING("Tail Whip"), + .description = COMPOUND_STRING( + "Wags the tail to lower the\n" + "foe's Defense."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -1024,9 +1060,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_STING] = { - .name = MOVE_NAME("Poison Sting"), - .description = COMPOUND_STRING("A toxic attack with barbs,\n" - "etc., that may poison."), + .name = COMPOUND_STRING("Poison Sting"), + .description = COMPOUND_STRING( + "A toxic attack with barbs,\n" + "etc., that may poison."), .effect = EFFECT_HIT, .power = 15, .type = TYPE_POISON, @@ -1048,9 +1085,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TWINEEDLE] = { - .name = MOVE_NAME("Twineedle"), - .description = COMPOUND_STRING("Stingers on the forelegs\n" - "jab the foe twice."), + .name = COMPOUND_STRING("Twineedle"), + .description = COMPOUND_STRING( + "Stingers on the forelegs\n" + "jab the foe twice."), .effect = EFFECT_HIT, .power = 25, .type = TYPE_BUG, @@ -1074,9 +1112,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PIN_MISSILE] = { - .name = MOVE_NAME("Pin Missile"), - .description = COMPOUND_STRING("Sharp pins are fired to\n" - "strike 2 to 5 times."), + .name = COMPOUND_STRING("Pin Missile"), + .description = COMPOUND_STRING( + "Sharp pins are fired to\n" + "strike 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 25 : 14, .type = TYPE_BUG, @@ -1093,9 +1132,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LEER] = { - .name = MOVE_NAME("Leer"), - .description = COMPOUND_STRING("Frightens the foe with a\n" - "leer to lower Defense."), + .name = COMPOUND_STRING("Leer"), + .description = COMPOUND_STRING( + "Frightens the foe with a\n" + "leer to lower Defense."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -1114,9 +1154,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BITE] = { - .name = MOVE_NAME("Bite"), - .description = COMPOUND_STRING("Bites with vicious fangs.\n" - "May cause flinching."), + .name = COMPOUND_STRING("Bite"), + .description = COMPOUND_STRING( + "Bites with vicious fangs.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DARK, @@ -1140,9 +1181,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GROWL] = { - .name = MOVE_NAME("Growl"), - .description = COMPOUND_STRING("Growls cutely to reduce the\n" - "foe's Attack."), + .name = COMPOUND_STRING("Growl"), + .description = COMPOUND_STRING( + "Growls cutely to reduce the\n" + "foe's Attack."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -1163,9 +1205,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR] = { - .name = MOVE_NAME("Roar"), - .description = COMPOUND_STRING("Makes the foe flee to end\n" - "the battle."), + .name = COMPOUND_STRING("Roar"), + .description = COMPOUND_STRING( + "Makes the foe flee to end\n" + "the battle."), .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -1189,9 +1232,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SING] = { - .name = MOVE_NAME("Sing"), - .description = COMPOUND_STRING("A soothing song lulls the\n" - "foe into a deep slumber."), + .name = COMPOUND_STRING("Sing"), + .description = COMPOUND_STRING( + "A soothing song lulls the\n" + "foe into a deep slumber."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -1212,9 +1256,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERSONIC] = { - .name = MOVE_NAME("Supersonic"), - .description = COMPOUND_STRING("Emits bizarre sound waves\n" - "that may confuse the foe."), + .name = COMPOUND_STRING("Supersonic"), + .description = COMPOUND_STRING( + "Emits bizarre sound waves\n" + "that may confuse the foe."), .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_NORMAL, @@ -1235,9 +1280,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SONIC_BOOM] = { - .name = MOVE_NAME("Sonic Boom"), - .description = COMPOUND_STRING("Launches shock waves that\n" - "always inflict 20 HP damage."), + .name = COMPOUND_STRING("Sonic Boom"), + .description = COMPOUND_STRING( + "Launches shock waves that\n" + "always inflict 20 HP damage."), .effect = EFFECT_FIXED_DAMAGE_ARG, .power = 1, .type = TYPE_NORMAL, @@ -1255,9 +1301,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DISABLE] = { - .name = MOVE_NAME("Disable"), - .description = COMPOUND_STRING("Psychically disables one of\n" - "the foe's moves."), + .name = COMPOUND_STRING("Disable"), + .description = COMPOUND_STRING( + "Psychically disables one of\n" + "the foe's moves."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -1283,13 +1330,14 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ACID] = { - .name = MOVE_NAME("Acid"), - .description = COMPOUND_STRING("Sprays a hide-melting acid.\n" - #if B_UPDATED_MOVE_DATA >= GEN_4 - "May lower Sp. Def."), - #else - "May lower Defense."), - #endif + .name = COMPOUND_STRING("Acid"), + .description = COMPOUND_STRING( + "Sprays a hide-melting acid.\n" + #if B_UPDATED_MOVE_DATA >= GEN_4 + "May lower Sp. Def."), + #else + "May lower Defense."), + #endif .effect = EFFECT_HIT, .power = 40, .type = TYPE_POISON, @@ -1311,9 +1359,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EMBER] = { - .name = MOVE_NAME("Ember"), - .description = COMPOUND_STRING("A weak fire attack that may\n" - "inflict a burn."), + .name = COMPOUND_STRING("Ember"), + .description = COMPOUND_STRING( + "A weak fire attack that may\n" + "inflict a burn."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIRE, @@ -1335,9 +1384,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLAMETHROWER] = { - .name = MOVE_NAME("Flamethrower"), - .description = COMPOUND_STRING("A powerful fire attack that\n" - "may inflict a burn."), + .name = COMPOUND_STRING("Flamethrower"), + .description = COMPOUND_STRING( + "A powerful fire attack that\n" + "may inflict a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_FIRE, @@ -1359,9 +1409,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIST] = { - .name = MOVE_NAME("Mist"), - .description = COMPOUND_STRING("Creates a mist that stops\n" - "reduction of abilities."), + .name = COMPOUND_STRING("Mist"), + .description = COMPOUND_STRING( + "Creates a mist that stops\n" + "reduction of abilities."), .effect = EFFECT_MIST, .power = 0, .type = TYPE_ICE, @@ -1382,9 +1433,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_GUN] = { - .name = MOVE_NAME("Water Gun"), - .description = COMPOUND_STRING("Squirts water to attack\n" - "the foe."), + .name = COMPOUND_STRING("Water Gun"), + .description = COMPOUND_STRING( + "Squirts water to attack\n" + "the foe."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -1401,9 +1453,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_PUMP] = { - .name = MOVE_NAME("Hydro Pump"), - .description = COMPOUND_STRING("Blasts water at high power\n" - "to strike the foe."), + .name = COMPOUND_STRING("Hydro Pump"), + .description = COMPOUND_STRING( + "Blasts water at high power\n" + "to strike the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_WATER, @@ -1420,9 +1473,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SURF] = { - .name = MOVE_NAME("Surf"), - .description = COMPOUND_STRING("Creates a huge wave, then\n" - "crashes it down on the foe."), + .name = COMPOUND_STRING("Surf"), + .description = COMPOUND_STRING( + "Creates a huge wave, then\n" + "crashes it down on the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_WATER, @@ -1441,13 +1495,14 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BEAM] = { - .name = MOVE_NAME("Ice Beam"), - .description = COMPOUND_STRING("Blasts the foe with an icy\n" - #if B_USE_FROSTBITE == TRUE - "beam. May cause frostbite."), - #else - "beam that may freeze it."), - #endif + .name = COMPOUND_STRING("Ice Beam"), + .description = COMPOUND_STRING( + "Blasts the foe with an icy\n" + #if B_USE_FROSTBITE == TRUE + "beam. May cause frostbite."), + #else + "beam that may freeze it."), + #endif .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_ICE, @@ -1471,13 +1526,14 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLIZZARD] = { - .name = MOVE_NAME("Blizzard"), - .description = COMPOUND_STRING("Hits the foe with an icy\n" - #if B_USE_FROSTBITE == TRUE - "storm. May cause frostbite."), - #else - "storm that may freeze it."), - #endif + .name = COMPOUND_STRING("Blizzard"), + .description = COMPOUND_STRING( + "Hits the foe with an icy\n" + #if B_USE_FROSTBITE == TRUE + "storm. May cause frostbite."), + #else + "storm that may freeze it."), + #endif .effect = B_BLIZZARD_HAIL >= GEN_4 ? EFFECT_BLIZZARD : EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_ICE, @@ -1500,9 +1556,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBEAM] = { - .name = MOVE_NAME("Psybeam"), - .description = COMPOUND_STRING("Fires a peculiar ray that\n" - "may confuse the foe."), + .name = COMPOUND_STRING("Psybeam"), + .description = COMPOUND_STRING( + "Fires a peculiar ray that\n" + "may confuse the foe."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_PSYCHIC, @@ -1524,9 +1581,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE_BEAM] = { - .name = MOVE_NAME("Bubble Beam"), - .description = COMPOUND_STRING("Forcefully sprays bubbles\n" - "that may lower Speed."), + .name = COMPOUND_STRING("Bubble Beam"), + .description = COMPOUND_STRING( + "Forcefully sprays bubbles\n" + "that may lower Speed."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_WATER, @@ -1548,9 +1606,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_BEAM] = { - .name = MOVE_NAME("Aurora Beam"), - .description = COMPOUND_STRING("Fires a rainbow-colored\n" - "beam that may lower Attack."), + .name = COMPOUND_STRING("Aurora Beam"), + .description = COMPOUND_STRING( + "Fires a rainbow-colored\n" + "beam that may lower Attack."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ICE, @@ -1572,7 +1631,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_BEAM] = { - .name = MOVE_NAME("Hyper Beam"), + .name = COMPOUND_STRING("Hyper Beam"), .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, @@ -1595,9 +1654,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PECK] = { - .name = MOVE_NAME("Peck"), - .description = COMPOUND_STRING("Attacks the foe with a\n" - "jabbing beak, etc."), + .name = COMPOUND_STRING("Peck"), + .description = COMPOUND_STRING( + "Attacks the foe with a\n" + "jabbing beak, etc."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_FLYING, @@ -1615,9 +1675,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_PECK] = { - .name = MOVE_NAME("Drill Peck"), - .description = COMPOUND_STRING("A corkscrewing attack with\n" - "the beak acting as a drill."), + .name = COMPOUND_STRING("Drill Peck"), + .description = COMPOUND_STRING( + "A corkscrewing attack with\n" + "the beak acting as a drill."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FLYING, @@ -1635,9 +1696,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUBMISSION] = { - .name = MOVE_NAME("Submission"), - .description = COMPOUND_STRING("A reckless body slam that\n" - "also hurts the user."), + .name = COMPOUND_STRING("Submission"), + .description = COMPOUND_STRING( + "A reckless body slam that\n" + "also hurts the user."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIGHTING, @@ -1656,9 +1718,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_KICK] = { - .name = MOVE_NAME("Low Kick"), - .description = COMPOUND_STRING("A kick that inflicts more\n" - "damage on heavier foes."), + .name = COMPOUND_STRING("Low Kick"), + .description = COMPOUND_STRING( + "A kick that inflicts more\n" + "damage on heavier foes."), .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_FIGHTING, @@ -1676,9 +1739,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COUNTER] = { - .name = MOVE_NAME("Counter"), - .description = COMPOUND_STRING("Retaliates any physical hit\n" - "with double the power."), + .name = COMPOUND_STRING("Counter"), + .description = COMPOUND_STRING( + "Retaliates any physical hit\n" + "with double the power."), .effect = EFFECT_COUNTER, .power = 1, .type = TYPE_FIGHTING, @@ -1701,9 +1765,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SEISMIC_TOSS] = { - .name = MOVE_NAME("Seismic Toss"), - .description = COMPOUND_STRING("Inflicts damage identical\n" - "to the user's level."), + .name = COMPOUND_STRING("Seismic Toss"), + .description = COMPOUND_STRING( + "Inflicts damage identical\n" + "to the user's level."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_FIGHTING, @@ -1722,9 +1787,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH] = { - .name = MOVE_NAME("Strength"), - .description = COMPOUND_STRING("Builds enormous power,\n" - "then slams the foe."), + .name = COMPOUND_STRING("Strength"), + .description = COMPOUND_STRING( + "Builds enormous power,\n" + "then slams the foe."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -1742,9 +1808,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ABSORB] = { - .name = MOVE_NAME("Absorb"), - .description = COMPOUND_STRING("An attack that absorbs\n" - "half the damage inflicted."), + .name = COMPOUND_STRING("Absorb"), + .description = COMPOUND_STRING( + "An attack that absorbs\n" + "half the damage inflicted."), .effect = EFFECT_ABSORB, .power = 20, .type = TYPE_GRASS, @@ -1763,7 +1830,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MEGA_DRAIN] = { - .name = MOVE_NAME("Mega Drain"), + .name = COMPOUND_STRING("Mega Drain"), .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = 40, @@ -1783,9 +1850,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_SEED] = { - .name = MOVE_NAME("Leech Seed"), - .description = COMPOUND_STRING("Plants a seed on the foe to\n" - "steal HP on every turn."), + .name = COMPOUND_STRING("Leech Seed"), + .description = COMPOUND_STRING( + "Plants a seed on the foe to\n" + "steal HP on every turn."), .effect = EFFECT_LEECH_SEED, .power = 0, .type = TYPE_GRASS, @@ -1804,9 +1872,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GROWTH] = { - .name = MOVE_NAME("Growth"), - .description = COMPOUND_STRING("Forces the body to grow\n" - "and heightens Sp. Atk."), + .name = COMPOUND_STRING("Growth"), + .description = COMPOUND_STRING( + "Forces the body to grow\n" + "and heightens Sp. Atk."), .effect = B_GROWTH_STAT_RAISE >= GEN_5 ? EFFECT_GROWTH : EFFECT_SPECIAL_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -1827,9 +1896,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_LEAF] = { - .name = MOVE_NAME("Razor Leaf"), - .description = COMPOUND_STRING("Cuts the enemy with leaves.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Razor Leaf"), + .description = COMPOUND_STRING( + "Cuts the enemy with leaves.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_GRASS, @@ -1848,9 +1918,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BEAM] = { - .name = MOVE_NAME("Solar Beam"), - .description = COMPOUND_STRING("Absorbs light in one turn,\n" - "then attacks next turn."), + .name = COMPOUND_STRING("Solar Beam"), + .description = COMPOUND_STRING( + "Absorbs light in one turn,\n" + "then attacks next turn."), .effect = EFFECT_SOLAR_BEAM, .power = 120, .type = TYPE_GRASS, @@ -1871,8 +1942,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_POWDER] = { .name = HANDLE_EXPANDED_MOVE_NAME("PoisonPowder", "Poison Powder"), - .description = COMPOUND_STRING("Scatters a toxic powder\n" - "that may poison the foe."), + .description = COMPOUND_STRING( + "Scatters a toxic powder\n" + "that may poison the foe."), .effect = EFFECT_POISON, .power = 0, .type = TYPE_POISON, @@ -1892,9 +1964,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STUN_SPORE] = { - .name = MOVE_NAME("Stun Spore"), - .description = COMPOUND_STRING("Scatters a powder that may\n" - "paralyze the foe."), + .name = COMPOUND_STRING("Stun Spore"), + .description = COMPOUND_STRING( + "Scatters a powder that may\n" + "paralyze the foe."), .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_GRASS, @@ -1914,9 +1987,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_POWDER] = { - .name = MOVE_NAME("Sleep Powder"), - .description = COMPOUND_STRING("Scatters a powder that may\n" - "cause the foe to sleep."), + .name = COMPOUND_STRING("Sleep Powder"), + .description = COMPOUND_STRING( + "Scatters a powder that may\n" + "cause the foe to sleep."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -1936,9 +2010,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_DANCE] = { - .name = MOVE_NAME("Petal Dance"), - .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" - "that confuses the user."), + .name = COMPOUND_STRING("Petal Dance"), + .description = COMPOUND_STRING( + "A rampage of 2 to 3 turns\n" + "that confuses the user."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -1968,9 +2043,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STRING_SHOT] = { - .name = MOVE_NAME("String Shot"), - .description = COMPOUND_STRING("Binds the foe with string\n" - "to reduce its Speed."), + .name = COMPOUND_STRING("String Shot"), + .description = COMPOUND_STRING( + "Binds the foe with string\n" + "to reduce its Speed."), .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_SPEED_DOWN_2 : EFFECT_SPEED_DOWN, .power = 0, .type = TYPE_BUG, @@ -1989,9 +2065,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RAGE] = { - .name = MOVE_NAME("Dragon Rage"), - .description = COMPOUND_STRING("Launches shock waves that\n" - "always inflict 40 HP damage."), + .name = COMPOUND_STRING("Dragon Rage"), + .description = COMPOUND_STRING( + "Launches shock waves that\n" + "always inflict 40 HP damage."), .effect = EFFECT_FIXED_DAMAGE_ARG, .power = 1, .type = TYPE_DRAGON, @@ -2010,9 +2087,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_SPIN] = { - .name = MOVE_NAME("Fire Spin"), - .description = COMPOUND_STRING("Traps the foe in a ring of\n" - "fire for "BINDING_TURNS" turns."), + .name = COMPOUND_STRING("Fire Spin"), + .description = COMPOUND_STRING( + "Traps the foe in a ring of\n" + "fire for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_FIRE, @@ -2034,8 +2112,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_SHOCK] = { .name = HANDLE_EXPANDED_MOVE_NAME("ThunderShock", "Thunder Shock"), - .description = COMPOUND_STRING("An electrical attack that\n" - "may paralyze the foe."), + .description = COMPOUND_STRING( + "An electrical attack that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ELECTRIC, @@ -2057,9 +2136,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERBOLT] = { - .name = MOVE_NAME("Thunderbolt"), - .description = COMPOUND_STRING("A strong electrical attack\n" - "that may paralyze the foe."), + .name = COMPOUND_STRING("Thunderbolt"), + .description = COMPOUND_STRING( + "A strong electrical attack\n" + "that may paralyze the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_ELECTRIC, @@ -2081,9 +2161,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_WAVE] = { - .name = MOVE_NAME("Thunder Wave"), - .description = COMPOUND_STRING("A weak jolt of electricity\n" - "that paralyzes the foe."), + .name = COMPOUND_STRING("Thunder Wave"), + .description = COMPOUND_STRING( + "A weak jolt of electricity\n" + "that paralyzes the foe."), .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_ELECTRIC, @@ -2102,9 +2183,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER] = { - .name = MOVE_NAME("Thunder"), - .description = COMPOUND_STRING("A lightning attack that may\n" - "cause paralysis."), + .name = COMPOUND_STRING("Thunder"), + .description = COMPOUND_STRING( + "A lightning attack that may\n" + "cause paralysis."), .effect = EFFECT_THUNDER, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_ELECTRIC, @@ -2127,9 +2209,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_THROW] = { - .name = MOVE_NAME("Rock Throw"), - .description = COMPOUND_STRING("Throws small rocks to\n" - "strike the foe."), + .name = COMPOUND_STRING("Rock Throw"), + .description = COMPOUND_STRING( + "Throws small rocks to\n" + "strike the foe."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_ROCK, @@ -2146,9 +2229,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EARTHQUAKE] = { - .name = MOVE_NAME("Earthquake"), - .description = COMPOUND_STRING("A powerful quake, but has\n" - "no effect on flying foes."), + .name = COMPOUND_STRING("Earthquake"), + .description = COMPOUND_STRING( + "A powerful quake, but has\n" + "no effect on flying foes."), .effect = EFFECT_EARTHQUAKE, .power = 100, .type = TYPE_GROUND, @@ -2168,9 +2252,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FISSURE] = { - .name = MOVE_NAME("Fissure"), - .description = COMPOUND_STRING("A one-hit KO move that\n" - "drops the foe in a fissure."), + .name = COMPOUND_STRING("Fissure"), + .description = COMPOUND_STRING( + "A one-hit KO move that\n" + "drops the foe in a fissure."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_GROUND, @@ -2189,9 +2274,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DIG] = { - .name = MOVE_NAME("Dig"), - .description = COMPOUND_STRING("Digs underground the first\n" - "turn and strikes next turn."), + .name = COMPOUND_STRING("Dig"), + .description = COMPOUND_STRING( + "Digs underground the first\n" + "turn and strikes next turn."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 80 : 60, .type = TYPE_GROUND, @@ -2214,9 +2300,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC] = { - .name = MOVE_NAME("Toxic"), - .description = COMPOUND_STRING("Poisons the foe with an\n" - "intensifying toxin."), + .name = COMPOUND_STRING("Toxic"), + .description = COMPOUND_STRING( + "Poisons the foe with an\n" + "intensifying toxin."), .effect = EFFECT_TOXIC, .power = 0, .type = TYPE_POISON, @@ -2235,9 +2322,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSION] = { - .name = MOVE_NAME("Confusion"), - .description = COMPOUND_STRING("A psychic attack that may\n" - "cause confusion."), + .name = COMPOUND_STRING("Confusion"), + .description = COMPOUND_STRING( + "A psychic attack that may\n" + "cause confusion."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_PSYCHIC, @@ -2259,9 +2347,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC] = { - .name = MOVE_NAME("Psychic"), - .description = COMPOUND_STRING("A powerful psychic attack\n" - "that may lower Sp. Def."), + .name = COMPOUND_STRING("Psychic"), + .description = COMPOUND_STRING( + "A powerful psychic attack\n" + "that may lower Sp. Def."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_PSYCHIC, @@ -2283,9 +2372,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYPNOSIS] = { - .name = MOVE_NAME("Hypnosis"), - .description = COMPOUND_STRING("A hypnotizing move that\n" - "may induce sleep."), + .name = COMPOUND_STRING("Hypnosis"), + .description = COMPOUND_STRING( + "A hypnotizing move that\n" + "may induce sleep."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_PSYCHIC, @@ -2304,9 +2394,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MEDITATE] = { - .name = MOVE_NAME("Meditate"), - .description = COMPOUND_STRING("Meditates in a peaceful\n" - "fashion to raise Attack."), + .name = COMPOUND_STRING("Meditate"), + .description = COMPOUND_STRING( + "Meditates in a peaceful\n" + "fashion to raise Attack."), .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_PSYCHIC, @@ -2327,9 +2418,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AGILITY] = { - .name = MOVE_NAME("Agility"), - .description = COMPOUND_STRING("Relaxes the body to sharply\n" - "boost Speed."), + .name = COMPOUND_STRING("Agility"), + .description = COMPOUND_STRING( + "Relaxes the body to sharply\n" + "boost Speed."), .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -2350,9 +2442,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_ATTACK] = { - .name = MOVE_NAME("Quick Attack"), - .description = COMPOUND_STRING("An extremely fast attack\n" - "that always strikes first."), + .name = COMPOUND_STRING("Quick Attack"), + .description = COMPOUND_STRING( + "An extremely fast attack\n" + "that always strikes first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -2370,9 +2463,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE] = { - .name = MOVE_NAME("Rage"), - .description = COMPOUND_STRING("Raises the user's Attack\n" - "every time it is hit."), + .name = COMPOUND_STRING("Rage"), + .description = COMPOUND_STRING( + "Raises the user's Attack\n" + "every time it is hit."), .effect = EFFECT_RAGE, .power = 20, .type = TYPE_NORMAL, @@ -2390,9 +2484,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TELEPORT] = { - .name = MOVE_NAME("Teleport"), - .description = COMPOUND_STRING("A psychic move for fleeing\n" - "from battle instantly."), + .name = COMPOUND_STRING("Teleport"), + .description = COMPOUND_STRING( + "A psychic move for fleeing\n" + "from battle instantly."), .effect = EFFECT_TELEPORT, .power = 0, .type = TYPE_PSYCHIC, @@ -2412,9 +2507,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SHADE] = { - .name = MOVE_NAME("Night Shade"), - .description = COMPOUND_STRING("Inflicts damage identical\n" - "to the user's level."), + .name = COMPOUND_STRING("Night Shade"), + .description = COMPOUND_STRING( + "Inflicts damage identical\n" + "to the user's level."), .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_GHOST, @@ -2431,9 +2527,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIMIC] = { - .name = MOVE_NAME("Mimic"), - .description = COMPOUND_STRING("Copies a move used by the\n" - "foe during one battle."), + .name = COMPOUND_STRING("Mimic"), + .description = COMPOUND_STRING( + "Copies a move used by the\n" + "foe during one battle."), .effect = EFFECT_MIMIC, .power = 0, .type = TYPE_NORMAL, @@ -2459,9 +2556,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SCREECH] = { - .name = MOVE_NAME("Screech"), - .description = COMPOUND_STRING("Emits a screech to sharply\n" - "reduce the foe's Defense."), + .name = COMPOUND_STRING("Screech"), + .description = COMPOUND_STRING( + "Emits a screech to sharply\n" + "reduce the foe's Defense."), .effect = EFFECT_DEFENSE_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -2482,9 +2580,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_TEAM] = { - .name = MOVE_NAME("Double Team"), - .description = COMPOUND_STRING("Creates illusory copies to\n" - "raise evasiveness."), + .name = COMPOUND_STRING("Double Team"), + .description = COMPOUND_STRING( + "Creates illusory copies to\n" + "raise evasiveness."), .effect = EFFECT_EVASION_UP, .power = 0, .type = TYPE_NORMAL, @@ -2505,9 +2604,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RECOVER] = { - .name = MOVE_NAME("Recover"), - .description = COMPOUND_STRING("Recovers up to half the\n" - "user's maximum HP."), + .name = COMPOUND_STRING("Recover"), + .description = COMPOUND_STRING( + "Recovers up to half the\n" + "user's maximum HP."), #if B_UPDATED_MOVE_DATA >= GEN_9 .pp = 5, #elif B_UPDATED_MOVE_DATA >= GEN_4 @@ -2535,9 +2635,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HARDEN] = { - .name = MOVE_NAME("Harden"), - .description = COMPOUND_STRING("Stiffens the body's \n" - "muscles to raise Defense."), + .name = COMPOUND_STRING("Harden"), + .description = COMPOUND_STRING( + "Stiffens the body's \n" + "muscles to raise Defense."), .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_NORMAL, @@ -2558,9 +2659,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MINIMIZE] = { - .name = MOVE_NAME("Minimize"), - .description = COMPOUND_STRING("Minimizes the user's size\n" - "to raise evasiveness."), + .name = COMPOUND_STRING("Minimize"), + .description = COMPOUND_STRING( + "Minimizes the user's size\n" + "to raise evasiveness."), .effect = EFFECT_MINIMIZE, .power = 0, .type = TYPE_NORMAL, @@ -2581,9 +2683,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SMOKESCREEN] = { - .name = MOVE_NAME("Smokescreen"), - .description = COMPOUND_STRING("Lowers the foe's accuracy\n" - "using smoke, ink, etc."), + .name = COMPOUND_STRING("Smokescreen"), + .description = COMPOUND_STRING( + "Lowers the foe's accuracy\n" + "using smoke, ink, etc."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -2602,9 +2705,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CONFUSE_RAY] = { - .name = MOVE_NAME("Confuse Ray"), - .description = COMPOUND_STRING("A sinister ray that\n" - "confuses the foe."), + .name = COMPOUND_STRING("Confuse Ray"), + .description = COMPOUND_STRING( + "A sinister ray that\n" + "confuses the foe."), .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_GHOST, @@ -2623,9 +2727,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WITHDRAW] = { - .name = MOVE_NAME("Withdraw"), - .description = COMPOUND_STRING("Withdraws the body into its\n" - "hard shell to raise Defense."), + .name = COMPOUND_STRING("Withdraw"), + .description = COMPOUND_STRING( + "Withdraws the body into its\n" + "hard shell to raise Defense."), .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_WATER, @@ -2646,9 +2751,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DEFENSE_CURL] = { - .name = MOVE_NAME("Defense Curl"), - .description = COMPOUND_STRING("Curls up to conceal weak\n" - "spots and raise Defense."), + .name = COMPOUND_STRING("Defense Curl"), + .description = COMPOUND_STRING( + "Curls up to conceal weak\n" + "spots and raise Defense."), .effect = EFFECT_DEFENSE_CURL, .power = 0, .type = TYPE_NORMAL, @@ -2669,9 +2775,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BARRIER] = { - .name = MOVE_NAME("Barrier"), - .description = COMPOUND_STRING("Creates a barrier that\n" - "sharply raises Defense."), + .name = COMPOUND_STRING("Barrier"), + .description = COMPOUND_STRING( + "Creates a barrier that\n" + "sharply raises Defense."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -2692,9 +2799,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_SCREEN] = { - .name = MOVE_NAME("Light Screen"), - .description = COMPOUND_STRING("Creates a wall of light that\n" - "lowers Sp. Atk damage."), + .name = COMPOUND_STRING("Light Screen"), + .description = COMPOUND_STRING( + "Creates a wall of light that\n" + "lowers Sp. Atk damage."), .effect = EFFECT_LIGHT_SCREEN, .power = 0, .type = TYPE_PSYCHIC, @@ -2715,9 +2823,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HAZE] = { - .name = MOVE_NAME("Haze"), - .description = COMPOUND_STRING("Creates a black haze that\n" - "eliminates all stat changes."), + .name = COMPOUND_STRING("Haze"), + .description = COMPOUND_STRING( + "Creates a black haze that\n" + "eliminates all stat changes."), .effect = EFFECT_HAZE, .power = 0, .type = TYPE_ICE, @@ -2738,9 +2847,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT] = { - .name = MOVE_NAME("Reflect"), - .description = COMPOUND_STRING("Creates a wall of light that\n" - "weakens physical attacks."), + .name = COMPOUND_STRING("Reflect"), + .description = COMPOUND_STRING( + "Creates a wall of light that\n" + "weakens physical attacks."), .effect = EFFECT_REFLECT, .power = 0, .type = TYPE_PSYCHIC, @@ -2761,9 +2871,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_ENERGY] = { - .name = MOVE_NAME("Focus Energy"), - .description = COMPOUND_STRING("Focuses power to raise the\n" - "critical-hit ratio."), + .name = COMPOUND_STRING("Focus Energy"), + .description = COMPOUND_STRING( + "Focuses power to raise the\n" + "critical-hit ratio."), .effect = EFFECT_FOCUS_ENERGY, .power = 0, .type = TYPE_NORMAL, @@ -2784,9 +2895,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BIDE] = { - .name = MOVE_NAME("Bide"), - .description = COMPOUND_STRING("Endures attack for 2\n" - "turns to retaliate double."), + .name = COMPOUND_STRING("Bide"), + .description = COMPOUND_STRING( + "Endures attack for 2\n" + "turns to retaliate double."), .effect = EFFECT_BIDE, .power = 1, .type = TYPE_NORMAL, @@ -2807,9 +2919,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_METRONOME] = { - .name = MOVE_NAME("Metronome"), - .description = COMPOUND_STRING("Waggles a finger to use any\n" - "Pokémon move at random."), + .name = COMPOUND_STRING("Metronome"), + .description = COMPOUND_STRING( + "Waggles a finger to use any\n" + "Pokémon move at random."), .effect = EFFECT_METRONOME, .power = 0, .type = TYPE_NORMAL, @@ -2835,9 +2948,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_MOVE] = { - .name = MOVE_NAME("Mirror Move"), - .description = COMPOUND_STRING("Counters the foe's attack\n" - "with the same move."), + .name = COMPOUND_STRING("Mirror Move"), + .description = COMPOUND_STRING( + "Counters the foe's attack\n" + "with the same move."), .effect = EFFECT_MIRROR_MOVE, .power = 0, .type = TYPE_FLYING, @@ -2863,8 +2977,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SELF_DESTRUCT] = { .name = HANDLE_EXPANDED_MOVE_NAME("SelfDestruct", "Self-Destruct"), - .description = COMPOUND_STRING("Inflicts severe damage but\n" - "makes the user faint."), + .description = COMPOUND_STRING( + "Inflicts severe damage but\n" + "makes the user faint."), .effect = EFFECT_EXPLOSION, .power = 200, .type = TYPE_NORMAL, @@ -2882,9 +2997,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EGG_BOMB] = { - .name = MOVE_NAME("Egg Bomb"), - .description = COMPOUND_STRING("An egg is forcibly hurled at\n" - "the foe."), + .name = COMPOUND_STRING("Egg Bomb"), + .description = COMPOUND_STRING( + "An egg is forcibly hurled at\n" + "the foe."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -2902,9 +3018,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LICK] = { - .name = MOVE_NAME("Lick"), - .description = COMPOUND_STRING("Licks with a long tongue to\n" - "injure. May also paralyze."), + .name = COMPOUND_STRING("Lick"), + .description = COMPOUND_STRING( + "Licks with a long tongue to\n" + "injure. May also paralyze."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 30 : 20, .type = TYPE_GHOST, @@ -2927,9 +3044,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SMOG] = { - .name = MOVE_NAME("Smog"), - .description = COMPOUND_STRING("An exhaust-gas attack\n" - "that may also poison."), + .name = COMPOUND_STRING("Smog"), + .description = COMPOUND_STRING( + "An exhaust-gas attack\n" + "that may also poison."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 30 : 20, .type = TYPE_POISON, @@ -2951,9 +3069,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE] = { - .name = MOVE_NAME("Sludge"), - .description = COMPOUND_STRING("Sludge is hurled to inflict\n" - "damage. May also poison."), + .name = COMPOUND_STRING("Sludge"), + .description = COMPOUND_STRING( + "Sludge is hurled to inflict\n" + "damage. May also poison."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_POISON, @@ -2975,9 +3094,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_CLUB] = { - .name = MOVE_NAME("Bone Club"), - .description = COMPOUND_STRING("Clubs the foe with a bone.\n" - "May cause flinching."), + .name = COMPOUND_STRING("Bone Club"), + .description = COMPOUND_STRING( + "Clubs the foe with a bone.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_GROUND, @@ -2999,9 +3119,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_BLAST] = { - .name = MOVE_NAME("Fire Blast"), - .description = COMPOUND_STRING("Incinerates everything it\n" - "strikes. May cause a burn."), + .name = COMPOUND_STRING("Fire Blast"), + .description = COMPOUND_STRING( + "Incinerates everything it\n" + "strikes. May cause a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_FIRE, @@ -3023,9 +3144,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WATERFALL] = { - .name = MOVE_NAME("Waterfall"), - .description = COMPOUND_STRING("Charges the foe with speed\n" - "to climb waterfalls."), + .name = COMPOUND_STRING("Waterfall"), + .description = COMPOUND_STRING( + "Charges the foe with speed\n" + "to climb waterfalls."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_WATER, @@ -3050,9 +3172,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CLAMP] = { - .name = MOVE_NAME("Clamp"), - .description = COMPOUND_STRING("Traps and squeezes the\n" - "foe for "BINDING_TURNS" turns."), + .name = COMPOUND_STRING("Clamp"), + .description = COMPOUND_STRING( + "Traps and squeezes the\n" + "foe for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_WATER, @@ -3074,9 +3197,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SWIFT] = { - .name = MOVE_NAME("Swift"), - .description = COMPOUND_STRING("Sprays star-shaped rays\n" - "that never miss."), + .name = COMPOUND_STRING("Swift"), + .description = COMPOUND_STRING( + "Sprays star-shaped rays\n" + "that never miss."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_NORMAL, @@ -3093,9 +3217,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SKULL_BASH] = { - .name = MOVE_NAME("Skull Bash"), - .description = COMPOUND_STRING("Tucks in the head, then\n" - "attacks on the next turn."), + .name = COMPOUND_STRING("Skull Bash"), + .description = COMPOUND_STRING( + "Tucks in the head, then\n" + "attacks on the next turn."), .effect = EFFECT_SKULL_BASH, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 100, .type = TYPE_NORMAL, @@ -3116,9 +3241,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKE_CANNON] = { - .name = MOVE_NAME("Spike Cannon"), - .description = COMPOUND_STRING("Launches sharp spikes that\n" - "strike 2 to 5 times."), + .name = COMPOUND_STRING("Spike Cannon"), + .description = COMPOUND_STRING( + "Launches sharp spikes that\n" + "strike 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 20, .type = TYPE_NORMAL, @@ -3135,9 +3261,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CONSTRICT] = { - .name = MOVE_NAME("Constrict"), - .description = COMPOUND_STRING("Constricts to inflict pain.\n" - "May lower Speed."), + .name = COMPOUND_STRING("Constrict"), + .description = COMPOUND_STRING( + "Constricts to inflict pain.\n" + "May lower Speed."), .effect = EFFECT_HIT, .power = 10, .type = TYPE_NORMAL, @@ -3160,9 +3287,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AMNESIA] = { - .name = MOVE_NAME("Amnesia"), - .description = COMPOUND_STRING("Forgets about something\n" - "and sharply raises Sp. Def."), + .name = COMPOUND_STRING("Amnesia"), + .description = COMPOUND_STRING( + "Forgets about something\n" + "and sharply raises Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -3183,9 +3311,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_KINESIS] = { - .name = MOVE_NAME("Kinesis"), - .description = COMPOUND_STRING("Distracts the foe.\n" - "May lower accuracy."), + .name = COMPOUND_STRING("Kinesis"), + .description = COMPOUND_STRING( + "Distracts the foe.\n" + "May lower accuracy."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_PSYCHIC, @@ -3204,9 +3333,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SOFT_BOILED] = { - .name = MOVE_NAME("Soft-Boiled"), - .description = COMPOUND_STRING("Recovers up to half the\n" - "user's maximum HP."), + .name = COMPOUND_STRING("Soft-Boiled"), + .description = COMPOUND_STRING( + "Recovers up to half the\n" + "user's maximum HP."), .effect = EFFECT_SOFTBOILED, .power = 0, .type = TYPE_NORMAL, @@ -3229,8 +3359,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_JUMP_KICK] = { .name = HANDLE_EXPANDED_MOVE_NAME("HighJumpKick", "High Jump Kick"), - .description = COMPOUND_STRING("A jumping knee kick. If it\n" - "misses, the user is hurt."), + .description = COMPOUND_STRING( + "A jumping knee kick. If it\n" + "misses, the user is hurt."), #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 130, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -3255,9 +3386,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GLARE] = { - .name = MOVE_NAME("Glare"), - .description = COMPOUND_STRING("Intimidates and frightens\n" - "the foe into paralysis."), + .name = COMPOUND_STRING("Glare"), + .description = COMPOUND_STRING( + "Intimidates and frightens\n" + "the foe into paralysis."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_5 @@ -3282,9 +3414,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DREAM_EATER] = { - .name = MOVE_NAME("Dream Eater"), - .description = COMPOUND_STRING("Takes one half the damage\n" - "inflicted on a sleeping foe."), + .name = COMPOUND_STRING("Dream Eater"), + .description = COMPOUND_STRING( + "Takes one half the damage\n" + "inflicted on a sleeping foe."), .effect = EFFECT_DREAM_EATER, .power = 100, .type = TYPE_PSYCHIC, @@ -3302,9 +3435,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_GAS] = { - .name = MOVE_NAME("Poison Gas"), - .description = COMPOUND_STRING("Envelops the foe in a toxic\n" - "gas that may poison."), + .name = COMPOUND_STRING("Poison Gas"), + .description = COMPOUND_STRING( + "Envelops the foe in a toxic\n" + "gas that may poison."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 90, #elif B_UPDATED_MOVE_DATA >= GEN_5 @@ -3329,9 +3463,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BARRAGE] = { - .name = MOVE_NAME("Barrage"), - .description = COMPOUND_STRING("Hurls round objects at the\n" - "foe 2 to 5 times."), + .name = COMPOUND_STRING("Barrage"), + .description = COMPOUND_STRING( + "Hurls round objects at the\n" + "foe 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -3349,9 +3484,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_LIFE] = { - .name = MOVE_NAME("Leech Life"), - .description = COMPOUND_STRING("An attack that steals half\n" - "the damage inflicted."), + .name = COMPOUND_STRING("Leech Life"), + .description = COMPOUND_STRING( + "An attack that steals half\n" + "the damage inflicted."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 80 : 20, .type = TYPE_BUG, @@ -3371,9 +3507,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LOVELY_KISS] = { - .name = MOVE_NAME("Lovely Kiss"), - .description = COMPOUND_STRING("Demands a kiss with a scary\n" - "face that induces sleep."), + .name = COMPOUND_STRING("Lovely Kiss"), + .description = COMPOUND_STRING( + "Demands a kiss with a scary\n" + "face that induces sleep."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -3392,9 +3529,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_ATTACK] = { - .name = MOVE_NAME("Sky Attack"), - .description = COMPOUND_STRING("Searches out weak spots,\n" - "then strikes the next turn."), + .name = COMPOUND_STRING("Sky Attack"), + .description = COMPOUND_STRING( + "Searches out weak spots,\n" + "then strikes the next turn."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_FLYING, @@ -3422,9 +3560,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRANSFORM] = { - .name = MOVE_NAME("Transform"), - .description = COMPOUND_STRING("Alters the user's cells to\n" - "become a copy of the foe."), + .name = COMPOUND_STRING("Transform"), + .description = COMPOUND_STRING( + "Alters the user's cells to\n" + "become a copy of the foe."), .effect = EFFECT_TRANSFORM, .power = 0, .type = TYPE_NORMAL, @@ -3450,9 +3589,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE] = { - .name = MOVE_NAME("Bubble"), - .description = COMPOUND_STRING("An attack using bubbles.\n" - "May lower the foe's Speed."), + .name = COMPOUND_STRING("Bubble"), + .description = COMPOUND_STRING( + "An attack using bubbles.\n" + "May lower the foe's Speed."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 40 : 20, .type = TYPE_WATER, @@ -3474,9 +3614,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DIZZY_PUNCH] = { - .name = MOVE_NAME("Dizzy Punch"), - .description = COMPOUND_STRING("A rhythmic punch that may\n" - "confuse the foe."), + .name = COMPOUND_STRING("Dizzy Punch"), + .description = COMPOUND_STRING( + "A rhythmic punch that may\n" + "confuse the foe."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -3500,9 +3641,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPORE] = { - .name = MOVE_NAME("Spore"), - .description = COMPOUND_STRING("Scatters a cloud of spores\n" - "that always induce sleep."), + .name = COMPOUND_STRING("Spore"), + .description = COMPOUND_STRING( + "Scatters a cloud of spores\n" + "that always induce sleep."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -3522,9 +3664,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH] = { - .name = MOVE_NAME("Flash"), - .description = COMPOUND_STRING("Looses a powerful blast of\n" - "light that cuts accuracy."), + .name = COMPOUND_STRING("Flash"), + .description = COMPOUND_STRING( + "Looses a powerful blast of\n" + "light that cuts accuracy."), .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -3543,9 +3686,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYWAVE] = { - .name = MOVE_NAME("Psywave"), - .description = COMPOUND_STRING("Attacks with a psychic\n" - "wave of varying intensity."), + .name = COMPOUND_STRING("Psywave"), + .description = COMPOUND_STRING( + "Attacks with a psychic\n" + "wave of varying intensity."), .effect = EFFECT_PSYWAVE, .power = 1, .type = TYPE_PSYCHIC, @@ -3562,9 +3706,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPLASH] = { - .name = MOVE_NAME("Splash"), - .description = COMPOUND_STRING("It's just a splash...\n" - "Has no effect whatsoever."), + .name = COMPOUND_STRING("Splash"), + .description = COMPOUND_STRING( + "It's just a splash...\n" + "Has no effect whatsoever."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -3585,9 +3730,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_ARMOR] = { - .name = MOVE_NAME("Acid Armor"), - .description = COMPOUND_STRING("Liquifies the user's body\n" - "to sharply raise Defense."), + .name = COMPOUND_STRING("Acid Armor"), + .description = COMPOUND_STRING( + "Liquifies the user's body\n" + "to sharply raise Defense."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_POISON, @@ -3608,9 +3754,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CRABHAMMER] = { - .name = MOVE_NAME("Crabhammer"), - .description = COMPOUND_STRING("Hammers with a pincer. Has a\n" - "high critical-hit ratio."), + .name = COMPOUND_STRING("Crabhammer"), + .description = COMPOUND_STRING( + "Hammers with a pincer. Has a\n" + "high critical-hit ratio."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 90, .type = TYPE_WATER, @@ -3629,9 +3776,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EXPLOSION] = { - .name = MOVE_NAME("Explosion"), - .description = COMPOUND_STRING("Inflicts severe damage but\n" - "makes the user faint."), + .name = COMPOUND_STRING("Explosion"), + .description = COMPOUND_STRING( + "Inflicts severe damage but\n" + "makes the user faint."), .effect = EFFECT_EXPLOSION, .power = 250, .type = TYPE_NORMAL, @@ -3649,9 +3797,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_SWIPES] = { - .name = MOVE_NAME("Fury Swipes"), - .description = COMPOUND_STRING("Rakes the foe with sharp\n" - "claws, etc., 2 to 5 times."), + .name = COMPOUND_STRING("Fury Swipes"), + .description = COMPOUND_STRING( + "Rakes the foe with sharp\n" + "claws, etc., 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -3669,9 +3818,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BONEMERANG] = { - .name = MOVE_NAME("Bonemerang"), - .description = COMPOUND_STRING("Throws a bone boomerang\n" - "that strikes twice."), + .name = COMPOUND_STRING("Bonemerang"), + .description = COMPOUND_STRING( + "Throws a bone boomerang\n" + "that strikes twice."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_GROUND, @@ -3689,9 +3839,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REST] = { - .name = MOVE_NAME("Rest"), - .description = COMPOUND_STRING("The user sleeps for 2 turns,\n" - "restoring HP and status."), + .name = COMPOUND_STRING("Rest"), + .description = COMPOUND_STRING( + "The user sleeps for 2 turns,\n" + "restoring HP and status."), .effect = EFFECT_REST, .power = 0, .type = TYPE_PSYCHIC, @@ -3713,9 +3864,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SLIDE] = { - .name = MOVE_NAME("Rock Slide"), - .description = COMPOUND_STRING("Large boulders are hurled.\n" - "May cause flinching."), + .name = COMPOUND_STRING("Rock Slide"), + .description = COMPOUND_STRING( + "Large boulders are hurled.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_ROCK, @@ -3737,9 +3889,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_FANG] = { - .name = MOVE_NAME("Hyper Fang"), - .description = COMPOUND_STRING("Attacks with sharp fangs.\n" - "May cause flinching."), + .name = COMPOUND_STRING("Hyper Fang"), + .description = COMPOUND_STRING( + "Attacks with sharp fangs.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -3763,9 +3916,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHARPEN] = { - .name = MOVE_NAME("Sharpen"), - .description = COMPOUND_STRING("Reduces the polygon count\n" - "and raises Attack."), + .name = COMPOUND_STRING("Sharpen"), + .description = COMPOUND_STRING( + "Reduces the polygon count\n" + "and raises Attack."), .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -3786,9 +3940,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION] = { - .name = MOVE_NAME("Conversion"), - .description = COMPOUND_STRING("Changes the user's type\n" - "into a known move's type."), + .name = COMPOUND_STRING("Conversion"), + .description = COMPOUND_STRING( + "Changes the user's type\n" + "into a known move's type."), .effect = EFFECT_CONVERSION, .power = 0, .type = TYPE_NORMAL, @@ -3809,9 +3964,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRI_ATTACK] = { - .name = MOVE_NAME("Tri Attack"), - .description = COMPOUND_STRING("Fires three types of beams\n" - "at the same time."), + .name = COMPOUND_STRING("Tri Attack"), + .description = COMPOUND_STRING( + "Fires three types of beams\n" + "at the same time."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -3833,9 +3989,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUPER_FANG] = { - .name = MOVE_NAME("Super Fang"), - .description = COMPOUND_STRING("Attacks with sharp fangs\n" - "and cuts half the foe's HP."), + .name = COMPOUND_STRING("Super Fang"), + .description = COMPOUND_STRING( + "Attacks with sharp fangs\n" + "and cuts half the foe's HP."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_NORMAL, @@ -3854,9 +4011,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SLASH] = { - .name = MOVE_NAME("Slash"), - .description = COMPOUND_STRING("Slashes with claws, etc. Has\n" - "a high critical-hit ratio."), + .name = COMPOUND_STRING("Slash"), + .description = COMPOUND_STRING( + "Slashes with claws, etc. Has\n" + "a high critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -3876,9 +4034,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUBSTITUTE] = { - .name = MOVE_NAME("Substitute"), - .description = COMPOUND_STRING("Creates a decoy using 1/4\n" - "of the user's maximum HP."), + .name = COMPOUND_STRING("Substitute"), + .description = COMPOUND_STRING( + "Creates a decoy using 1/4\n" + "of the user's maximum HP."), .effect = EFFECT_SUBSTITUTE, .power = 0, .type = TYPE_NORMAL, @@ -3900,9 +4059,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE] = { - .name = MOVE_NAME("Struggle"), - .description = COMPOUND_STRING("Used only if all PP are gone.\n" - "Also hurts the user a little."), + .name = COMPOUND_STRING("Struggle"), + .description = COMPOUND_STRING( + "Used only if all PP are gone.\n" + "Also hurts the user a little."), #if B_UPDATED_MOVE_DATA >= GEN_4 .effect = EFFECT_RECOIL_HP_25, .accuracy = 0, @@ -3936,9 +4096,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SKETCH] = { - .name = MOVE_NAME("Sketch"), - .description = COMPOUND_STRING("Copies the foe's last move\n" - "permanently."), + .name = COMPOUND_STRING("Sketch"), + .description = COMPOUND_STRING( + "Copies the foe's last move\n" + "permanently."), .effect = EFFECT_SKETCH, .power = 0, .type = TYPE_NORMAL, @@ -3967,9 +4128,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_KICK] = { - .name = MOVE_NAME("Triple Kick"), - .description = COMPOUND_STRING("Kicks the foe 3 times in a\n" - "row with rising intensity."), + .name = COMPOUND_STRING("Triple Kick"), + .description = COMPOUND_STRING( + "Kicks the foe 3 times in a\n" + "row with rising intensity."), .effect = EFFECT_TRIPLE_KICK, .power = 10, .type = TYPE_FIGHTING, @@ -3988,9 +4150,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THIEF] = { - .name = MOVE_NAME("Thief"), - .description = COMPOUND_STRING("While attacking, it may\n" - "steal the foe's held item."), + .name = COMPOUND_STRING("Thief"), + .description = COMPOUND_STRING( + "While attacking, it may\n" + "steal the foe's held item."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, .type = TYPE_DARK, @@ -4016,9 +4179,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIDER_WEB] = { - .name = MOVE_NAME("Spider Web"), - .description = COMPOUND_STRING("Ensnares the foe to stop it\n" - "from fleeing or switching."), + .name = COMPOUND_STRING("Spider Web"), + .description = COMPOUND_STRING( + "Ensnares the foe to stop it\n" + "from fleeing or switching."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_BUG, @@ -4038,9 +4202,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_READER] = { - .name = MOVE_NAME("Mind Reader"), - .description = COMPOUND_STRING("Senses the foe's action to\n" - "ensure the next move's hit."), + .name = COMPOUND_STRING("Mind Reader"), + .description = COMPOUND_STRING( + "Senses the foe's action to\n" + "ensure the next move's hit."), .effect = EFFECT_LOCK_ON, .power = 0, .type = TYPE_NORMAL, @@ -4058,9 +4223,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHTMARE] = { - .name = MOVE_NAME("Nightmare"), - .description = COMPOUND_STRING("Inflicts 1/4 damage on a\n" - "sleeping foe every turn."), + .name = COMPOUND_STRING("Nightmare"), + .description = COMPOUND_STRING( + "Inflicts 1/4 damage on a\n" + "sleeping foe every turn."), .effect = EFFECT_NIGHTMARE, .power = 0, .type = TYPE_GHOST, @@ -4079,9 +4245,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_WHEEL] = { - .name = MOVE_NAME("Flame Wheel"), - .description = COMPOUND_STRING("A fiery charge attack that\n" - "may inflict a burn."), + .name = COMPOUND_STRING("Flame Wheel"), + .description = COMPOUND_STRING( + "A fiery charge attack that\n" + "may inflict a burn."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FIRE, @@ -4105,9 +4272,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SNORE] = { - .name = MOVE_NAME("Snore"), - .description = COMPOUND_STRING("A loud attack that can be\n" - "used only while asleep."), + .name = COMPOUND_STRING("Snore"), + .description = COMPOUND_STRING( + "A loud attack that can be\n" + "used only while asleep."), .effect = EFFECT_SNORE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 40, .type = TYPE_NORMAL, @@ -4132,9 +4300,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CURSE] = { - .name = MOVE_NAME("Curse"), - .description = COMPOUND_STRING("A move that functions\n" - "differently for GHOSTS."), + .name = COMPOUND_STRING("Curse"), + .description = COMPOUND_STRING( + "A move that functions\n" + "differently for GHOSTS."), .effect = EFFECT_CURSE, .power = 0, .type = B_UPDATED_MOVE_TYPES >= GEN_5 ? TYPE_GHOST : TYPE_MYSTERY, @@ -4155,9 +4324,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLAIL] = { - .name = MOVE_NAME("Flail"), - .description = COMPOUND_STRING("Inflicts more damage when\n" - "the user's HP is down."), + .name = COMPOUND_STRING("Flail"), + .description = COMPOUND_STRING( + "Inflicts more damage when\n" + "the user's HP is down."), .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_NORMAL, @@ -4175,9 +4345,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CONVERSION_2] = { - .name = MOVE_NAME("Conversion 2"), - .description = COMPOUND_STRING("Makes the user resistant\n" - "to the last attack's type."), + .name = COMPOUND_STRING("Conversion 2"), + .description = COMPOUND_STRING( + "Makes the user resistant\n" + "to the last attack's type."), .effect = EFFECT_CONVERSION_2, .power = 0, .type = TYPE_NORMAL, @@ -4198,9 +4369,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AEROBLAST] = { - .name = MOVE_NAME("Aeroblast"), - .description = COMPOUND_STRING("Launches a vacuumed blast.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Aeroblast"), + .description = COMPOUND_STRING( + "Launches a vacuumed blast.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FLYING, @@ -4219,9 +4391,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_SPORE] = { - .name = MOVE_NAME("Cotton Spore"), - .description = COMPOUND_STRING("Spores cling to the foe,\n" - "sharply reducing Speed."), + .name = COMPOUND_STRING("Cotton Spore"), + .description = COMPOUND_STRING( + "Spores cling to the foe,\n" + "sharply reducing Speed."), .effect = EFFECT_SPEED_DOWN_2, .power = 0, .type = TYPE_GRASS, @@ -4241,9 +4414,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REVERSAL] = { - .name = MOVE_NAME("Reversal"), - .description = COMPOUND_STRING("Inflicts more damage when\n" - "the user's HP is down."), + .name = COMPOUND_STRING("Reversal"), + .description = COMPOUND_STRING( + "Inflicts more damage when\n" + "the user's HP is down."), .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_FIGHTING, @@ -4261,9 +4435,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPITE] = { - .name = MOVE_NAME("Spite"), - .description = COMPOUND_STRING("Spitefully cuts the PP\n" - "of the foe's last move."), + .name = COMPOUND_STRING("Spite"), + .description = COMPOUND_STRING( + "Spitefully cuts the PP\n" + "of the foe's last move."), .effect = EFFECT_SPITE, .power = 0, .type = TYPE_GHOST, @@ -4283,9 +4458,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER_SNOW] = { - .name = MOVE_NAME("Powder Snow"), - .description = COMPOUND_STRING("Blasts the foe with a snowy\n" - "gust. May cause freezing."), + .name = COMPOUND_STRING("Powder Snow"), + .description = COMPOUND_STRING( + "Blasts the foe with a snowy\n" + "gust. May cause freezing."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ICE, @@ -4307,9 +4483,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PROTECT] = { - .name = MOVE_NAME("Protect"), - .description = COMPOUND_STRING("Evades attack, but may fail\n" - "if used in succession."), + .name = COMPOUND_STRING("Protect"), + .description = COMPOUND_STRING( + "Evades attack, but may fail\n" + "if used in succession."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_NORMAL, @@ -4331,9 +4508,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MACH_PUNCH] = { - .name = MOVE_NAME("Mach Punch"), - .description = COMPOUND_STRING("A punch is thrown at wicked\n" - "speed to strike first."), + .name = COMPOUND_STRING("Mach Punch"), + .description = COMPOUND_STRING( + "A punch is thrown at wicked\n" + "speed to strike first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -4352,9 +4530,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SCARY_FACE] = { - .name = MOVE_NAME("Scary Face"), - .description = COMPOUND_STRING("Frightens with a scary face\n" - "to sharply reduce Speed."), + .name = COMPOUND_STRING("Scary Face"), + .description = COMPOUND_STRING( + "Frightens with a scary face\n" + "to sharply reduce Speed."), .effect = EFFECT_SPEED_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -4373,7 +4552,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT_ATTACK] = { - .name = MOVE_NAME("Feint Attack"), + .name = COMPOUND_STRING("Feint Attack"), .description = sFeintDescription, .effect = EFFECT_HIT, .power = 60, @@ -4392,9 +4571,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_KISS] = { - .name = MOVE_NAME("Sweet Kiss"), - .description = COMPOUND_STRING("Demands a kiss with a cute\n" - "look. May cause confusion."), + .name = COMPOUND_STRING("Sweet Kiss"), + .description = COMPOUND_STRING( + "Demands a kiss with a cute\n" + "look. May cause confusion."), .effect = EFFECT_CONFUSE, .power = 0, .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, @@ -4413,9 +4593,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BELLY_DRUM] = { - .name = MOVE_NAME("Belly Drum"), - .description = COMPOUND_STRING("Maximizes Attack while\n" - "sacrificing HP."), + .name = COMPOUND_STRING("Belly Drum"), + .description = COMPOUND_STRING( + "Maximizes Attack while\n" + "sacrificing HP."), .effect = EFFECT_BELLY_DRUM, .power = 0, .type = TYPE_NORMAL, @@ -4436,9 +4617,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_BOMB] = { - .name = MOVE_NAME("Sludge Bomb"), - .description = COMPOUND_STRING("Sludge is hurled to inflict\n" - "damage. May also poison."), + .name = COMPOUND_STRING("Sludge Bomb"), + .description = COMPOUND_STRING( + "Sludge is hurled to inflict\n" + "damage. May also poison."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_POISON, @@ -4461,9 +4643,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SLAP] = { - .name = MOVE_NAME("Mud-Slap"), - .description = COMPOUND_STRING("Hurls mud in the foe's face\n" - "to reduce its accuracy."), + .name = COMPOUND_STRING("Mud-Slap"), + .description = COMPOUND_STRING( + "Hurls mud in the foe's face\n" + "to reduce its accuracy."), .effect = EFFECT_HIT, .power = 20, .type = TYPE_GROUND, @@ -4485,9 +4668,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OCTAZOOKA] = { - .name = MOVE_NAME("Octazooka"), - .description = COMPOUND_STRING("Fires a lump of ink to\n" - "damage and cut accuracy."), + .name = COMPOUND_STRING("Octazooka"), + .description = COMPOUND_STRING( + "Fires a lump of ink to\n" + "damage and cut accuracy."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_WATER, @@ -4510,9 +4694,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKES] = { - .name = MOVE_NAME("Spikes"), - .description = COMPOUND_STRING("Sets spikes that hurt a \n" - "foe switching in."), + .name = COMPOUND_STRING("Spikes"), + .description = COMPOUND_STRING( + "Sets spikes that hurt a \n" + "foe switching in."), .effect = EFFECT_SPIKES, .power = 0, .type = TYPE_GROUND, @@ -4535,9 +4720,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ZAP_CANNON] = { - .name = MOVE_NAME("Zap Cannon"), - .description = COMPOUND_STRING("Powerful and sure to cause\n" - "paralysis, but inaccurate."), + .name = COMPOUND_STRING("Zap Cannon"), + .description = COMPOUND_STRING( + "Powerful and sure to cause\n" + "paralysis, but inaccurate."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 120 : 100, .type = TYPE_ELECTRIC, @@ -4560,9 +4746,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FORESIGHT] = { - .name = MOVE_NAME("Foresight"), - .description = COMPOUND_STRING("Negates the foe's efforts\n" - "to heighten evasiveness."), + .name = COMPOUND_STRING("Foresight"), + .description = COMPOUND_STRING( + "Negates the foe's efforts\n" + "to heighten evasiveness."), .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, @@ -4582,9 +4769,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DESTINY_BOND] = { - .name = MOVE_NAME("Destiny Bond"), - .description = COMPOUND_STRING("If the user faints, the foe\n" - "is also made to faint."), + .name = COMPOUND_STRING("Destiny Bond"), + .description = COMPOUND_STRING( + "If the user faints, the foe\n" + "is also made to faint."), .effect = EFFECT_DESTINY_BOND, .power = 0, .type = TYPE_GHOST, @@ -4608,9 +4796,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PERISH_SONG] = { - .name = MOVE_NAME("Perish Song"), - .description = COMPOUND_STRING("Any Pokémon hearing this\n" - "song faints in 3 turns."), + .name = COMPOUND_STRING("Perish Song"), + .description = COMPOUND_STRING( + "Any Pokémon hearing this\n" + "song faints in 3 turns."), .effect = EFFECT_PERISH_SONG, .power = 0, .type = TYPE_NORMAL, @@ -4632,9 +4821,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICY_WIND] = { - .name = MOVE_NAME("Icy Wind"), - .description = COMPOUND_STRING("A chilling attack that\n" - "lowers the foe's Speed."), + .name = COMPOUND_STRING("Icy Wind"), + .description = COMPOUND_STRING( + "A chilling attack that\n" + "lowers the foe's Speed."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_ICE, @@ -4657,9 +4847,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DETECT] = { - .name = MOVE_NAME("Detect"), - .description = COMPOUND_STRING("Evades attack, but may fail\n" - "if used in succession."), + .name = COMPOUND_STRING("Detect"), + .description = COMPOUND_STRING( + "Evades attack, but may fail\n" + "if used in succession."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIGHTING, @@ -4683,9 +4874,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_RUSH] = { - .name = MOVE_NAME("Bone Rush"), - .description = COMPOUND_STRING("Strikes the foe with a bone\n" - "in hand 2 to 5 times."), + .name = COMPOUND_STRING("Bone Rush"), + .description = COMPOUND_STRING( + "Strikes the foe with a bone\n" + "in hand 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_GROUND, @@ -4702,9 +4894,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LOCK_ON] = { - .name = MOVE_NAME("Lock-On"), - .description = COMPOUND_STRING("Locks on to the foe to\n" - "ensure the next move hits."), + .name = COMPOUND_STRING("Lock-On"), + .description = COMPOUND_STRING( + "Locks on to the foe to\n" + "ensure the next move hits."), .effect = EFFECT_LOCK_ON, .power = 0, .type = TYPE_NORMAL, @@ -4722,9 +4915,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OUTRAGE] = { - .name = MOVE_NAME("Outrage"), - .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" - "that confuses the user."), + .name = COMPOUND_STRING("Outrage"), + .description = COMPOUND_STRING( + "A rampage of 2 to 3 turns\n" + "that confuses the user."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 120 : 90, .type = TYPE_DRAGON, @@ -4747,9 +4941,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSTORM] = { - .name = MOVE_NAME("Sandstorm"), - .description = COMPOUND_STRING("Causes a sandstorm that\n" - "rages for several turns."), + .name = COMPOUND_STRING("Sandstorm"), + .description = COMPOUND_STRING( + "Causes a sandstorm that\n" + "rages for several turns."), .effect = EFFECT_SANDSTORM, .power = 0, .type = TYPE_ROCK, @@ -4770,9 +4965,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_DRAIN] = { - .name = MOVE_NAME("Giga Drain"), - .description = COMPOUND_STRING("An attack that steals half\n" - "the damage inflicted."), + .name = COMPOUND_STRING("Giga Drain"), + .description = COMPOUND_STRING( + "An attack that steals half\n" + "the damage inflicted."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, .type = TYPE_GRASS, @@ -4791,9 +4987,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ENDURE] = { - .name = MOVE_NAME("Endure"), - .description = COMPOUND_STRING("Endures any attack for\n" - "1 turn, leaving at least 1HP."), + .name = COMPOUND_STRING("Endure"), + .description = COMPOUND_STRING( + "Endures any attack for\n" + "1 turn, leaving at least 1HP."), .effect = EFFECT_ENDURE, .power = 0, .type = TYPE_NORMAL, @@ -4817,9 +5014,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHARM] = { - .name = MOVE_NAME("Charm"), - .description = COMPOUND_STRING("Charms the foe and sharply\n" - "reduces its Attack."), + .name = COMPOUND_STRING("Charm"), + .description = COMPOUND_STRING( + "Charms the foe and sharply\n" + "reduces its Attack."), .effect = EFFECT_ATTACK_DOWN_2, .power = 0, .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, @@ -4838,9 +5036,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROLLOUT] = { - .name = MOVE_NAME("Rollout"), - .description = COMPOUND_STRING("An attack lasting 5 turns\n" - "with rising intensity."), + .name = COMPOUND_STRING("Rollout"), + .description = COMPOUND_STRING( + "An attack lasting 5 turns\n" + "with rising intensity."), .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ROCK, @@ -4860,7 +5059,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SWIPE] = { - .name = MOVE_NAME("False Swipe"), + .name = COMPOUND_STRING("False Swipe"), .description = sFalseSwipeDescription, .effect = EFFECT_FALSE_SWIPE, .power = 40, @@ -4879,9 +5078,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SWAGGER] = { - .name = MOVE_NAME("Swagger"), - .description = COMPOUND_STRING("Confuses the foe, but also\n" - "sharply raises Attack."), + .name = COMPOUND_STRING("Swagger"), + .description = COMPOUND_STRING( + "Confuses the foe, but also\n" + "sharply raises Attack."), .effect = EFFECT_SWAGGER, .power = 0, .type = TYPE_NORMAL, @@ -4900,9 +5100,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MILK_DRINK] = { - .name = MOVE_NAME("Milk Drink"), - .description = COMPOUND_STRING("Recovers up to half the\n" - "user's maximum HP."), + .name = COMPOUND_STRING("Milk Drink"), + .description = COMPOUND_STRING( + "Recovers up to half the\n" + "user's maximum HP."), .effect = EFFECT_SOFTBOILED, .power = 0, .type = TYPE_NORMAL, @@ -4924,9 +5125,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPARK] = { - .name = MOVE_NAME("Spark"), - .description = COMPOUND_STRING("An electrified tackle that\n" - "may paralyze the foe."), + .name = COMPOUND_STRING("Spark"), + .description = COMPOUND_STRING( + "An electrified tackle that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ELECTRIC, @@ -4949,9 +5151,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FURY_CUTTER] = { - .name = MOVE_NAME("Fury Cutter"), - .description = COMPOUND_STRING("An attack that intensifies\n" - "on each successive hit."), + .name = COMPOUND_STRING("Fury Cutter"), + .description = COMPOUND_STRING( + "An attack that intensifies\n" + "on each successive hit."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 40, #elif B_UPDATED_MOVE_DATA >= GEN_5 @@ -4976,9 +5179,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_WING] = { - .name = MOVE_NAME("Steel Wing"), - .description = COMPOUND_STRING("Strikes the foe with hard\n" - "wings spread wide."), + .name = COMPOUND_STRING("Steel Wing"), + .description = COMPOUND_STRING( + "Strikes the foe with hard\n" + "wings spread wide."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_STEEL, @@ -5002,9 +5206,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MEAN_LOOK] = { - .name = MOVE_NAME("Mean Look"), - .description = COMPOUND_STRING("Fixes the foe with a mean\n" - "look that prevents escape."), + .name = COMPOUND_STRING("Mean Look"), + .description = COMPOUND_STRING( + "Fixes the foe with a mean\n" + "look that prevents escape."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -5024,9 +5229,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ATTRACT] = { - .name = MOVE_NAME("Attract"), - .description = COMPOUND_STRING("Makes the opposite gender\n" - "less likely to attack."), + .name = COMPOUND_STRING("Attract"), + .description = COMPOUND_STRING( + "Makes the opposite gender\n" + "less likely to attack."), .effect = EFFECT_ATTRACT, .power = 0, .type = TYPE_NORMAL, @@ -5046,9 +5252,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SLEEP_TALK] = { - .name = MOVE_NAME("Sleep Talk"), - .description = COMPOUND_STRING("Uses an available move\n" - "randomly while asleep."), + .name = COMPOUND_STRING("Sleep Talk"), + .description = COMPOUND_STRING( + "Uses an available move\n" + "randomly while asleep."), .effect = EFFECT_SLEEP_TALK, .power = 0, .type = TYPE_NORMAL, @@ -5075,9 +5282,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BELL] = { - .name = MOVE_NAME("Heal Bell"), - .description = COMPOUND_STRING("Chimes soothingly to heal\n" - "all status abnormalities."), + .name = COMPOUND_STRING("Heal Bell"), + .description = COMPOUND_STRING( + "Chimes soothingly to heal\n" + "all status abnormalities."), .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_NORMAL, @@ -5100,9 +5308,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RETURN] = { - .name = MOVE_NAME("Return"), - .description = COMPOUND_STRING("An attack that increases\n" - "in power with friendship."), + .name = COMPOUND_STRING("Return"), + .description = COMPOUND_STRING( + "An attack that increases\n" + "in power with friendship."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -5120,9 +5329,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PRESENT] = { - .name = MOVE_NAME("Present"), - .description = COMPOUND_STRING("A gift in the form of a\n" - "bomb. May restore HP."), + .name = COMPOUND_STRING("Present"), + .description = COMPOUND_STRING( + "A gift in the form of a\n" + "bomb. May restore HP."), .effect = EFFECT_PRESENT, .power = 1, .type = TYPE_NORMAL, @@ -5140,9 +5350,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FRUSTRATION] = { - .name = MOVE_NAME("Frustration"), - .description = COMPOUND_STRING("An attack that is stronger\n" - "if the Trainer is disliked."), + .name = COMPOUND_STRING("Frustration"), + .description = COMPOUND_STRING( + "An attack that is stronger\n" + "if the Trainer is disliked."), .effect = EFFECT_FRUSTRATION, .power = 1, .type = TYPE_NORMAL, @@ -5160,9 +5371,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SAFEGUARD] = { - .name = MOVE_NAME("Safeguard"), - .description = COMPOUND_STRING("A mystical force prevents\n" - "all status problems."), + .name = COMPOUND_STRING("Safeguard"), + .description = COMPOUND_STRING( + "A mystical force prevents\n" + "all status problems."), .effect = EFFECT_SAFEGUARD, .power = 0, .type = TYPE_NORMAL, @@ -5183,9 +5395,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PAIN_SPLIT] = { - .name = MOVE_NAME("Pain Split"), - .description = COMPOUND_STRING("Adds the user and foe's HP,\n" - "then shares them equally."), + .name = COMPOUND_STRING("Pain Split"), + .description = COMPOUND_STRING( + "Adds the user and foe's HP,\n" + "then shares them equally."), .effect = EFFECT_PAIN_SPLIT, .power = 0, .type = TYPE_NORMAL, @@ -5203,9 +5416,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_FIRE] = { - .name = MOVE_NAME("Sacred Fire"), - .description = COMPOUND_STRING("A mystical fire attack that\n" - "may inflict a burn."), + .name = COMPOUND_STRING("Sacred Fire"), + .description = COMPOUND_STRING( + "A mystical fire attack that\n" + "may inflict a burn."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIRE, @@ -5228,9 +5442,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNITUDE] = { - .name = MOVE_NAME("Magnitude"), - .description = COMPOUND_STRING("A ground-shaking attack\n" - "of random intensity."), + .name = COMPOUND_STRING("Magnitude"), + .description = COMPOUND_STRING( + "A ground-shaking attack\n" + "of random intensity."), .effect = EFFECT_MAGNITUDE, .power = 1, .type = TYPE_GROUND, @@ -5250,8 +5465,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMIC_PUNCH] = { .name = HANDLE_EXPANDED_MOVE_NAME("DynamicPunch", "Dynamic Punch"), - .description = COMPOUND_STRING("Powerful and sure to cause\n" - "confusion, but inaccurate."), + .description = COMPOUND_STRING( + "Powerful and sure to cause\n" + "confusion, but inaccurate."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -5275,9 +5491,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MEGAHORN] = { - .name = MOVE_NAME("Megahorn"), - .description = COMPOUND_STRING("A brutal ramming attack\n" - "using out-thrust horns."), + .name = COMPOUND_STRING("Megahorn"), + .description = COMPOUND_STRING( + "A brutal ramming attack\n" + "using out-thrust horns."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_BUG, @@ -5296,8 +5513,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_BREATH] = { .name = HANDLE_EXPANDED_MOVE_NAME("DragonBreath", "Dragon Breath"), - .description = COMPOUND_STRING("Strikes the foe with an\n" - "incredible blast of breath."), + .description = COMPOUND_STRING( + "Strikes the foe with an\n" + "incredible blast of breath."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DRAGON, @@ -5320,9 +5538,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BATON_PASS] = { - .name = MOVE_NAME("Baton Pass"), - .description = COMPOUND_STRING("Switches out the user while\n" - "keeping effects in play."), + .name = COMPOUND_STRING("Baton Pass"), + .description = COMPOUND_STRING( + "Switches out the user while\n" + "keeping effects in play."), .effect = EFFECT_BATON_PASS, .power = 0, .type = TYPE_NORMAL, @@ -5342,9 +5561,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ENCORE] = { - .name = MOVE_NAME("Encore"), - .description = COMPOUND_STRING("Makes the foe repeat its\n" - "last move over 2 to 6 turns."), + .name = COMPOUND_STRING("Encore"), + .description = COMPOUND_STRING( + "Makes the foe repeat its\n" + "last move over 2 to 6 turns."), .effect = EFFECT_ENCORE, .power = 0, .type = TYPE_NORMAL, @@ -5365,9 +5585,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PURSUIT] = { - .name = MOVE_NAME("Pursuit"), - .description = COMPOUND_STRING("Inflicts bad damage if used\n" - "on a foe switching out."), + .name = COMPOUND_STRING("Pursuit"), + .description = COMPOUND_STRING( + "Inflicts bad damage if used\n" + "on a foe switching out."), .effect = EFFECT_PURSUIT, .power = 40, .type = TYPE_DARK, @@ -5386,9 +5607,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAPID_SPIN] = { - .name = MOVE_NAME("Rapid Spin"), - .description = COMPOUND_STRING("Spins the body at high\n" - "speed to strike the foe."), + .name = COMPOUND_STRING("Rapid Spin"), + .description = COMPOUND_STRING( + "Spins the body at high\n" + "speed to strike the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 50 : 20, .type = TYPE_NORMAL, @@ -5418,9 +5640,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_SCENT] = { - .name = MOVE_NAME("Sweet Scent"), - .description = COMPOUND_STRING("Allures the foe to reduce\n" - "evasiveness."), + .name = COMPOUND_STRING("Sweet Scent"), + .description = COMPOUND_STRING( + "Allures the foe to reduce\n" + "evasiveness."), .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_EVASION_DOWN_2 : EFFECT_EVASION_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -5439,9 +5662,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_TAIL] = { - .name = MOVE_NAME("Iron Tail"), - .description = COMPOUND_STRING("Attacks with a rock-hard\n" - "tail. May lower Defense."), + .name = COMPOUND_STRING("Iron Tail"), + .description = COMPOUND_STRING( + "Attacks with a rock-hard\n" + "tail. May lower Defense."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_STEEL, @@ -5464,9 +5688,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_CLAW] = { - .name = MOVE_NAME("Metal Claw"), - .description = COMPOUND_STRING("A claw attack that may\n" - "raise the user's Attack."), + .name = COMPOUND_STRING("Metal Claw"), + .description = COMPOUND_STRING( + "A claw attack that may\n" + "raise the user's Attack."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -5490,9 +5715,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VITAL_THROW] = { - .name = MOVE_NAME("Vital Throw"), - .description = COMPOUND_STRING("Makes the user's move last,\n" - "but it never misses."), + .name = COMPOUND_STRING("Vital Throw"), + .description = COMPOUND_STRING( + "Makes the user's move last,\n" + "but it never misses."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_FIGHTING, @@ -5510,9 +5736,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MORNING_SUN] = { - .name = MOVE_NAME("Morning Sun"), - .description = COMPOUND_STRING("Restores HP. The amount\n" - "varies with the weather."), + .name = COMPOUND_STRING("Morning Sun"), + .description = COMPOUND_STRING( + "Restores HP. The amount\n" + "varies with the weather."), .effect = EFFECT_MORNING_SUN, .power = 0, .type = TYPE_NORMAL, @@ -5534,9 +5761,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SYNTHESIS] = { - .name = MOVE_NAME("Synthesis"), - .description = COMPOUND_STRING("Restores HP. The amount\n" - "varies with the weather."), + .name = COMPOUND_STRING("Synthesis"), + .description = COMPOUND_STRING( + "Restores HP. The amount\n" + "varies with the weather."), .effect = EFFECT_SYNTHESIS, .power = 0, .type = TYPE_GRASS, @@ -5558,9 +5786,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MOONLIGHT] = { - .name = MOVE_NAME("Moonlight"), - .description = COMPOUND_STRING("Restores HP. The amount\n" - "varies with the weather."), + .name = COMPOUND_STRING("Moonlight"), + .description = COMPOUND_STRING( + "Restores HP. The amount\n" + "varies with the weather."), .effect = EFFECT_MOONLIGHT, .power = 0, .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, @@ -5582,9 +5811,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HIDDEN_POWER] = { - .name = MOVE_NAME("Hidden Power"), - .description = COMPOUND_STRING("The effectiveness varies\n" - "with the user."), + .name = COMPOUND_STRING("Hidden Power"), + .description = COMPOUND_STRING( + "The effectiveness varies\n" + "with the user."), .power = B_HIDDEN_POWER_DMG >= GEN_6 ? 60 : 1, .effect = EFFECT_HIDDEN_POWER, .type = TYPE_NORMAL, @@ -5601,9 +5831,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_CHOP] = { - .name = MOVE_NAME("Cross Chop"), - .description = COMPOUND_STRING("A double-chopping attack.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Cross Chop"), + .description = COMPOUND_STRING( + "A double-chopping attack.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -5622,9 +5853,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TWISTER] = { - .name = MOVE_NAME("Twister"), - .description = COMPOUND_STRING("Whips up a vicious twister\n" - "to tear at the foe."), + .name = COMPOUND_STRING("Twister"), + .description = COMPOUND_STRING( + "Whips up a vicious twister\n" + "to tear at the foe."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_DRAGON, @@ -5648,9 +5880,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAIN_DANCE] = { - .name = MOVE_NAME("Rain Dance"), - .description = COMPOUND_STRING("Boosts the power of Water-\n" - "type moves for 5 turns."), + .name = COMPOUND_STRING("Rain Dance"), + .description = COMPOUND_STRING( + "Boosts the power of Water-\n" + "type moves for 5 turns."), .effect = EFFECT_RAIN_DANCE, .power = 0, .type = TYPE_WATER, @@ -5670,9 +5903,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUNNY_DAY] = { - .name = MOVE_NAME("Sunny Day"), - .description = COMPOUND_STRING("Boosts the power of Fire-\n" - "type moves for 5 turns."), + .name = COMPOUND_STRING("Sunny Day"), + .description = COMPOUND_STRING( + "Boosts the power of Fire-\n" + "type moves for 5 turns."), .effect = EFFECT_SUNNY_DAY, .power = 0, .type = TYPE_FIRE, @@ -5692,13 +5926,14 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CRUNCH] = { - .name = MOVE_NAME("Crunch"), - .description = COMPOUND_STRING("Crunches with sharp fangs.\n" - #if B_UPDATED_MOVE_DATA >= GEN_4 - "May lower Defense."), - #else - "May lower Sp. Def."), - #endif + .name = COMPOUND_STRING("Crunch"), + .description = COMPOUND_STRING( + "Crunches with sharp fangs.\n" + #if B_UPDATED_MOVE_DATA >= GEN_4 + "May lower Defense."), + #else + "May lower Sp. Def."), + #endif .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -5726,9 +5961,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_COAT] = { - .name = MOVE_NAME("Mirror Coat"), - .description = COMPOUND_STRING("Counters the foe's special\n" - "attack at double the power."), + .name = COMPOUND_STRING("Mirror Coat"), + .description = COMPOUND_STRING( + "Counters the foe's special\n" + "attack at double the power."), .effect = EFFECT_MIRROR_COAT, .power = 1, .type = TYPE_PSYCHIC, @@ -5749,9 +5985,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCH_UP] = { - .name = MOVE_NAME("Psych Up"), - .description = COMPOUND_STRING("Copies the foe's effect(s)\n" - "and gives to the user."), + .name = COMPOUND_STRING("Psych Up"), + .description = COMPOUND_STRING( + "Copies the foe's effect(s)\n" + "and gives to the user."), .effect = EFFECT_PSYCH_UP, .power = 0, .type = TYPE_NORMAL, @@ -5774,8 +6011,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_SPEED] = { .name = HANDLE_EXPANDED_MOVE_NAME("ExtremeSpeed", "Extreme Speed"), - .description = COMPOUND_STRING("An extremely fast and\n" - "powerful attack."), + .description = COMPOUND_STRING( + "An extremely fast and\n" + "powerful attack."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -5794,8 +6032,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ANCIENT_POWER] = { .name = HANDLE_EXPANDED_MOVE_NAME("AncientPower", "Ancient Power"), - .description = COMPOUND_STRING("An attack that may raise\n" - "all stats."), + .description = COMPOUND_STRING( + "An attack that may raise\n" + "all stats."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_ROCK, @@ -5819,9 +6058,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BALL] = { - .name = MOVE_NAME("Shadow Ball"), - .description = COMPOUND_STRING("Hurls a black blob that may\n" - "lower the foe's Sp. Def."), + .name = COMPOUND_STRING("Shadow Ball"), + .description = COMPOUND_STRING( + "Hurls a black blob that may\n" + "lower the foe's Sp. Def."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GHOST, @@ -5844,9 +6084,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FUTURE_SIGHT] = { - .name = MOVE_NAME("Future Sight"), - .description = COMPOUND_STRING("Heightens inner power to\n" - "strike 2 turns later."), + .name = COMPOUND_STRING("Future Sight"), + .description = COMPOUND_STRING( + "Heightens inner power to\n" + "strike 2 turns later."), #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, #elif B_UPDATED_MOVE_DATA >= GEN_5 @@ -5871,9 +6112,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SMASH] = { - .name = MOVE_NAME("Rock Smash"), - .description = COMPOUND_STRING("A rock-crushing attack\n" - "that may lower Defense."), + .name = COMPOUND_STRING("Rock Smash"), + .description = COMPOUND_STRING( + "A rock-crushing attack\n" + "that may lower Defense."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 40 : 20, .type = TYPE_FIGHTING, @@ -5896,9 +6138,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLPOOL] = { - .name = MOVE_NAME("Whirlpool"), - .description = COMPOUND_STRING("Traps and hurts the foe in\n" - "a whirlpool for "BINDING_TURNS" turns."), + .name = COMPOUND_STRING("Whirlpool"), + .description = COMPOUND_STRING( + "Traps and hurts the foe in\n" + "a whirlpool for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_WATER, @@ -5919,9 +6162,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BEAT_UP] = { - .name = MOVE_NAME("Beat Up"), - .description = COMPOUND_STRING("Summons party Pokémon to\n" - "join in the attack."), + .name = COMPOUND_STRING("Beat Up"), + .description = COMPOUND_STRING( + "Summons party Pokémon to\n" + "join in the attack."), .effect = EFFECT_BEAT_UP, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 1 : 10, .type = TYPE_DARK, @@ -5938,9 +6182,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_OUT] = { - .name = MOVE_NAME("Fake Out"), - .description = COMPOUND_STRING("A 1st-turn, 1st-strike move\n" - "that causes flinching."), + .name = COMPOUND_STRING("Fake Out"), + .description = COMPOUND_STRING( + "A 1st-turn, 1st-strike move\n" + "that causes flinching."), .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 3 : 1, .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, .effect = EFFECT_FAKE_OUT, @@ -5963,7 +6208,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_UPROAR] = { - .name = MOVE_NAME("Uproar"), + .name = COMPOUND_STRING("Uproar"), .description = COMPOUND_STRING( #if B_UPROAR_TURNS >= GEN_5 "Causes an uproar for 2 to 5\n" @@ -5995,9 +6240,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STOCKPILE] = { - .name = MOVE_NAME("Stockpile"), - .description = COMPOUND_STRING("Charges up power for up to\n" - "3 turns."), + .name = COMPOUND_STRING("Stockpile"), + .description = COMPOUND_STRING( + "Charges up power for up to\n" + "3 turns."), .effect = EFFECT_STOCKPILE, .power = 0, .type = TYPE_NORMAL, @@ -6018,9 +6264,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIT_UP] = { - .name = MOVE_NAME("Spit Up"), - .description = COMPOUND_STRING("Releases stockpiled power\n" - "(the more the better)."), + .name = COMPOUND_STRING("Spit Up"), + .description = COMPOUND_STRING( + "Releases stockpiled power\n" + "(the more the better)."), .effect = EFFECT_SPIT_UP, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 1 : 100, .type = TYPE_NORMAL, @@ -6038,9 +6285,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SWALLOW] = { - .name = MOVE_NAME("Swallow"), - .description = COMPOUND_STRING("Absorbs stockpiled power\n" - "and restores HP."), + .name = COMPOUND_STRING("Swallow"), + .description = COMPOUND_STRING( + "Absorbs stockpiled power\n" + "and restores HP."), .effect = EFFECT_SWALLOW, .power = 0, .type = TYPE_NORMAL, @@ -6062,9 +6310,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_WAVE] = { - .name = MOVE_NAME("Heat Wave"), - .description = COMPOUND_STRING("Exhales a hot breath on the\n" - "foe. May inflict a burn."), + .name = COMPOUND_STRING("Heat Wave"), + .description = COMPOUND_STRING( + "Exhales a hot breath on the\n" + "foe. May inflict a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 95 : 100, .type = TYPE_FIRE, @@ -6087,9 +6336,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HAIL] = { - .name = MOVE_NAME("Hail"), - .description = COMPOUND_STRING("Summons a hailstorm that\n" - "strikes every turn."), + .name = COMPOUND_STRING("Hail"), + .description = COMPOUND_STRING( + "Summons a hailstorm that\n" + "strikes every turn."), .effect = EFFECT_HAIL, .power = 0, .type = TYPE_ICE, @@ -6109,9 +6359,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TORMENT] = { - .name = MOVE_NAME("Torment"), - .description = COMPOUND_STRING("Torments the foe and stops\n" - "successive use of a move."), + .name = COMPOUND_STRING("Torment"), + .description = COMPOUND_STRING( + "Torments the foe and stops\n" + "successive use of a move."), .effect = EFFECT_TORMENT, .power = 0, .type = TYPE_DARK, @@ -6130,9 +6381,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLATTER] = { - .name = MOVE_NAME("Flatter"), - .description = COMPOUND_STRING("Confuses the foe, but\n" - "raises its Sp. Atk."), + .name = COMPOUND_STRING("Flatter"), + .description = COMPOUND_STRING( + "Confuses the foe, but\n" + "raises its Sp. Atk."), .effect = EFFECT_FLATTER, .power = 0, .type = TYPE_DARK, @@ -6151,9 +6403,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WILL_O_WISP] = { - .name = MOVE_NAME("Will-o-Wisp"), - .description = COMPOUND_STRING("Inflicts a burn on the foe\n" - "with intense fire."), + .name = COMPOUND_STRING("Will-o-Wisp"), + .description = COMPOUND_STRING( + "Inflicts a burn on the foe\n" + "with intense fire."), .effect = EFFECT_WILL_O_WISP, .power = 0, .type = TYPE_FIRE, @@ -6172,9 +6425,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MEMENTO] = { - .name = MOVE_NAME("Memento"), - .description = COMPOUND_STRING("The user faints and lowers\n" - "the foe's abilities."), + .name = COMPOUND_STRING("Memento"), + .description = COMPOUND_STRING( + "The user faints and lowers\n" + "the foe's abilities."), .effect = EFFECT_MEMENTO, .power = 0, .type = TYPE_DARK, @@ -6192,9 +6446,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FACADE] = { - .name = MOVE_NAME("Facade"), - .description = COMPOUND_STRING("Boosts Attack when burned,\n" - "paralyzed, or poisoned."), + .name = COMPOUND_STRING("Facade"), + .description = COMPOUND_STRING( + "Boosts Attack when burned,\n" + "paralyzed, or poisoned."), .effect = EFFECT_FACADE, .power = 70, .type = TYPE_NORMAL, @@ -6212,9 +6467,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_PUNCH] = { - .name = MOVE_NAME("Focus Punch"), - .description = COMPOUND_STRING("A powerful loyalty attack.\n" - "The user flinches if hit."), + .name = COMPOUND_STRING("Focus Punch"), + .description = COMPOUND_STRING( + "A powerful loyalty attack.\n" + "The user flinches if hit."), .effect = EFFECT_FOCUS_PUNCH, .power = 150, .type = TYPE_FIGHTING, @@ -6241,8 +6497,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SMELLING_SALTS] = { .name = HANDLE_EXPANDED_MOVE_NAME("SmellngSalts", "Smelling Salts"), - .description = COMPOUND_STRING("Powerful against paralyzed\n" - "foes, but also heals them."), + .description = COMPOUND_STRING( + "Powerful against paralyzed\n" + "foes, but also heals them."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 70 : 60, .type = TYPE_NORMAL, @@ -6264,9 +6521,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FOLLOW_ME] = { - .name = MOVE_NAME("Follow Me"), - .description = COMPOUND_STRING("Draws attention to make\n" - "foes attack only the user."), + .name = COMPOUND_STRING("Follow Me"), + .description = COMPOUND_STRING( + "Draws attention to make\n" + "foes attack only the user."), .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_NORMAL, @@ -6289,9 +6547,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NATURE_POWER] = { - .name = MOVE_NAME("Nature Power"), - .description = COMPOUND_STRING("The type of attack varies\n" - "depending on the location."), + .name = COMPOUND_STRING("Nature Power"), + .description = COMPOUND_STRING( + "The type of attack varies\n" + "depending on the location."), .effect = EFFECT_NATURE_POWER, .power = 1, .type = TYPE_NORMAL, @@ -6315,9 +6574,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE] = { - .name = MOVE_NAME("Charge"), - .description = COMPOUND_STRING("Charges power to boost the\n" - "electric move used next."), + .name = COMPOUND_STRING("Charge"), + .description = COMPOUND_STRING( + "Charges power to boost the\n" + "electric move used next."), .effect = EFFECT_CHARGE, .power = 0, .type = TYPE_ELECTRIC, @@ -6338,9 +6598,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TAUNT] = { - .name = MOVE_NAME("Taunt"), - .description = COMPOUND_STRING("Taunts the foe into only\n" - "using attack moves."), + .name = COMPOUND_STRING("Taunt"), + .description = COMPOUND_STRING( + "Taunts the foe into only\n" + "using attack moves."), .effect = EFFECT_TAUNT, .power = 0, .type = TYPE_DARK, @@ -6360,9 +6621,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HELPING_HAND] = { - .name = MOVE_NAME("Helping Hand"), - .description = COMPOUND_STRING("Boosts the power of the\n" - "recipient's moves."), + .name = COMPOUND_STRING("Helping Hand"), + .description = COMPOUND_STRING( + "Boosts the power of the\n" + "recipient's moves."), .effect = EFFECT_HELPING_HAND, .power = 0, .type = TYPE_NORMAL, @@ -6386,9 +6648,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK] = { - .name = MOVE_NAME("Trick"), - .description = COMPOUND_STRING("Tricks the foe into trading\n" - "held items."), + .name = COMPOUND_STRING("Trick"), + .description = COMPOUND_STRING( + "Tricks the foe into trading\n" + "held items."), .effect = EFFECT_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -6409,9 +6672,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROLE_PLAY] = { - .name = MOVE_NAME("Role Play"), - .description = COMPOUND_STRING("Mimics the target and\n" - "copies its special ability."), + .name = COMPOUND_STRING("Role Play"), + .description = COMPOUND_STRING( + "Mimics the target and\n" + "copies its special ability."), .effect = EFFECT_ROLE_PLAY, .power = 0, .type = TYPE_PSYCHIC, @@ -6432,9 +6696,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WISH] = { - .name = MOVE_NAME("Wish"), - .description = COMPOUND_STRING("A wish that restores HP.\n" - "It takes time to work."), + .name = COMPOUND_STRING("Wish"), + .description = COMPOUND_STRING( + "A wish that restores HP.\n" + "It takes time to work."), .effect = EFFECT_WISH, .power = 0, .type = TYPE_NORMAL, @@ -6456,9 +6721,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ASSIST] = { - .name = MOVE_NAME("Assist"), - .description = COMPOUND_STRING("Attacks randomly with one\n" - "of the partner's moves."), + .name = COMPOUND_STRING("Assist"), + .description = COMPOUND_STRING( + "Attacks randomly with one\n" + "of the partner's moves."), .effect = EFFECT_ASSIST, .power = 0, .type = TYPE_NORMAL, @@ -6484,9 +6750,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_INGRAIN] = { - .name = MOVE_NAME("Ingrain"), - .description = COMPOUND_STRING("Lays roots that restore HP.\n" - "The user can't switch out."), + .name = COMPOUND_STRING("Ingrain"), + .description = COMPOUND_STRING( + "Lays roots that restore HP.\n" + "The user can't switch out."), .effect = EFFECT_INGRAIN, .power = 0, .type = TYPE_GRASS, @@ -6508,9 +6775,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERPOWER] = { - .name = MOVE_NAME("Superpower"), - .description = COMPOUND_STRING("Boosts strength sharply,\n" - "but lowers abilities."), + .name = COMPOUND_STRING("Superpower"), + .description = COMPOUND_STRING( + "Boosts strength sharply,\n" + "but lowers abilities."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIGHTING, @@ -6532,9 +6800,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_COAT] = { - .name = MOVE_NAME("Magic Coat"), - .description = COMPOUND_STRING("Reflects special effects\n" - "back to the attacker."), + .name = COMPOUND_STRING("Magic Coat"), + .description = COMPOUND_STRING( + "Reflects special effects\n" + "back to the attacker."), .effect = EFFECT_MAGIC_COAT, .power = 0, .type = TYPE_PSYCHIC, @@ -6554,9 +6823,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RECYCLE] = { - .name = MOVE_NAME("Recycle"), - .description = COMPOUND_STRING("Recycles a used item for\n" - "one more use."), + .name = COMPOUND_STRING("Recycle"), + .description = COMPOUND_STRING( + "Recycles a used item for\n" + "one more use."), .effect = EFFECT_RECYCLE, .power = 0, .type = TYPE_NORMAL, @@ -6577,7 +6847,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REVENGE] = { - .name = MOVE_NAME("Revenge"), + .name = COMPOUND_STRING("Revenge"), .description = sRevengeDescription, .effect = EFFECT_REVENGE, .power = 60, @@ -6596,9 +6866,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BRICK_BREAK] = { - .name = MOVE_NAME("Brick Break"), - .description = COMPOUND_STRING("Destroys barriers such as\n" - "REFLECT and causes damage."), + .name = COMPOUND_STRING("Brick Break"), + .description = COMPOUND_STRING( + "Destroys barriers such as\n" + "REFLECT and causes damage."), .effect = EFFECT_BRICK_BREAK, .power = 75, .type = TYPE_FIGHTING, @@ -6616,9 +6887,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_YAWN] = { - .name = MOVE_NAME("Yawn"), - .description = COMPOUND_STRING("Lulls the foe into yawning,\n" - "then sleeping next turn."), + .name = COMPOUND_STRING("Yawn"), + .description = COMPOUND_STRING( + "Lulls the foe into yawning,\n" + "then sleeping next turn."), .effect = EFFECT_YAWN, .power = 0, .type = TYPE_NORMAL, @@ -6637,9 +6909,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_KNOCK_OFF] = { - .name = MOVE_NAME("Knock Off"), - .description = COMPOUND_STRING("Knocks down the foe's held\n" - "item to prevent its use."), + .name = COMPOUND_STRING("Knock Off"), + .description = COMPOUND_STRING( + "Knocks down the foe's held\n" + "item to prevent its use."), .effect = EFFECT_KNOCK_OFF, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 20, .type = TYPE_DARK, @@ -6660,9 +6933,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ENDEAVOR] = { - .name = MOVE_NAME("Endeavor"), - .description = COMPOUND_STRING("Gains power if the user's HP\n" - "is lower than the foe's HP."), + .name = COMPOUND_STRING("Endeavor"), + .description = COMPOUND_STRING( + "Gains power if the user's HP\n" + "is lower than the foe's HP."), .effect = EFFECT_ENDEAVOR, .power = 1, .type = TYPE_NORMAL, @@ -6681,9 +6955,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ERUPTION] = { - .name = MOVE_NAME("Eruption"), - .description = COMPOUND_STRING("The higher the user's HP,\n" - "the more damage caused."), + .name = COMPOUND_STRING("Eruption"), + .description = COMPOUND_STRING( + "The higher the user's HP,\n" + "the more damage caused."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_FIRE, @@ -6700,9 +6975,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SKILL_SWAP] = { - .name = MOVE_NAME("Skill Swap"), - .description = COMPOUND_STRING("The user swaps special\n" - "abilities with the target."), + .name = COMPOUND_STRING("Skill Swap"), + .description = COMPOUND_STRING( + "The user swaps special\n" + "abilities with the target."), .effect = EFFECT_SKILL_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -6721,9 +6997,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_IMPRISON] = { - .name = MOVE_NAME("Imprison"), - .description = COMPOUND_STRING("Prevents foes from using\n" - "moves known by the user."), + .name = COMPOUND_STRING("Imprison"), + .description = COMPOUND_STRING( + "Prevents foes from using\n" + "moves known by the user."), .effect = EFFECT_IMPRISON, .power = 0, .type = TYPE_PSYCHIC, @@ -6746,9 +7023,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REFRESH] = { - .name = MOVE_NAME("Refresh"), - .description = COMPOUND_STRING("Heals poisoning, paralysis,\n" - "or a burn."), + .name = COMPOUND_STRING("Refresh"), + .description = COMPOUND_STRING( + "Heals poisoning, paralysis,\n" + "or a burn."), .effect = EFFECT_REFRESH, .power = 0, .type = TYPE_NORMAL, @@ -6769,9 +7047,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRUDGE] = { - .name = MOVE_NAME("Grudge"), - .description = COMPOUND_STRING("If the user faints, deletes\n" - "all PP of foe's last move."), + .name = COMPOUND_STRING("Grudge"), + .description = COMPOUND_STRING( + "If the user faints, deletes\n" + "all PP of foe's last move."), .effect = EFFECT_GRUDGE, .power = 0, .type = TYPE_GHOST, @@ -6792,9 +7071,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SNATCH] = { - .name = MOVE_NAME("Snatch"), - .description = COMPOUND_STRING("Steals the effects of the\n" - "move the target uses next."), + .name = COMPOUND_STRING("Snatch"), + .description = COMPOUND_STRING( + "Steals the effects of the\n" + "move the target uses next."), .effect = EFFECT_SNATCH, .power = 0, .type = TYPE_DARK, @@ -6817,9 +7097,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_POWER] = { - .name = MOVE_NAME("Secret Power"), - .description = COMPOUND_STRING("An attack with effects\n" - "that vary by location."), + .name = COMPOUND_STRING("Secret Power"), + .description = COMPOUND_STRING( + "An attack with effects\n" + "that vary by location."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_NORMAL, @@ -6841,9 +7122,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DIVE] = { - .name = MOVE_NAME("Dive"), - .description = COMPOUND_STRING("Dives underwater the first\n" - "turn and strikes next turn."), + .name = COMPOUND_STRING("Dive"), + .description = COMPOUND_STRING( + "Dives underwater the first\n" + "turn and strikes next turn."), .effect = EFFECT_SEMI_INVULNERABLE, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 80 : 60, .type = TYPE_WATER, @@ -6866,9 +7148,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ARM_THRUST] = { - .name = MOVE_NAME("Arm Thrust"), - .description = COMPOUND_STRING("Straight-arm punches that\n" - "strike the foe 2 to 5 times."), + .name = COMPOUND_STRING("Arm Thrust"), + .description = COMPOUND_STRING( + "Straight-arm punches that\n" + "strike the foe 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_FIGHTING, @@ -6886,9 +7169,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CAMOUFLAGE] = { - .name = MOVE_NAME("Camouflage"), - .description = COMPOUND_STRING("Alters the Pokémon's type\n" - "depending on the location."), + .name = COMPOUND_STRING("Camouflage"), + .description = COMPOUND_STRING( + "Alters the Pokémon's type\n" + "depending on the location."), .effect = EFFECT_CAMOUFLAGE, .power = 0, .type = TYPE_NORMAL, @@ -6909,9 +7193,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_GLOW] = { - .name = MOVE_NAME("Tail Glow"), - .description = COMPOUND_STRING("Flashes a light that sharply\n" - "raises Sp. Atk."), + .name = COMPOUND_STRING("Tail Glow"), + .description = COMPOUND_STRING( + "Flashes a light that sharply\n" + "raises Sp. Atk."), .effect = B_UPDATED_MOVE_DATA >= GEN_5 ? EFFECT_SPECIAL_ATTACK_UP_3 : EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, .type = TYPE_BUG, @@ -6932,9 +7217,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LUSTER_PURGE] = { - .name = MOVE_NAME("Luster Purge"), - .description = COMPOUND_STRING("Attacks with a burst of\n" - "light. May lower Sp. Def."), + .name = COMPOUND_STRING("Luster Purge"), + .description = COMPOUND_STRING( + "Attacks with a burst of\n" + "light. May lower Sp. Def."), .effect = EFFECT_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, @@ -6956,9 +7242,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIST_BALL] = { - .name = MOVE_NAME("Mist Ball"), - .description = COMPOUND_STRING("Attacks with a flurry of\n" - "down. May lower Sp. Atk."), + .name = COMPOUND_STRING("Mist Ball"), + .description = COMPOUND_STRING( + "Attacks with a flurry of\n" + "down. May lower Sp. Atk."), .effect = EFFECT_HIT, .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, @@ -6982,8 +7269,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FEATHER_DANCE] = { .name = HANDLE_EXPANDED_MOVE_NAME("FeatherDance", "Feather Dance"), - .description = COMPOUND_STRING("Envelops the foe with down\n" - "to sharply reduce Attack."), + .description = COMPOUND_STRING( + "Envelops the foe with down\n" + "to sharply reduce Attack."), .effect = EFFECT_ATTACK_DOWN_2, .power = 0, .type = TYPE_FLYING, @@ -7003,9 +7291,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TEETER_DANCE] = { - .name = MOVE_NAME("Teeter Dance"), - .description = COMPOUND_STRING("Confuses all Pokémon on\n" - "the scene."), + .name = COMPOUND_STRING("Teeter Dance"), + .description = COMPOUND_STRING( + "Confuses all Pokémon on\n" + "the scene."), .effect = EFFECT_TEETER_DANCE, .power = 0, .type = TYPE_NORMAL, @@ -7025,9 +7314,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZE_KICK] = { - .name = MOVE_NAME("Blaze Kick"), - .description = COMPOUND_STRING("A kick with a high critical-\n" - "hit ratio. May cause a burn."), + .name = COMPOUND_STRING("Blaze Kick"), + .description = COMPOUND_STRING( + "A kick with a high critical-\n" + "hit ratio. May cause a burn."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_FIRE, @@ -7051,9 +7341,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SPORT] = { - .name = MOVE_NAME("Mud Sport"), - .description = COMPOUND_STRING("Covers the user in mud to\n" - "raise electrical resistance."), + .name = COMPOUND_STRING("Mud Sport"), + .description = COMPOUND_STRING( + "Covers the user in mud to\n" + "raise electrical resistance."), .effect = EFFECT_MUD_SPORT, .power = 0, .type = TYPE_GROUND, @@ -7074,9 +7365,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BALL] = { - .name = MOVE_NAME("Ice Ball"), - .description = COMPOUND_STRING("A 5-turn attack that gains\n" - "power on successive hits."), + .name = COMPOUND_STRING("Ice Ball"), + .description = COMPOUND_STRING( + "A 5-turn attack that gains\n" + "power on successive hits."), .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ICE, @@ -7097,9 +7389,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NEEDLE_ARM] = { - .name = MOVE_NAME("Needle Arm"), - .description = COMPOUND_STRING("Attacks with thorny arms.\n" - "May cause flinching."), + .name = COMPOUND_STRING("Needle Arm"), + .description = COMPOUND_STRING( + "Attacks with thorny arms.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GRASS, @@ -7123,9 +7416,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SLACK_OFF] = { - .name = MOVE_NAME("Slack Off"), - .description = COMPOUND_STRING("Slacks off and restores\n" - "half the maximum HP."), + .name = COMPOUND_STRING("Slack Off"), + .description = COMPOUND_STRING( + "Slacks off and restores\n" + "half the maximum HP."), .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_NORMAL, @@ -7147,9 +7441,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_VOICE] = { - .name = MOVE_NAME("Hyper Voice"), - .description = COMPOUND_STRING("A loud attack that uses\n" - "sound waves to injure."), + .name = COMPOUND_STRING("Hyper Voice"), + .description = COMPOUND_STRING( + "A loud attack that uses\n" + "sound waves to injure."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -7168,9 +7463,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_FANG] = { - .name = MOVE_NAME("Poison Fang"), - .description = COMPOUND_STRING("A sharp-fanged attack.\n" - "May badly poison the foe."), + .name = COMPOUND_STRING("Poison Fang"), + .description = COMPOUND_STRING( + "A sharp-fanged attack.\n" + "May badly poison the foe."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_POISON, @@ -7194,9 +7490,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_CLAW] = { - .name = MOVE_NAME("Crush Claw"), - .description = COMPOUND_STRING("Tears at the foe with sharp\n" - "claws. May lower Defense."), + .name = COMPOUND_STRING("Crush Claw"), + .description = COMPOUND_STRING( + "Tears at the foe with sharp\n" + "claws. May lower Defense."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_NORMAL, @@ -7219,9 +7516,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLAST_BURN] = { - .name = MOVE_NAME("Blast Burn"), - .description = COMPOUND_STRING("Powerful, but leaves the\n" - "user immobile the next turn."), + .name = COMPOUND_STRING("Blast Burn"), + .description = COMPOUND_STRING( + "Powerful, but leaves the\n" + "user immobile the next turn."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_FIRE, @@ -7242,9 +7540,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_CANNON] = { - .name = MOVE_NAME("Hydro Cannon"), - .description = COMPOUND_STRING("Powerful, but leaves the\n" - "user immobile the next turn."), + .name = COMPOUND_STRING("Hydro Cannon"), + .description = COMPOUND_STRING( + "Powerful, but leaves the\n" + "user immobile the next turn."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_WATER, @@ -7265,9 +7564,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_MASH] = { - .name = MOVE_NAME("Meteor Mash"), - .description = COMPOUND_STRING("Fires a meteor-like punch.\n" - "May raise Attack."), + .name = COMPOUND_STRING("Meteor Mash"), + .description = COMPOUND_STRING( + "Fires a meteor-like punch.\n" + "May raise Attack."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 100, .type = TYPE_STEEL, @@ -7292,9 +7592,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ASTONISH] = { - .name = MOVE_NAME("Astonish"), - .description = COMPOUND_STRING("An attack that may shock\n" - "the foe into flinching."), + .name = COMPOUND_STRING("Astonish"), + .description = COMPOUND_STRING( + "An attack that may shock\n" + "the foe into flinching."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_GHOST, @@ -7318,9 +7619,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WEATHER_BALL] = { - .name = MOVE_NAME("Weather Ball"), - .description = COMPOUND_STRING("The move's type and power\n" - "change with the weather."), + .name = COMPOUND_STRING("Weather Ball"), + .description = COMPOUND_STRING( + "The move's type and power\n" + "change with the weather."), .effect = EFFECT_WEATHER_BALL, .power = 50, .type = TYPE_NORMAL, @@ -7338,9 +7640,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATHERAPY] = { - .name = MOVE_NAME("Aromatherapy"), - .description = COMPOUND_STRING("Heals all status problems\n" - "with a soothing scent."), + .name = COMPOUND_STRING("Aromatherapy"), + .description = COMPOUND_STRING( + "Heals all status problems\n" + "with a soothing scent."), .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_GRASS, @@ -7361,9 +7664,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_TEARS] = { - .name = MOVE_NAME("Fake Tears"), - .description = COMPOUND_STRING("Feigns crying to sharply\n" - "lower the foe's Sp. Def."), + .name = COMPOUND_STRING("Fake Tears"), + .description = COMPOUND_STRING( + "Feigns crying to sharply\n" + "lower the foe's Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_DARK, @@ -7382,9 +7686,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_CUTTER] = { - .name = MOVE_NAME("Air Cutter"), - .description = COMPOUND_STRING("Hacks with razorlike wind.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Air Cutter"), + .description = COMPOUND_STRING( + "Hacks with razorlike wind.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 55, .type = TYPE_FLYING, @@ -7404,9 +7709,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OVERHEAT] = { - .name = MOVE_NAME("Overheat"), - .description = COMPOUND_STRING("Allows a full-power attack,\n" - "but sharply lowers Sp. Atk."), + .name = COMPOUND_STRING("Overheat"), + .description = COMPOUND_STRING( + "Allows a full-power attack,\n" + "but sharply lowers Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, .type = TYPE_FIRE, @@ -7428,9 +7734,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ODOR_SLEUTH] = { - .name = MOVE_NAME("Odor Sleuth"), - .description = COMPOUND_STRING("Negates the foe's efforts\n" - "to heighten evasiveness."), + .name = COMPOUND_STRING("Odor Sleuth"), + .description = COMPOUND_STRING( + "Negates the foe's efforts\n" + "to heighten evasiveness."), .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, @@ -7450,9 +7757,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_TOMB] = { - .name = MOVE_NAME("Rock Tomb"), - .description = COMPOUND_STRING("Stops the foe from moving\n" - "with rocks and cuts Speed."), + .name = COMPOUND_STRING("Rock Tomb"), + .description = COMPOUND_STRING( + "Stops the foe from moving\n" + "with rocks and cuts Speed."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 50, .type = TYPE_ROCK, @@ -7474,9 +7782,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SILVER_WIND] = { - .name = MOVE_NAME("Silver Wind"), - .description = COMPOUND_STRING("A powdery attack that may\n" - "raise abilities."), + .name = COMPOUND_STRING("Silver Wind"), + .description = COMPOUND_STRING( + "A powdery attack that may\n" + "raise abilities."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_BUG, @@ -7500,9 +7809,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_SOUND] = { - .name = MOVE_NAME("Metal Sound"), - .description = COMPOUND_STRING("Emits a horrible screech\n" - "that sharply lowers Sp. Def."), + .name = COMPOUND_STRING("Metal Sound"), + .description = COMPOUND_STRING( + "Emits a horrible screech\n" + "that sharply lowers Sp. Def."), .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_STEEL, @@ -7524,8 +7834,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_WHISTLE] = { .name = HANDLE_EXPANDED_MOVE_NAME("GrassWhistle", "Grass Whistle"), - .description = COMPOUND_STRING("Lulls the foe into sleep\n" - "with a pleasant melody."), + .description = COMPOUND_STRING( + "Lulls the foe into sleep\n" + "with a pleasant melody."), .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -7546,9 +7857,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TICKLE] = { - .name = MOVE_NAME("Tickle"), - .description = COMPOUND_STRING("Makes the foe laugh to\n" - "lower Attack and Defense."), + .name = COMPOUND_STRING("Tickle"), + .description = COMPOUND_STRING( + "Makes the foe laugh to\n" + "lower Attack and Defense."), .effect = EFFECT_TICKLE, .power = 0, .type = TYPE_NORMAL, @@ -7567,9 +7879,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COSMIC_POWER] = { - .name = MOVE_NAME("Cosmic Power"), - .description = COMPOUND_STRING("Raises Defense and Sp. Def\n" - "with a mystic power."), + .name = COMPOUND_STRING("Cosmic Power"), + .description = COMPOUND_STRING( + "Raises Defense and Sp. Def\n" + "with a mystic power."), .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_PSYCHIC, @@ -7590,9 +7903,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPOUT] = { - .name = MOVE_NAME("Water Spout"), - .description = COMPOUND_STRING("Inflicts more damage if the\n" - "user's HP is high."), + .name = COMPOUND_STRING("Water Spout"), + .description = COMPOUND_STRING( + "Inflicts more damage if the\n" + "user's HP is high."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_WATER, @@ -7609,9 +7923,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SIGNAL_BEAM] = { - .name = MOVE_NAME("Signal Beam"), - .description = COMPOUND_STRING("A strange beam attack that\n" - "may confuse the foe."), + .name = COMPOUND_STRING("Signal Beam"), + .description = COMPOUND_STRING( + "A strange beam attack that\n" + "may confuse the foe."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_BUG, @@ -7633,9 +7948,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_PUNCH] = { - .name = MOVE_NAME("Shadow Punch"), - .description = COMPOUND_STRING("An unavoidable punch that\n" - "is thrown from shadows."), + .name = COMPOUND_STRING("Shadow Punch"), + .description = COMPOUND_STRING( + "An unavoidable punch that\n" + "is thrown from shadows."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GHOST, @@ -7654,9 +7970,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EXTRASENSORY] = { - .name = MOVE_NAME("Extrasensory"), - .description = COMPOUND_STRING("Attacks with a peculiar\n" - "power. May cause flinching."), + .name = COMPOUND_STRING("Extrasensory"), + .description = COMPOUND_STRING( + "Attacks with a peculiar\n" + "power. May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -7679,9 +7996,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_UPPERCUT] = { - .name = MOVE_NAME("Sky Uppercut"), - .description = COMPOUND_STRING("An uppercut thrown as if\n" - "leaping into the sky."), + .name = COMPOUND_STRING("Sky Uppercut"), + .description = COMPOUND_STRING( + "An uppercut thrown as if\n" + "leaping into the sky."), .effect = EFFECT_SKY_UPPERCUT, .power = 85, .type = TYPE_FIGHTING, @@ -7701,9 +8019,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_TOMB] = { - .name = MOVE_NAME("Sand Tomb"), - .description = COMPOUND_STRING("Traps and hurts the foe in\n" - "quicksand for "BINDING_TURNS" turns."), + .name = COMPOUND_STRING("Sand Tomb"), + .description = COMPOUND_STRING( + "Traps and hurts the foe in\n" + "quicksand for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_GROUND, @@ -7723,9 +8042,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHEER_COLD] = { - .name = MOVE_NAME("Sheer Cold"), - .description = COMPOUND_STRING("A chilling attack that\n" - "causes fainting if it hits."), + .name = COMPOUND_STRING("Sheer Cold"), + .description = COMPOUND_STRING( + "A chilling attack that\n" + "causes fainting if it hits."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_ICE, @@ -7742,9 +8062,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MUDDY_WATER] = { - .name = MOVE_NAME("Muddy Water"), - .description = COMPOUND_STRING("Attacks with muddy water.\n" - "May lower accuracy."), + .name = COMPOUND_STRING("Muddy Water"), + .description = COMPOUND_STRING( + "Attacks with muddy water.\n" + "May lower accuracy."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_WATER, @@ -7767,9 +8088,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_SEED] = { - .name = MOVE_NAME("Bullet Seed"), - .description = COMPOUND_STRING("Shoots 2 to 5 seeds in a row\n" - "to strike the foe."), + .name = COMPOUND_STRING("Bullet Seed"), + .description = COMPOUND_STRING( + "Shoots 2 to 5 seeds in a row\n" + "to strike the foe."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 25 : 10, .type = TYPE_GRASS, @@ -7787,9 +8109,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AERIAL_ACE] = { - .name = MOVE_NAME("Aerial Ace"), - .description = COMPOUND_STRING("An extremely speedy and\n" - "unavoidable attack."), + .name = COMPOUND_STRING("Aerial Ace"), + .description = COMPOUND_STRING( + "An extremely speedy and\n" + "unavoidable attack."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -7808,9 +8131,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_SPEAR] = { - .name = MOVE_NAME("Icicle Spear"), - .description = COMPOUND_STRING("Attacks the foe by firing\n" - "2 to 5 icicles in a row."), + .name = COMPOUND_STRING("Icicle Spear"), + .description = COMPOUND_STRING( + "Attacks the foe by firing\n" + "2 to 5 icicles in a row."), .effect = EFFECT_MULTI_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 25 : 10, .type = TYPE_ICE, @@ -7827,9 +8151,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_DEFENSE] = { - .name = MOVE_NAME("Iron Defense"), - .description = COMPOUND_STRING("Hardens the body's surface\n" - "to sharply raise Defense."), + .name = COMPOUND_STRING("Iron Defense"), + .description = COMPOUND_STRING( + "Hardens the body's surface\n" + "to sharply raise Defense."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -7850,9 +8175,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLOCK] = { - .name = MOVE_NAME("Block"), - .description = COMPOUND_STRING("Blocks the foe's way to\n" - "prevent escape."), + .name = COMPOUND_STRING("Block"), + .description = COMPOUND_STRING( + "Blocks the foe's way to\n" + "prevent escape."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -7872,9 +8198,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HOWL] = { - .name = MOVE_NAME("Howl"), - .description = COMPOUND_STRING("Howls to raise the spirit\n" - "and boosts Attack."), + .name = COMPOUND_STRING("Howl"), + .description = COMPOUND_STRING( + "Howls to raise the spirit\n" + "and boosts Attack."), .power = 0, .effect = B_UPDATED_MOVE_DATA >= GEN_8 ? EFFECT_ATTACK_UP_USER_ALLY : EFFECT_ATTACK_UP, .type = TYPE_NORMAL, @@ -7896,9 +8223,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CLAW] = { - .name = MOVE_NAME("Dragon Claw"), - .description = COMPOUND_STRING("Slashes the foe with sharp\n" - "claws."), + .name = COMPOUND_STRING("Dragon Claw"), + .description = COMPOUND_STRING( + "Slashes the foe with sharp\n" + "claws."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DRAGON, @@ -7916,9 +8244,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FRENZY_PLANT] = { - .name = MOVE_NAME("Frenzy Plant"), - .description = COMPOUND_STRING("Powerful, but leaves the\n" - "user immobile the next turn."), + .name = COMPOUND_STRING("Frenzy Plant"), + .description = COMPOUND_STRING( + "Powerful, but leaves the\n" + "user immobile the next turn."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_GRASS, @@ -7940,9 +8269,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BULK_UP] = { - .name = MOVE_NAME("Bulk Up"), - .description = COMPOUND_STRING("Bulks up the body to boost\n" - "both Attack and Defense."), + .name = COMPOUND_STRING("Bulk Up"), + .description = COMPOUND_STRING( + "Bulks up the body to boost\n" + "both Attack and Defense."), .effect = EFFECT_BULK_UP, .power = 0, .type = TYPE_FIGHTING, @@ -7963,9 +8293,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCE] = { - .name = MOVE_NAME("Bounce"), - .description = COMPOUND_STRING("Bounces up, then down the\n" - "next turn. May paralyze."), + .name = COMPOUND_STRING("Bounce"), + .description = COMPOUND_STRING( + "Bounces up, then down the\n" + "next turn. May paralyze."), .effect = EFFECT_SEMI_INVULNERABLE, .power = 85, .type = TYPE_FLYING, @@ -7993,9 +8324,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_SHOT] = { - .name = MOVE_NAME("Mud Shot"), - .description = COMPOUND_STRING("Hurls mud at the foe and\n" - "reduces Speed."), + .name = COMPOUND_STRING("Mud Shot"), + .description = COMPOUND_STRING( + "Hurls mud at the foe and\n" + "reduces Speed."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_GROUND, @@ -8017,9 +8349,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_TAIL] = { - .name = MOVE_NAME("Poison Tail"), - .description = COMPOUND_STRING("Has a high critical-hit\n" - "ratio. May also poison."), + .name = COMPOUND_STRING("Poison Tail"), + .description = COMPOUND_STRING( + "Has a high critical-hit\n" + "ratio. May also poison."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_POISON, @@ -8043,9 +8376,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COVET] = { - .name = MOVE_NAME("Covet"), - .description = COMPOUND_STRING("Cutely begs to obtain an\n" - "item held by the foe."), + .name = COMPOUND_STRING("Covet"), + .description = COMPOUND_STRING( + "Cutely begs to obtain an\n" + "item held by the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 60 : 40, .type = TYPE_NORMAL, @@ -8070,9 +8404,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_TACKLE] = { - .name = MOVE_NAME("Volt Tackle"), - .description = COMPOUND_STRING("A life-risking tackle that\n" - "slightly hurts the user."), + .name = COMPOUND_STRING("Volt Tackle"), + .description = COMPOUND_STRING( + "A life-risking tackle that\n" + "slightly hurts the user."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_ELECTRIC, @@ -8098,9 +8433,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_LEAF] = { - .name = MOVE_NAME("Magical Leaf"), - .description = COMPOUND_STRING("Attacks with a strange leaf\n" - "that cannot be evaded."), + .name = COMPOUND_STRING("Magical Leaf"), + .description = COMPOUND_STRING( + "Attacks with a strange leaf\n" + "that cannot be evaded."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GRASS, @@ -8117,9 +8453,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SPORT] = { - .name = MOVE_NAME("Water Sport"), - .description = COMPOUND_STRING("The user becomes soaked to\n" - "raise resistance to fire."), + .name = COMPOUND_STRING("Water Sport"), + .description = COMPOUND_STRING( + "The user becomes soaked to\n" + "raise resistance to fire."), .effect = EFFECT_WATER_SPORT, .power = 0, .type = TYPE_WATER, @@ -8140,9 +8477,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CALM_MIND] = { - .name = MOVE_NAME("Calm Mind"), - .description = COMPOUND_STRING("Raises Sp. Atk and Sp. Def\n" - "by focusing the mind."), + .name = COMPOUND_STRING("Calm Mind"), + .description = COMPOUND_STRING( + "Raises Sp. Atk and Sp. Def\n" + "by focusing the mind."), .effect = EFFECT_CALM_MIND, .power = 0, .type = TYPE_PSYCHIC, @@ -8163,9 +8501,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_BLADE] = { - .name = MOVE_NAME("Leaf Blade"), - .description = COMPOUND_STRING("Slashes with a sharp leaf.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Leaf Blade"), + .description = COMPOUND_STRING( + "Slashes with a sharp leaf.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 90 : 70, .type = TYPE_GRASS, @@ -8185,9 +8524,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DANCE] = { - .name = MOVE_NAME("Dragon Dance"), - .description = COMPOUND_STRING("A mystical dance that ups\n" - "Attack and Speed."), + .name = COMPOUND_STRING("Dragon Dance"), + .description = COMPOUND_STRING( + "A mystical dance that ups\n" + "Attack and Speed."), .effect = EFFECT_DRAGON_DANCE, .power = 0, .type = TYPE_DRAGON, @@ -8209,9 +8549,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_BLAST] = { - .name = MOVE_NAME("Rock Blast"), - .description = COMPOUND_STRING("Hurls boulders at the foe\n" - "2 to 5 times in a row."), + .name = COMPOUND_STRING("Rock Blast"), + .description = COMPOUND_STRING( + "Hurls boulders at the foe\n" + "2 to 5 times in a row."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_ROCK, @@ -8229,9 +8570,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHOCK_WAVE] = { - .name = MOVE_NAME("Shock Wave"), - .description = COMPOUND_STRING("A fast and unavoidable\n" - "electric attack."), + .name = COMPOUND_STRING("Shock Wave"), + .description = COMPOUND_STRING( + "A fast and unavoidable\n" + "electric attack."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_ELECTRIC, @@ -8248,9 +8590,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PULSE] = { - .name = MOVE_NAME("Water Pulse"), - .description = COMPOUND_STRING("Attacks with ultrasonic\n" - "waves. May confuse the foe."), + .name = COMPOUND_STRING("Water Pulse"), + .description = COMPOUND_STRING( + "Attacks with ultrasonic\n" + "waves. May confuse the foe."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_WATER, @@ -8273,9 +8616,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOOM_DESIRE] = { - .name = MOVE_NAME("Doom Desire"), - .description = COMPOUND_STRING("Summons strong sunlight to\n" - "attack 2 turns later."), + .name = COMPOUND_STRING("Doom Desire"), + .description = COMPOUND_STRING( + "Summons strong sunlight to\n" + "attack 2 turns later."), .effect = EFFECT_FUTURE_SIGHT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 120, .type = TYPE_STEEL, @@ -8294,9 +8638,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_BOOST] = { - .name = MOVE_NAME("Psycho Boost"), - .description = COMPOUND_STRING("Allows a full-power attack,\n" - "but sharply lowers Sp. Atk."), + .name = COMPOUND_STRING("Psycho Boost"), + .description = COMPOUND_STRING( + "Allows a full-power attack,\n" + "but sharply lowers Sp. Atk."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_PSYCHIC, @@ -8317,9 +8662,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROOST] = { - .name = MOVE_NAME("Roost"), - .description = COMPOUND_STRING("Restores the user's HP by\n" - "half of its max HP."), + .name = COMPOUND_STRING("Roost"), + .description = COMPOUND_STRING( + "Restores the user's HP by\n" + "half of its max HP."), .effect = EFFECT_ROOST, .power = 0, .type = TYPE_FLYING, @@ -8341,9 +8687,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRAVITY] = { - .name = MOVE_NAME("Gravity"), - .description = COMPOUND_STRING("Gravity is intensified\n" - "negating levitation."), + .name = COMPOUND_STRING("Gravity"), + .description = COMPOUND_STRING( + "Gravity is intensified\n" + "negating levitation."), .effect = EFFECT_GRAVITY, .power = 0, .type = TYPE_PSYCHIC, @@ -8364,9 +8711,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIRACLE_EYE] = { - .name = MOVE_NAME("Miracle Eye"), - .description = COMPOUND_STRING("Negate evasiveness and\n" - "Dark-type's immunities."), + .name = COMPOUND_STRING("Miracle Eye"), + .description = COMPOUND_STRING( + "Negate evasiveness and\n" + "Dark-type's immunities."), .effect = EFFECT_MIRACLE_EYE, .power = 0, .type = TYPE_PSYCHIC, @@ -8386,9 +8734,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WAKE_UP_SLAP] = { - .name = MOVE_NAME("Wake-Up Slap"), - .description = COMPOUND_STRING("Powerful against sleeping\n" - "foes, but also heals them."), + .name = COMPOUND_STRING("Wake-Up Slap"), + .description = COMPOUND_STRING( + "Powerful against sleeping\n" + "foes, but also heals them."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 70 : 60, .type = TYPE_FIGHTING, @@ -8410,9 +8759,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HAMMER_ARM] = { - .name = MOVE_NAME("Hammer Arm"), - .description = COMPOUND_STRING("A swinging fist attack\n" - "that also lowers Speed."), + .name = COMPOUND_STRING("Hammer Arm"), + .description = COMPOUND_STRING( + "A swinging fist attack\n" + "that also lowers Speed."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -8435,9 +8785,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GYRO_BALL] = { - .name = MOVE_NAME("Gyro Ball"), - .description = COMPOUND_STRING("A high-speed spin that does\n" - "more damage to faster foes."), + .name = COMPOUND_STRING("Gyro Ball"), + .description = COMPOUND_STRING( + "A high-speed spin that does\n" + "more damage to faster foes."), .effect = EFFECT_GYRO_BALL, .power = 1, .type = TYPE_STEEL, @@ -8456,7 +8807,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEALING_WISH] = { - .name = MOVE_NAME("Healing Wish"), + .name = COMPOUND_STRING("Healing Wish"), .description = sHealingWishDescription, .effect = EFFECT_HEALING_WISH, .power = 0, @@ -8478,9 +8829,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BRINE] = { - .name = MOVE_NAME("Brine"), - .description = COMPOUND_STRING("Does double damage to foes\n" - "with half HP."), + .name = COMPOUND_STRING("Brine"), + .description = COMPOUND_STRING( + "Does double damage to foes\n" + "with half HP."), .effect = EFFECT_BRINE, .power = 65, .type = TYPE_WATER, @@ -8497,9 +8849,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NATURAL_GIFT] = { - .name = MOVE_NAME("Natural Gift"), - .description = COMPOUND_STRING("The effectiveness varies\n" - "with the held Berry."), + .name = COMPOUND_STRING("Natural Gift"), + .description = COMPOUND_STRING( + "The effectiveness varies\n" + "with the held Berry."), .effect = EFFECT_NATURAL_GIFT, .power = 1, .type = TYPE_NORMAL, @@ -8516,9 +8869,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT] = { - .name = MOVE_NAME("Feint"), - .description = COMPOUND_STRING("An attack that hits foes\n" - "using moves like Protect."), + .name = COMPOUND_STRING("Feint"), + .description = COMPOUND_STRING( + "An attack that hits foes\n" + "using moves like Protect."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 30 : 50, .type = TYPE_NORMAL, @@ -8543,7 +8897,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PLUCK] = { - .name = MOVE_NAME("Pluck"), + .name = COMPOUND_STRING("Pluck"), .description = sPluckDescription, .effect = EFFECT_HIT, .power = 60, @@ -8565,9 +8919,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TAILWIND] = { - .name = MOVE_NAME("Tailwind"), - .description = COMPOUND_STRING("Whips up a turbulent breeze\n" - "that raises Speed."), + .name = COMPOUND_STRING("Tailwind"), + .description = COMPOUND_STRING( + "Whips up a turbulent breeze\n" + "that raises Speed."), .effect = EFFECT_TAILWIND, .power = 0, .type = TYPE_FLYING, @@ -8589,9 +8944,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ACUPRESSURE] = { - .name = MOVE_NAME("Acupressure"), - .description = COMPOUND_STRING("The user sharply raises\n" - "one of its stats."), + .name = COMPOUND_STRING("Acupressure"), + .description = COMPOUND_STRING( + "The user sharply raises\n" + "one of its stats."), .effect = EFFECT_ACUPRESSURE, .power = 0, .type = TYPE_NORMAL, @@ -8612,9 +8968,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_METAL_BURST] = { - .name = MOVE_NAME("Metal Burst"), - .description = COMPOUND_STRING("Retaliates any hit with\n" - "greater power."), + .name = COMPOUND_STRING("Metal Burst"), + .description = COMPOUND_STRING( + "Retaliates any hit with\n" + "greater power."), .effect = EFFECT_METAL_BURST, .power = 1, .type = TYPE_STEEL, @@ -8632,7 +8989,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_U_TURN] = { - .name = MOVE_NAME("U-turn"), + .name = COMPOUND_STRING("U-turn"), .description = sUTurnDescription, .effect = EFFECT_HIT_ESCAPE, .power = 70, @@ -8651,7 +9008,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CLOSE_COMBAT] = { - .name = MOVE_NAME("Close Combat"), + .name = COMPOUND_STRING("Close Combat"), .description = sCloseCombatDescription, .effect = EFFECT_HIT, .power = 120, @@ -8674,9 +9031,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PAYBACK] = { - .name = MOVE_NAME("Payback"), - .description = COMPOUND_STRING("An attack that gains power\n" - "if the user moves last."), + .name = COMPOUND_STRING("Payback"), + .description = COMPOUND_STRING( + "An attack that gains power\n" + "if the user moves last."), .effect = EFFECT_PAYBACK, .power = 50, .type = TYPE_DARK, @@ -8694,9 +9052,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ASSURANCE] = { - .name = MOVE_NAME("Assurance"), - .description = COMPOUND_STRING("An attack that gains power\n" - "if the foe has been hurt."), + .name = COMPOUND_STRING("Assurance"), + .description = COMPOUND_STRING( + "An attack that gains power\n" + "if the foe has been hurt."), .effect = EFFECT_ASSURANCE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 50, .type = TYPE_DARK, @@ -8714,9 +9073,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EMBARGO] = { - .name = MOVE_NAME("Embargo"), - .description = COMPOUND_STRING("Prevents the foe from\n" - "using any items."), + .name = COMPOUND_STRING("Embargo"), + .description = COMPOUND_STRING( + "Prevents the foe from\n" + "using any items."), .effect = EFFECT_EMBARGO, .power = 0, .type = TYPE_DARK, @@ -8735,9 +9095,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLING] = { - .name = MOVE_NAME("Fling"), - .description = COMPOUND_STRING("The effectiveness varies\n" - "with the held item."), + .name = COMPOUND_STRING("Fling"), + .description = COMPOUND_STRING( + "The effectiveness varies\n" + "with the held item."), .effect = EFFECT_FLING, .power = 1, .type = TYPE_DARK, @@ -8755,9 +9116,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_SHIFT] = { - .name = MOVE_NAME("Psycho Shift"), - .description = COMPOUND_STRING("Transfers status problems\n" - "to the foe."), + .name = COMPOUND_STRING("Psycho Shift"), + .description = COMPOUND_STRING( + "Transfers status problems\n" + "to the foe."), .effect = EFFECT_PSYCHO_SHIFT, .power = 0, .type = TYPE_PSYCHIC, @@ -8775,9 +9137,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRUMP_CARD] = { - .name = MOVE_NAME("Trump Card"), - .description = COMPOUND_STRING("The less PP the move has\n" - "the more damage it does."), + .name = COMPOUND_STRING("Trump Card"), + .description = COMPOUND_STRING( + "The less PP the move has\n" + "the more damage it does."), .effect = EFFECT_TRUMP_CARD, .power = 1, .type = TYPE_NORMAL, @@ -8795,9 +9158,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_BLOCK] = { - .name = MOVE_NAME("Heal Block"), - .description = COMPOUND_STRING("Prevents the foe from\n" - "recovering any HP."), + .name = COMPOUND_STRING("Heal Block"), + .description = COMPOUND_STRING( + "Prevents the foe from\n" + "recovering any HP."), .effect = EFFECT_HEAL_BLOCK, .power = 0, .type = TYPE_PSYCHIC, @@ -8816,7 +9180,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WRING_OUT] = { - .name = MOVE_NAME("Wring Out"), + .name = COMPOUND_STRING("Wring Out"), .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, @@ -8835,9 +9199,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRICK] = { - .name = MOVE_NAME("Power Trick"), - .description = COMPOUND_STRING("The user swaps its Attack\n" - "and Defense stats."), + .name = COMPOUND_STRING("Power Trick"), + .description = COMPOUND_STRING( + "The user swaps its Attack\n" + "and Defense stats."), .effect = EFFECT_POWER_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -8858,9 +9223,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GASTRO_ACID] = { - .name = MOVE_NAME("Gastro Acid"), - .description = COMPOUND_STRING("Stomach acid suppresses\n" - "the foe's ability."), + .name = COMPOUND_STRING("Gastro Acid"), + .description = COMPOUND_STRING( + "Stomach acid suppresses\n" + "the foe's ability."), .effect = EFFECT_GASTRO_ACID, .power = 0, .type = TYPE_POISON, @@ -8879,9 +9245,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LUCKY_CHANT] = { - .name = MOVE_NAME("Lucky Chant"), - .description = COMPOUND_STRING("Prevents the foe from\n" - "landing critical hits."), + .name = COMPOUND_STRING("Lucky Chant"), + .description = COMPOUND_STRING( + "Prevents the foe from\n" + "landing critical hits."), .effect = EFFECT_LUCKY_CHANT, .power = 0, .type = TYPE_NORMAL, @@ -8902,9 +9269,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ME_FIRST] = { - .name = MOVE_NAME("Me First"), - .description = COMPOUND_STRING("Executes the foe's attack\n" - "with greater power."), + .name = COMPOUND_STRING("Me First"), + .description = COMPOUND_STRING( + "Executes the foe's attack\n" + "with greater power."), .effect = EFFECT_ME_FIRST, .power = 0, .type = TYPE_NORMAL, @@ -8932,9 +9300,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COPYCAT] = { - .name = MOVE_NAME("Copycat"), - .description = COMPOUND_STRING("The user mimics the last\n" - "move used by a foe."), + .name = COMPOUND_STRING("Copycat"), + .description = COMPOUND_STRING( + "The user mimics the last\n" + "move used by a foe."), .effect = EFFECT_COPYCAT, .power = 0, .type = TYPE_NORMAL, @@ -8961,9 +9330,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SWAP] = { - .name = MOVE_NAME("Power Swap"), - .description = COMPOUND_STRING("Swaps changes to Attack\n" - "and Sp. Atk with the foe."), + .name = COMPOUND_STRING("Power Swap"), + .description = COMPOUND_STRING( + "Swaps changes to Attack\n" + "and Sp. Atk with the foe."), .effect = EFFECT_POWER_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -8982,9 +9352,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SWAP] = { - .name = MOVE_NAME("Guard Swap"), - .description = COMPOUND_STRING("Swaps changes to Defense\n" - "and Sp. Def with the foe."), + .name = COMPOUND_STRING("Guard Swap"), + .description = COMPOUND_STRING( + "Swaps changes to Defense\n" + "and Sp. Def with the foe."), .effect = EFFECT_GUARD_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -9003,9 +9374,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PUNISHMENT] = { - .name = MOVE_NAME("Punishment"), - .description = COMPOUND_STRING("Does more damage if the\n" - "foe has powered up."), + .name = COMPOUND_STRING("Punishment"), + .description = COMPOUND_STRING( + "Does more damage if the\n" + "foe has powered up."), .effect = EFFECT_PUNISHMENT, .power = 60, .type = TYPE_DARK, @@ -9023,9 +9395,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESORT] = { - .name = MOVE_NAME("Last Resort"), - .description = COMPOUND_STRING("Can only be used if every\n" - "other move has been used."), + .name = COMPOUND_STRING("Last Resort"), + .description = COMPOUND_STRING( + "Can only be used if every\n" + "other move has been used."), .effect = EFFECT_LAST_RESORT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 130, .type = TYPE_NORMAL, @@ -9043,9 +9416,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WORRY_SEED] = { - .name = MOVE_NAME("Worry Seed"), - .description = COMPOUND_STRING("Plants a seed on the foe\n" - "giving it Insomnia."), + .name = COMPOUND_STRING("Worry Seed"), + .description = COMPOUND_STRING( + "Plants a seed on the foe\n" + "giving it Insomnia."), .effect = EFFECT_WORRY_SEED, .power = 0, .type = TYPE_GRASS, @@ -9064,7 +9438,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUCKER_PUNCH] = { - .name = MOVE_NAME("Sucker Punch"), + .name = COMPOUND_STRING("Sucker Punch"), .description = sSuckerPunchDescription, .effect = EFFECT_SUCKER_PUNCH, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 70 : 80, @@ -9083,9 +9457,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_SPIKES] = { - .name = MOVE_NAME("Toxic Spikes"), - .description = COMPOUND_STRING("Sets spikes that poison a\n" - "foe switching in."), + .name = COMPOUND_STRING("Toxic Spikes"), + .description = COMPOUND_STRING( + "Sets spikes that poison a\n" + "foe switching in."), .effect = EFFECT_TOXIC_SPIKES, .power = 0, .type = TYPE_POISON, @@ -9108,9 +9483,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_SWAP] = { - .name = MOVE_NAME("Heart Swap"), - .description = COMPOUND_STRING("Swaps any stat changes\n" - "with the foe."), + .name = COMPOUND_STRING("Heart Swap"), + .description = COMPOUND_STRING( + "Swaps any stat changes\n" + "with the foe."), .effect = EFFECT_HEART_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -9129,9 +9505,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_RING] = { - .name = MOVE_NAME("Aqua Ring"), - .description = COMPOUND_STRING("Forms a veil of water\n" - "that restores HP."), + .name = COMPOUND_STRING("Aqua Ring"), + .description = COMPOUND_STRING( + "Forms a veil of water\n" + "that restores HP."), .effect = EFFECT_AQUA_RING, .power = 0, .type = TYPE_WATER, @@ -9152,9 +9529,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_RISE] = { - .name = MOVE_NAME("Magnet Rise"), - .description = COMPOUND_STRING("The user levitates with\n" - "electromagnetism."), + .name = COMPOUND_STRING("Magnet Rise"), + .description = COMPOUND_STRING( + "The user levitates with\n" + "electromagnetism."), .effect = EFFECT_MAGNET_RISE, .power = 0, .type = TYPE_ELECTRIC, @@ -9176,9 +9554,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLARE_BLITZ] = { - .name = MOVE_NAME("Flare Blitz"), - .description = COMPOUND_STRING("A charge that may burn the\n" - "foe. Also hurts the user."), + .name = COMPOUND_STRING("Flare Blitz"), + .description = COMPOUND_STRING( + "A charge that may burn the\n" + "foe. Also hurts the user."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIRE, @@ -9204,9 +9583,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FORCE_PALM] = { - .name = MOVE_NAME("Force Palm"), - .description = COMPOUND_STRING("A shock wave attack that\n" - "may paralyze the foe."), + .name = COMPOUND_STRING("Force Palm"), + .description = COMPOUND_STRING( + "A shock wave attack that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -9229,9 +9609,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_SPHERE] = { - .name = MOVE_NAME("Aura Sphere"), - .description = COMPOUND_STRING("Attacks with an aura blast\n" - "that cannot be evaded."), + .name = COMPOUND_STRING("Aura Sphere"), + .description = COMPOUND_STRING( + "Attacks with an aura blast\n" + "that cannot be evaded."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 90, .type = TYPE_FIGHTING, @@ -9250,9 +9631,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_POLISH] = { - .name = MOVE_NAME("Rock Polish"), - .description = COMPOUND_STRING("Polishes the body to\n" - "sharply raise Speed."), + .name = COMPOUND_STRING("Rock Polish"), + .description = COMPOUND_STRING( + "Polishes the body to\n" + "sharply raise Speed."), .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_ROCK, @@ -9273,9 +9655,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POISON_JAB] = { - .name = MOVE_NAME("Poison Jab"), - .description = COMPOUND_STRING("A stabbing attack that\n" - "may poison the foe."), + .name = COMPOUND_STRING("Poison Jab"), + .description = COMPOUND_STRING( + "A stabbing attack that\n" + "may poison the foe."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_POISON, @@ -9298,9 +9681,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_PULSE] = { - .name = MOVE_NAME("Dark Pulse"), - .description = COMPOUND_STRING("Attacks with a horrible\n" - "aura. May cause flinching."), + .name = COMPOUND_STRING("Dark Pulse"), + .description = COMPOUND_STRING( + "Attacks with a horrible\n" + "aura. May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -9323,9 +9707,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_SLASH] = { - .name = MOVE_NAME("Night Slash"), - .description = COMPOUND_STRING("Hits as soon as possible.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Night Slash"), + .description = COMPOUND_STRING( + "Hits as soon as possible.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_DARK, @@ -9345,9 +9730,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_TAIL] = { - .name = MOVE_NAME("Aqua Tail"), - .description = COMPOUND_STRING("The user swings its tail\n" - "like a wave to attack."), + .name = COMPOUND_STRING("Aqua Tail"), + .description = COMPOUND_STRING( + "The user swings its tail\n" + "like a wave to attack."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -9365,9 +9751,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_BOMB] = { - .name = MOVE_NAME("Seed Bomb"), - .description = COMPOUND_STRING("A barrage of hard seeds\n" - "is fired at the foe."), + .name = COMPOUND_STRING("Seed Bomb"), + .description = COMPOUND_STRING( + "A barrage of hard seeds\n" + "is fired at the foe."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GRASS, @@ -9385,9 +9772,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_SLASH] = { - .name = MOVE_NAME("Air Slash"), - .description = COMPOUND_STRING("Attacks with a blade of\n" - "air. May cause flinching."), + .name = COMPOUND_STRING("Air Slash"), + .description = COMPOUND_STRING( + "Attacks with a blade of\n" + "air. May cause flinching."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_FLYING, @@ -9410,9 +9798,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_X_SCISSOR] = { - .name = MOVE_NAME("X-Scissor"), - .description = COMPOUND_STRING("Slashes the foe with crossed\n" - "scythes, claws, etc."), + .name = COMPOUND_STRING("X-Scissor"), + .description = COMPOUND_STRING( + "Slashes the foe with crossed\n" + "scythes, claws, etc."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_BUG, @@ -9431,9 +9820,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BUZZ] = { - .name = MOVE_NAME("Bug Buzz"), - .description = COMPOUND_STRING("A damaging sound wave that\n" - "may lower Sp. Def."), + .name = COMPOUND_STRING("Bug Buzz"), + .description = COMPOUND_STRING( + "A damaging sound wave that\n" + "may lower Sp. Def."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_BUG, @@ -9457,9 +9847,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_PULSE] = { - .name = MOVE_NAME("Dragon Pulse"), - .description = COMPOUND_STRING("Generates a shock wave to\n" - "damage the foe."), + .name = COMPOUND_STRING("Dragon Pulse"), + .description = COMPOUND_STRING( + "Generates a shock wave to\n" + "damage the foe."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 85 : 90, .type = TYPE_DRAGON, @@ -9477,9 +9868,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_RUSH] = { - .name = MOVE_NAME("Dragon Rush"), - .description = COMPOUND_STRING("Tackles the foe with menace.\n" - "May cause flinching."), + .name = COMPOUND_STRING("Dragon Rush"), + .description = COMPOUND_STRING( + "Tackles the foe with menace.\n" + "May cause flinching."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -9503,9 +9895,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_GEM] = { - .name = MOVE_NAME("Power Gem"), - .description = COMPOUND_STRING("Attacks with rays of light\n" - "that sparkle like diamonds."), + .name = COMPOUND_STRING("Power Gem"), + .description = COMPOUND_STRING( + "Attacks with rays of light\n" + "that sparkle like diamonds."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 70, .type = TYPE_ROCK, @@ -9522,7 +9915,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAIN_PUNCH] = { - .name = MOVE_NAME("Drain Punch"), + .name = COMPOUND_STRING("Drain Punch"), .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, @@ -9543,9 +9936,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VACUUM_WAVE] = { - .name = MOVE_NAME("Vacuum Wave"), - .description = COMPOUND_STRING("Whirls its fists to send\n" - "a wave that strikes first."), + .name = COMPOUND_STRING("Vacuum Wave"), + .description = COMPOUND_STRING( + "Whirls its fists to send\n" + "a wave that strikes first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -9562,9 +9956,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FOCUS_BLAST] = { - .name = MOVE_NAME("Focus Blast"), - .description = COMPOUND_STRING("Attacks at full power.\n" - "May lower Sp. Def."), + .name = COMPOUND_STRING("Focus Blast"), + .description = COMPOUND_STRING( + "Attacks at full power.\n" + "May lower Sp. Def."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIGHTING, @@ -9587,9 +9982,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ENERGY_BALL] = { - .name = MOVE_NAME("Energy Ball"), - .description = COMPOUND_STRING("Draws power from nature to\n" - "attack. May lower Sp. Def."), + .name = COMPOUND_STRING("Energy Ball"), + .description = COMPOUND_STRING( + "Draws power from nature to\n" + "attack. May lower Sp. Def."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 80, .type = TYPE_GRASS, @@ -9612,9 +10008,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BRAVE_BIRD] = { - .name = MOVE_NAME("Brave Bird"), - .description = COMPOUND_STRING("A low altitude charge that\n" - "also hurts the user."), + .name = COMPOUND_STRING("Brave Bird"), + .description = COMPOUND_STRING( + "A low altitude charge that\n" + "also hurts the user."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FLYING, @@ -9633,9 +10030,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EARTH_POWER] = { - .name = MOVE_NAME("Earth Power"), - .description = COMPOUND_STRING("Makes the ground erupt with\n" - "power. May lower Sp. Def."), + .name = COMPOUND_STRING("Earth Power"), + .description = COMPOUND_STRING( + "Makes the ground erupt with\n" + "power. May lower Sp. Def."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -9658,9 +10056,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SWITCHEROO] = { - .name = MOVE_NAME("Switcheroo"), - .description = COMPOUND_STRING("Swaps items with the foe\n" - "faster than the eye can see."), + .name = COMPOUND_STRING("Switcheroo"), + .description = COMPOUND_STRING( + "Swaps items with the foe\n" + "faster than the eye can see."), .effect = EFFECT_TRICK, .power = 0, .type = TYPE_DARK, @@ -9681,7 +10080,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_IMPACT] = { - .name = MOVE_NAME("Giga Impact"), + .name = COMPOUND_STRING("Giga Impact"), .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, @@ -9704,9 +10103,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NASTY_PLOT] = { - .name = MOVE_NAME("Nasty Plot"), - .description = COMPOUND_STRING("Thinks bad thoughts to\n" - "sharply boost Sp. Atk."), + .name = COMPOUND_STRING("Nasty Plot"), + .description = COMPOUND_STRING( + "Thinks bad thoughts to\n" + "sharply boost Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, .type = TYPE_DARK, @@ -9727,9 +10127,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_PUNCH] = { - .name = MOVE_NAME("Bullet Punch"), - .description = COMPOUND_STRING("Punches as fast as a bul-\n" - "let. It always hits first."), + .name = COMPOUND_STRING("Bullet Punch"), + .description = COMPOUND_STRING( + "Punches as fast as a bul-\n" + "let. It always hits first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_STEEL, @@ -9748,7 +10149,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AVALANCHE] = { - .name = MOVE_NAME("Avalanche"), + .name = COMPOUND_STRING("Avalanche"), .description = sRevengeDescription, .effect = EFFECT_REVENGE, .power = 60, @@ -9767,9 +10168,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SHARD] = { - .name = MOVE_NAME("Ice Shard"), - .description = COMPOUND_STRING("Hurls a chunk of ice that\n" - "always strike first."), + .name = COMPOUND_STRING("Ice Shard"), + .description = COMPOUND_STRING( + "Hurls a chunk of ice that\n" + "always strike first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ICE, @@ -9786,9 +10188,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_CLAW] = { - .name = MOVE_NAME("Shadow Claw"), - .description = COMPOUND_STRING("Strikes with a shadow claw.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Shadow Claw"), + .description = COMPOUND_STRING( + "Strikes with a shadow claw.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GHOST, @@ -9807,9 +10210,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_FANG] = { - .name = MOVE_NAME("Thunder Fang"), - .description = COMPOUND_STRING("May cause flinching or\n" - "leave the foe paralyzed."), + .name = COMPOUND_STRING("Thunder Fang"), + .description = COMPOUND_STRING( + "May cause flinching or\n" + "leave the foe paralyzed."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ELECTRIC, @@ -9838,9 +10242,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_FANG] = { - .name = MOVE_NAME("Ice Fang"), - .description = COMPOUND_STRING("May cause flinching or\n" - "leave the foe frozen."), + .name = COMPOUND_STRING("Ice Fang"), + .description = COMPOUND_STRING( + "May cause flinching or\n" + "leave the foe frozen."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ICE, @@ -9868,9 +10273,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_FANG] = { - .name = MOVE_NAME("Fire Fang"), - .description = COMPOUND_STRING("May cause flinching or\n" - "leave the foe with a burn."), + .name = COMPOUND_STRING("Fire Fang"), + .description = COMPOUND_STRING( + "May cause flinching or\n" + "leave the foe with a burn."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_FIRE, @@ -9899,9 +10305,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_SNEAK] = { - .name = MOVE_NAME("Shadow Sneak"), - .description = COMPOUND_STRING("Extends the user's shadow\n" - "to strike first."), + .name = COMPOUND_STRING("Shadow Sneak"), + .description = COMPOUND_STRING( + "Extends the user's shadow\n" + "to strike first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GHOST, @@ -9919,9 +10326,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MUD_BOMB] = { - .name = MOVE_NAME("Mud Bomb"), - .description = COMPOUND_STRING("Throws a blob of mud to\n" - "damage and cut accuracy."), + .name = COMPOUND_STRING("Mud Bomb"), + .description = COMPOUND_STRING( + "Throws a blob of mud to\n" + "damage and cut accuracy."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_GROUND, @@ -9944,9 +10352,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_CUT] = { - .name = MOVE_NAME("Psycho Cut"), - .description = COMPOUND_STRING("Tears with psychic blades.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Psycho Cut"), + .description = COMPOUND_STRING( + "Tears with psychic blades.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -9965,9 +10374,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ZEN_HEADBUTT] = { - .name = MOVE_NAME("Zen Headbutt"), - .description = COMPOUND_STRING("Hits with a strong head-\n" - "butt. May cause flinching."), + .name = COMPOUND_STRING("Zen Headbutt"), + .description = COMPOUND_STRING( + "Hits with a strong head-\n" + "butt. May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -9990,9 +10400,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIRROR_SHOT] = { - .name = MOVE_NAME("Mirror Shot"), - .description = COMPOUND_STRING("Emits a flash of energy to\n" - "damage and cut accuracy."), + .name = COMPOUND_STRING("Mirror Shot"), + .description = COMPOUND_STRING( + "Emits a flash of energy to\n" + "damage and cut accuracy."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_STEEL, @@ -10014,9 +10425,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH_CANNON] = { - .name = MOVE_NAME("Flash Cannon"), - .description = COMPOUND_STRING("Releases a blast of light\n" - "that may lower Sp. Def."), + .name = COMPOUND_STRING("Flash Cannon"), + .description = COMPOUND_STRING( + "Releases a blast of light\n" + "that may lower Sp. Def."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_STEEL, @@ -10038,9 +10450,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_CLIMB] = { - .name = MOVE_NAME("Rock Climb"), - .description = COMPOUND_STRING("A charging attack that may\n" - "confuse the foe."), + .name = COMPOUND_STRING("Rock Climb"), + .description = COMPOUND_STRING( + "A charging attack that may\n" + "confuse the foe."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -10063,9 +10476,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DEFOG] = { - .name = MOVE_NAME("Defog"), - .description = COMPOUND_STRING("Removes obstacles and\n" - "lowers evasion."), + .name = COMPOUND_STRING("Defog"), + .description = COMPOUND_STRING( + "Removes obstacles and\n" + "lowers evasion."), .effect = EFFECT_DEFOG, .power = 0, .type = TYPE_FLYING, @@ -10085,9 +10499,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_ROOM] = { - .name = MOVE_NAME("Trick Room"), - .description = COMPOUND_STRING("Slower Pokémon get to move\n" - "first for 5 turns."), + .name = COMPOUND_STRING("Trick Room"), + .description = COMPOUND_STRING( + "Slower Pokémon get to move\n" + "first for 5 turns."), .effect = EFFECT_TRICK_ROOM, .power = 0, .type = TYPE_PSYCHIC, @@ -10106,9 +10521,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRACO_METEOR] = { - .name = MOVE_NAME("Draco Meteor"), - .description = COMPOUND_STRING("Casts comets onto the foe.\n" - "Harshly lowers the Sp. Atk."), + .name = COMPOUND_STRING("Draco Meteor"), + .description = COMPOUND_STRING( + "Casts comets onto the foe.\n" + "Harshly lowers the Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, .type = TYPE_DRAGON, @@ -10129,9 +10545,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DISCHARGE] = { - .name = MOVE_NAME("Discharge"), - .description = COMPOUND_STRING("Zaps the foes with electri-\n" - "city. May paralyze them."), + .name = COMPOUND_STRING("Discharge"), + .description = COMPOUND_STRING( + "Zaps the foes with electri-\n" + "city. May paralyze them."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -10153,7 +10570,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LAVA_PLUME] = { - .name = MOVE_NAME("Lava Plume"), + .name = COMPOUND_STRING("Lava Plume"), .description = sLavaPlumeDescription, .effect = EFFECT_HIT, .power = 80, @@ -10176,9 +10593,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_STORM] = { - .name = MOVE_NAME("Leaf Storm"), - .description = COMPOUND_STRING("Whips up a storm of leaves.\n" - "Harshly lowers the Sp. Atk."), + .name = COMPOUND_STRING("Leaf Storm"), + .description = COMPOUND_STRING( + "Whips up a storm of leaves.\n" + "Harshly lowers the Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 140, .type = TYPE_GRASS, @@ -10199,9 +10617,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_WHIP] = { - .name = MOVE_NAME("Power Whip"), - .description = COMPOUND_STRING("Violently lashes the foe\n" - "with vines or tentacles."), + .name = COMPOUND_STRING("Power Whip"), + .description = COMPOUND_STRING( + "Violently lashes the foe\n" + "with vines or tentacles."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GRASS, @@ -10219,7 +10638,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_WRECKER] = { - .name = MOVE_NAME("Rock Wrecker"), + .name = COMPOUND_STRING("Rock Wrecker"), .description = sHyperBeamDescription, .effect = EFFECT_HIT, .power = 150, @@ -10242,9 +10661,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CROSS_POISON] = { - .name = MOVE_NAME("Cross Poison"), - .description = COMPOUND_STRING("A slash that may poison a\n" - "foe and do critical damage."), + .name = COMPOUND_STRING("Cross Poison"), + .description = COMPOUND_STRING( + "A slash that may poison a\n" + "foe and do critical damage."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_POISON, @@ -10269,9 +10689,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GUNK_SHOT] = { - .name = MOVE_NAME("Gunk Shot"), - .description = COMPOUND_STRING("Shoots filthy garbage at\n" - "the foe. May also poison."), + .name = COMPOUND_STRING("Gunk Shot"), + .description = COMPOUND_STRING( + "Shoots filthy garbage at\n" + "the foe. May also poison."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_POISON, @@ -10293,9 +10714,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_IRON_HEAD] = { - .name = MOVE_NAME("Iron Head"), - .description = COMPOUND_STRING("Slams the foe with a hard\n" - "head. May cause flinching."), + .name = COMPOUND_STRING("Iron Head"), + .description = COMPOUND_STRING( + "Slams the foe with a hard\n" + "head. May cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_STEEL, @@ -10318,9 +10740,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNET_BOMB] = { - .name = MOVE_NAME("Magnet Bomb"), - .description = COMPOUND_STRING("Launches a magnet that\n" - "strikes without fail."), + .name = COMPOUND_STRING("Magnet Bomb"), + .description = COMPOUND_STRING( + "Launches a magnet that\n" + "strikes without fail."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_STEEL, @@ -10338,9 +10761,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_EDGE] = { - .name = MOVE_NAME("Stone Edge"), - .description = COMPOUND_STRING("Stabs the foe with stones.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Stone Edge"), + .description = COMPOUND_STRING( + "Stabs the foe with stones.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_ROCK, @@ -10358,9 +10782,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CAPTIVATE] = { - .name = MOVE_NAME("Captivate"), - .description = COMPOUND_STRING("Makes the opposite gender\n" - "sharply reduce its Sp. Atk."), + .name = COMPOUND_STRING("Captivate"), + .description = COMPOUND_STRING( + "Makes the opposite gender\n" + "sharply reduce its Sp. Atk."), .effect = EFFECT_CAPTIVATE, .power = 0, .type = TYPE_NORMAL, @@ -10379,9 +10804,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STEALTH_ROCK] = { - .name = MOVE_NAME("Stealth Rock"), - .description = COMPOUND_STRING("Sets floating stones that\n" - "hurt a foe switching in."), + .name = COMPOUND_STRING("Stealth Rock"), + .description = COMPOUND_STRING( + "Sets floating stones that\n" + "hurt a foe switching in."), .effect = EFFECT_STEALTH_ROCK, .power = 0, .type = TYPE_ROCK, @@ -10403,9 +10829,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_KNOT] = { - .name = MOVE_NAME("Grass Knot"), - .description = COMPOUND_STRING("A snare attack that does\n" - "more damage to heavier foes."), + .name = COMPOUND_STRING("Grass Knot"), + .description = COMPOUND_STRING( + "A snare attack that does\n" + "more damage to heavier foes."), .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_GRASS, @@ -10424,9 +10851,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHATTER] = { - .name = MOVE_NAME("Chatter"), - .description = COMPOUND_STRING("Attacks with a sound wave\n" - "that causes confusion."), + .name = COMPOUND_STRING("Chatter"), + .description = COMPOUND_STRING( + "Attacks with a sound wave\n" + "that causes confusion."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 60, .type = TYPE_FLYING, @@ -10463,9 +10891,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_JUDGMENT] = { - .name = MOVE_NAME("Judgment"), - .description = COMPOUND_STRING("The type varies with the\n" - "kind of Plate held."), + .name = COMPOUND_STRING("Judgment"), + .description = COMPOUND_STRING( + "The type varies with the\n" + "kind of Plate held."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = 100, .type = TYPE_NORMAL, @@ -10483,7 +10912,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BUG_BITE] = { - .name = MOVE_NAME("Bug Bite"), + .name = COMPOUND_STRING("Bug Bite"), .description = sPluckDescription, .effect = EFFECT_HIT, .power = 60, @@ -10505,9 +10934,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHARGE_BEAM] = { - .name = MOVE_NAME("Charge Beam"), - .description = COMPOUND_STRING("Fires a beam of electricity.\n" - "May raise Sp. Atk."), + .name = COMPOUND_STRING("Charge Beam"), + .description = COMPOUND_STRING( + "Fires a beam of electricity.\n" + "May raise Sp. Atk."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_ELECTRIC, @@ -10530,9 +10960,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WOOD_HAMMER] = { - .name = MOVE_NAME("Wood Hammer"), - .description = COMPOUND_STRING("Slams the body into a foe.\n" - "The user gets hurt too."), + .name = COMPOUND_STRING("Wood Hammer"), + .description = COMPOUND_STRING( + "Slams the body into a foe.\n" + "The user gets hurt too."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GRASS, @@ -10551,9 +10982,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_JET] = { - .name = MOVE_NAME("Aqua Jet"), - .description = COMPOUND_STRING("Strikes first by dashing\n" - "at the foe at a high speed."), + .name = COMPOUND_STRING("Aqua Jet"), + .description = COMPOUND_STRING( + "Strikes first by dashing\n" + "at the foe at a high speed."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -10571,9 +11003,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ATTACK_ORDER] = { - .name = MOVE_NAME("Attack Order"), - .description = COMPOUND_STRING("Underlings pummel the foe.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Attack Order"), + .description = COMPOUND_STRING( + "Underlings pummel the foe.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_BUG, @@ -10591,9 +11024,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DEFEND_ORDER] = { - .name = MOVE_NAME("Defend Order"), - .description = COMPOUND_STRING("Raises Defense and Sp. Def\n" - "with a living shield."), + .name = COMPOUND_STRING("Defend Order"), + .description = COMPOUND_STRING( + "Raises Defense and Sp. Def\n" + "with a living shield."), .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_BUG, @@ -10614,9 +11048,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_ORDER] = { - .name = MOVE_NAME("Heal Order"), - .description = COMPOUND_STRING("The user's underlings show\n" - "up to heal half its max HP."), + .name = COMPOUND_STRING("Heal Order"), + .description = COMPOUND_STRING( + "The user's underlings show\n" + "up to heal half its max HP."), .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_BUG, @@ -10638,9 +11073,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_SMASH] = { - .name = MOVE_NAME("Head Smash"), - .description = COMPOUND_STRING("A life-risking headbutt that\n" - "seriously hurts the user."), + .name = COMPOUND_STRING("Head Smash"), + .description = COMPOUND_STRING( + "A life-risking headbutt that\n" + "seriously hurts the user."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_ROCK, @@ -10659,9 +11095,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_HIT] = { - .name = MOVE_NAME("Double Hit"), - .description = COMPOUND_STRING("Slams the foe with a tail\n" - "etc. Strikes twice."), + .name = COMPOUND_STRING("Double Hit"), + .description = COMPOUND_STRING( + "Slams the foe with a tail\n" + "etc. Strikes twice."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_NORMAL, @@ -10680,9 +11117,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR_OF_TIME] = { - .name = MOVE_NAME("Roar of Time"), - .description = COMPOUND_STRING("Powerful, but leaves the\n" - "user immobile the next turn."), + .name = COMPOUND_STRING("Roar of Time"), + .description = COMPOUND_STRING( + "Powerful, but leaves the\n" + "user immobile the next turn."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_DRAGON, @@ -10703,9 +11141,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPACIAL_REND] = { - .name = MOVE_NAME("Spacial Rend"), - .description = COMPOUND_STRING("Tears the foe, and space.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Spacial Rend"), + .description = COMPOUND_STRING( + "Tears the foe, and space.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -10723,7 +11162,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_DANCE] = { - .name = MOVE_NAME("Lunar Dance"), + .name = COMPOUND_STRING("Lunar Dance"), .description = sHealingWishDescription, .effect = EFFECT_HEALING_WISH, .power = 0, @@ -10746,7 +11185,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CRUSH_GRIP] = { - .name = MOVE_NAME("Crush Grip"), + .name = COMPOUND_STRING("Crush Grip"), .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, @@ -10765,9 +11204,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGMA_STORM] = { - .name = MOVE_NAME("Magma Storm"), - .description = COMPOUND_STRING("Traps the foe in a vortex\n" - "of fire for "BINDING_TURNS" turns."), + .name = COMPOUND_STRING("Magma Storm"), + .description = COMPOUND_STRING( + "Traps the foe in a vortex\n" + "of fire for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 120, .type = TYPE_FIRE, @@ -10787,9 +11227,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_VOID] = { - .name = MOVE_NAME("Dark Void"), - .description = COMPOUND_STRING("Drags the foe into total\n" - "darkness, inducing Sleep."), + .name = COMPOUND_STRING("Dark Void"), + .description = COMPOUND_STRING( + "Drags the foe into total\n" + "darkness, inducing Sleep."), .effect = EFFECT_DARK_VOID, .power = 0, .type = TYPE_DARK, @@ -10809,9 +11250,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SEED_FLARE] = { - .name = MOVE_NAME("Seed Flare"), - .description = COMPOUND_STRING("Generates a shock wave that\n" - "sharply reduces Sp. Def."), + .name = COMPOUND_STRING("Seed Flare"), + .description = COMPOUND_STRING( + "Generates a shock wave that\n" + "sharply reduces Sp. Def."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GRASS, @@ -10833,9 +11275,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OMINOUS_WIND] = { - .name = MOVE_NAME("Ominous Wind"), - .description = COMPOUND_STRING("A repulsive attack that may\n" - "raise all stats."), + .name = COMPOUND_STRING("Ominous Wind"), + .description = COMPOUND_STRING( + "A repulsive attack that may\n" + "raise all stats."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GHOST, @@ -10859,7 +11302,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_FORCE] = { - .name = MOVE_NAME("Shadow Force"), + .name = COMPOUND_STRING("Shadow Force"), .description = sShadowForceDescription, .effect = EFFECT_SEMI_INVULNERABLE, .power = 120, @@ -10887,9 +11330,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HONE_CLAWS] = { - .name = MOVE_NAME("Hone Claws"), - .description = COMPOUND_STRING("Sharpens its claws to raise\n" - "Attack and Accuracy."), + .name = COMPOUND_STRING("Hone Claws"), + .description = COMPOUND_STRING( + "Sharpens its claws to raise\n" + "Attack and Accuracy."), .effect = EFFECT_ATTACK_ACCURACY_UP, .power = 0, .type = TYPE_DARK, @@ -10910,9 +11354,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WIDE_GUARD] = { - .name = MOVE_NAME("Wide Guard"), - .description = COMPOUND_STRING("Evades wide-ranging attacks\n" - "for one turn."), + .name = COMPOUND_STRING("Wide Guard"), + .description = COMPOUND_STRING( + "Evades wide-ranging attacks\n" + "for one turn."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_ROCK, @@ -10936,9 +11381,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GUARD_SPLIT] = { - .name = MOVE_NAME("Guard Split"), - .description = COMPOUND_STRING("Averages changes to Defense\n" - "and Sp. Def with the foe."), + .name = COMPOUND_STRING("Guard Split"), + .description = COMPOUND_STRING( + "Averages changes to Defense\n" + "and Sp. Def with the foe."), .effect = EFFECT_GUARD_SPLIT, .power = 0, .type = TYPE_PSYCHIC, @@ -10957,9 +11403,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SPLIT] = { - .name = MOVE_NAME("Power Split"), - .description = COMPOUND_STRING("Averages changes to Attack\n" - "and Sp. Atk with the foe."), + .name = COMPOUND_STRING("Power Split"), + .description = COMPOUND_STRING( + "Averages changes to Attack\n" + "and Sp. Atk with the foe."), .effect = EFFECT_POWER_SPLIT, .power = 0, .type = TYPE_PSYCHIC, @@ -10978,9 +11425,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WONDER_ROOM] = { - .name = MOVE_NAME("Wonder Room"), - .description = COMPOUND_STRING("Defense and Sp. Def stats\n" - "are swapped for 5 turns."), + .name = COMPOUND_STRING("Wonder Room"), + .description = COMPOUND_STRING( + "Defense and Sp. Def stats\n" + "are swapped for 5 turns."), .effect = EFFECT_WONDER_ROOM, .power = 0, .type = TYPE_PSYCHIC, @@ -10999,7 +11447,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHOCK] = { - .name = MOVE_NAME("Psyshock"), + .name = COMPOUND_STRING("Psyshock"), .description = sPsyshockDescription, .effect = EFFECT_PSYSHOCK, .power = 80, @@ -11017,9 +11465,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VENOSHOCK] = { - .name = MOVE_NAME("Venoshock"), - .description = COMPOUND_STRING("Does double damage if the\n" - "foe is poisoned."), + .name = COMPOUND_STRING("Venoshock"), + .description = COMPOUND_STRING( + "Does double damage if the\n" + "foe is poisoned."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = 65, .type = TYPE_POISON, @@ -11037,9 +11486,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AUTOTOMIZE] = { - .name = MOVE_NAME("Autotomize"), - .description = COMPOUND_STRING("Sheds additional weight to\n" - "sharply boost Speed."), + .name = COMPOUND_STRING("Autotomize"), + .description = COMPOUND_STRING( + "Sheds additional weight to\n" + "sharply boost Speed."), .effect = EFFECT_AUTOTOMIZE, .power = 0, .type = TYPE_STEEL, @@ -11060,9 +11510,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_POWDER] = { - .name = MOVE_NAME("Rage Powder"), - .description = COMPOUND_STRING("Scatters powder to make\n" - "foes attack only the user."), + .name = COMPOUND_STRING("Rage Powder"), + .description = COMPOUND_STRING( + "Scatters powder to make\n" + "foes attack only the user."), .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_BUG, @@ -11086,9 +11537,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TELEKINESIS] = { - .name = MOVE_NAME("Telekinesis"), - .description = COMPOUND_STRING("Makes the foe float. It is\n" - "easier to hit for 3 turns."), + .name = COMPOUND_STRING("Telekinesis"), + .description = COMPOUND_STRING( + "Makes the foe float. It is\n" + "easier to hit for 3 turns."), .effect = EFFECT_TELEKINESIS, .power = 0, .type = TYPE_PSYCHIC, @@ -11108,9 +11560,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_ROOM] = { - .name = MOVE_NAME("Magic Room"), - .description = COMPOUND_STRING("Hold items lose their\n" - "effects for 5 turns."), + .name = COMPOUND_STRING("Magic Room"), + .description = COMPOUND_STRING( + "Hold items lose their\n" + "effects for 5 turns."), .effect = EFFECT_MAGIC_ROOM, .power = 0, .type = TYPE_PSYCHIC, @@ -11129,9 +11582,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SMACK_DOWN] = { - .name = MOVE_NAME("Smack Down"), - .description = COMPOUND_STRING("Throws a rock to knock the\n" - "foe down to the ground."), + .name = COMPOUND_STRING("Smack Down"), + .description = COMPOUND_STRING( + "Throws a rock to knock the\n" + "foe down to the ground."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_ROCK, @@ -11153,7 +11607,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STORM_THROW] = { - .name = MOVE_NAME("Storm Throw"), + .name = COMPOUND_STRING("Storm Throw"), .description = sStormThrowDescription, .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, @@ -11173,9 +11627,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_BURST] = { - .name = MOVE_NAME("Flame Burst"), - .description = COMPOUND_STRING("A bursting flame that does\n" - "damage to all foes."), + .name = COMPOUND_STRING("Flame Burst"), + .description = COMPOUND_STRING( + "A bursting flame that does\n" + "damage to all foes."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_FIRE, @@ -11196,9 +11651,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SLUDGE_WAVE] = { - .name = MOVE_NAME("Sludge Wave"), - .description = COMPOUND_STRING("Swamps the foe with a wave\n" - "of sludge. May also poison."), + .name = COMPOUND_STRING("Sludge Wave"), + .description = COMPOUND_STRING( + "Swamps the foe with a wave\n" + "of sludge. May also poison."), .effect = EFFECT_HIT, .power = 95, .type = TYPE_POISON, @@ -11220,9 +11676,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_QUIVER_DANCE] = { - .name = MOVE_NAME("Quiver Dance"), - .description = COMPOUND_STRING("Dances to raise Sp. Atk\n" - "Sp. Def and Speed."), + .name = COMPOUND_STRING("Quiver Dance"), + .description = COMPOUND_STRING( + "Dances to raise Sp. Atk\n" + "Sp. Def and Speed."), .effect = EFFECT_QUIVER_DANCE, .power = 0, .type = TYPE_BUG, @@ -11244,7 +11701,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAVY_SLAM] = { - .name = MOVE_NAME("Heavy Slam"), + .name = COMPOUND_STRING("Heavy Slam"), .description = sHeavySlamDescription, .effect = EFFECT_HEAT_CRASH, .power = 1, @@ -11265,9 +11722,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SYNCHRONOISE] = { - .name = MOVE_NAME("Synchronoise"), - .description = COMPOUND_STRING("An odd shock wave that only\n" - "damages same-type foes."), + .name = COMPOUND_STRING("Synchronoise"), + .description = COMPOUND_STRING( + "An odd shock wave that only\n" + "damages same-type foes."), .effect = EFFECT_SYNCHRONOISE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 70, .type = TYPE_PSYCHIC, @@ -11284,9 +11742,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_BALL] = { - .name = MOVE_NAME("Electro Ball"), - .description = COMPOUND_STRING("Hurls an orb that does more\n" - "damage to slower foes."), + .name = COMPOUND_STRING("Electro Ball"), + .description = COMPOUND_STRING( + "Hurls an orb that does more\n" + "damage to slower foes."), .effect = EFFECT_ELECTRO_BALL, .power = 1, .type = TYPE_ELECTRIC, @@ -11304,9 +11763,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SOAK] = { - .name = MOVE_NAME("Soak"), - .description = COMPOUND_STRING("Sprays water at the foe\n" - "making it Water-type."), + .name = COMPOUND_STRING("Soak"), + .description = COMPOUND_STRING( + "Sprays water at the foe\n" + "making it Water-type."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_WATER, @@ -11325,9 +11785,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_CHARGE] = { - .name = MOVE_NAME("Flame Charge"), - .description = COMPOUND_STRING("Attacks in a cloak of\n" - "flames. Raises Speed."), + .name = COMPOUND_STRING("Flame Charge"), + .description = COMPOUND_STRING( + "Attacks in a cloak of\n" + "flames. Raises Speed."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_FIRE, @@ -11351,9 +11812,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COIL] = { - .name = MOVE_NAME("Coil"), - .description = COMPOUND_STRING("Coils up to raise Attack\n" - "Defense and Accuracy."), + .name = COMPOUND_STRING("Coil"), + .description = COMPOUND_STRING( + "Coils up to raise Attack\n" + "Defense and Accuracy."), .effect = EFFECT_COIL, .power = 0, .type = TYPE_POISON, @@ -11374,9 +11836,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_SWEEP] = { - .name = MOVE_NAME("Low Sweep"), - .description = COMPOUND_STRING("Attacks the foe's legs\n" - "lowering its Speed."), + .name = COMPOUND_STRING("Low Sweep"), + .description = COMPOUND_STRING( + "Attacks the foe's legs\n" + "lowering its Speed."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 60, .type = TYPE_FIGHTING, @@ -11399,9 +11862,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_SPRAY] = { - .name = MOVE_NAME("Acid Spray"), - .description = COMPOUND_STRING("Sprays a hide-melting acid.\n" - "Sharply reduces Sp. Def."), + .name = COMPOUND_STRING("Acid Spray"), + .description = COMPOUND_STRING( + "Sprays a hide-melting acid.\n" + "Sharply reduces Sp. Def."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_POISON, @@ -11424,9 +11888,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FOUL_PLAY] = { - .name = MOVE_NAME("Foul Play"), - .description = COMPOUND_STRING("The higher the foe's Attack\n" - "the more damage caused."), + .name = COMPOUND_STRING("Foul Play"), + .description = COMPOUND_STRING( + "The higher the foe's Attack\n" + "the more damage caused."), .effect = EFFECT_FOUL_PLAY, .power = 95, .type = TYPE_DARK, @@ -11444,9 +11909,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SIMPLE_BEAM] = { - .name = MOVE_NAME("Simple Beam"), - .description = COMPOUND_STRING("A beam that changes the\n" - "foe's ability to Simple."), + .name = COMPOUND_STRING("Simple Beam"), + .description = COMPOUND_STRING( + "A beam that changes the\n" + "foe's ability to Simple."), .effect = EFFECT_SIMPLE_BEAM, .power = 0, .type = TYPE_NORMAL, @@ -11465,9 +11931,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ENTRAINMENT] = { - .name = MOVE_NAME("Entrainment"), - .description = COMPOUND_STRING("Makes the foe mimic the\n" - "user, gaining its ability."), + .name = COMPOUND_STRING("Entrainment"), + .description = COMPOUND_STRING( + "Makes the foe mimic the\n" + "user, gaining its ability."), .effect = EFFECT_ENTRAINMENT, .power = 0, .type = TYPE_NORMAL, @@ -11486,9 +11953,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AFTER_YOU] = { - .name = MOVE_NAME("After You"), - .description = COMPOUND_STRING("Helps out the foe, letting\n" - "it move next."), + .name = COMPOUND_STRING("After You"), + .description = COMPOUND_STRING( + "Helps out the foe, letting\n" + "it move next."), .effect = EFFECT_AFTER_YOU, .power = 0, .type = TYPE_NORMAL, @@ -11510,9 +11978,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROUND] = { - .name = MOVE_NAME("Round"), - .description = COMPOUND_STRING("A song that inflicts damage.\n" - "Others can join in too."), + .name = COMPOUND_STRING("Round"), + .description = COMPOUND_STRING( + "A song that inflicts damage.\n" + "Others can join in too."), .effect = EFFECT_ROUND, .power = 60, .type = TYPE_NORMAL, @@ -11534,9 +12003,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ECHOED_VOICE] = { - .name = MOVE_NAME("Echoed Voice"), - .description = COMPOUND_STRING("Does more damage every turn\n" - "it is used."), + .name = COMPOUND_STRING("Echoed Voice"), + .description = COMPOUND_STRING( + "Does more damage every turn\n" + "it is used."), .effect = EFFECT_ECHOED_VOICE, .power = 40, .type = TYPE_NORMAL, @@ -11555,7 +12025,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHIP_AWAY] = { - .name = MOVE_NAME("Chip Away"), + .name = COMPOUND_STRING("Chip Away"), .description = sChipAwayDescription, .effect = EFFECT_HIT, .power = 70, @@ -11575,9 +12045,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CLEAR_SMOG] = { - .name = MOVE_NAME("Clear Smog"), - .description = COMPOUND_STRING("Attacks with white haze that\n" - "eliminates all stat changes."), + .name = COMPOUND_STRING("Clear Smog"), + .description = COMPOUND_STRING( + "Attacks with white haze that\n" + "eliminates all stat changes."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_POISON, @@ -11597,9 +12068,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STORED_POWER] = { - .name = MOVE_NAME("Stored Power"), - .description = COMPOUND_STRING("The higher the user's stats\n" - "the more damage caused."), + .name = COMPOUND_STRING("Stored Power"), + .description = COMPOUND_STRING( + "The higher the user's stats\n" + "the more damage caused."), .effect = EFFECT_STORED_POWER, .power = 20, .type = TYPE_PSYCHIC, @@ -11616,9 +12088,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_QUICK_GUARD] = { - .name = MOVE_NAME("Quick Guard"), - .description = COMPOUND_STRING("Evades priority attacks\n" - "for one turn."), + .name = COMPOUND_STRING("Quick Guard"), + .description = COMPOUND_STRING( + "Evades priority attacks\n" + "for one turn."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIGHTING, @@ -11642,9 +12115,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ALLY_SWITCH] = { - .name = MOVE_NAME("Ally Switch"), - .description = COMPOUND_STRING("The user switches places\n" - "with its partner."), + .name = COMPOUND_STRING("Ally Switch"), + .description = COMPOUND_STRING( + "The user switches places\n" + "with its partner."), .effect = EFFECT_ALLY_SWITCH, .power = 0, .type = TYPE_PSYCHIC, @@ -11664,9 +12138,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SCALD] = { - .name = MOVE_NAME("Scald"), - .description = COMPOUND_STRING("Shoots boiling water at the\n" - "foe. May inflict a burn."), + .name = COMPOUND_STRING("Scald"), + .description = COMPOUND_STRING( + "Shoots boiling water at the\n" + "foe. May inflict a burn."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_WATER, @@ -11689,9 +12164,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SMASH] = { - .name = MOVE_NAME("Shell Smash"), - .description = COMPOUND_STRING("Raises offensive stats, but\n" - "lowers defensive stats."), + .name = COMPOUND_STRING("Shell Smash"), + .description = COMPOUND_STRING( + "Raises offensive stats, but\n" + "lowers defensive stats."), .effect = EFFECT_SHELL_SMASH, .power = 0, .type = TYPE_NORMAL, @@ -11712,9 +12188,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAL_PULSE] = { - .name = MOVE_NAME("Heal Pulse"), - .description = COMPOUND_STRING("Recovers up to half the\n" - "target's maximum HP."), + .name = COMPOUND_STRING("Heal Pulse"), + .description = COMPOUND_STRING( + "Recovers up to half the\n" + "target's maximum HP."), .effect = EFFECT_HEAL_PULSE, .power = 0, .type = TYPE_PSYCHIC, @@ -11736,9 +12213,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEX] = { - .name = MOVE_NAME("Hex"), - .description = COMPOUND_STRING("Does double damage if the\n" - "foe has a status problem."), + .name = COMPOUND_STRING("Hex"), + .description = COMPOUND_STRING( + "Does double damage if the\n" + "foe has a status problem."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 50, .type = TYPE_GHOST, @@ -11756,9 +12234,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SKY_DROP] = { - .name = MOVE_NAME("Sky Drop"), - .description = COMPOUND_STRING("Takes the foe into the sky\n" - "then drops it the next turn."), + .name = COMPOUND_STRING("Sky Drop"), + .description = COMPOUND_STRING( + "Takes the foe into the sky\n" + "then drops it the next turn."), .effect = EFFECT_SKY_DROP, .power = 60, .type = TYPE_FLYING, @@ -11781,9 +12260,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHIFT_GEAR] = { - .name = MOVE_NAME("Shift Gear"), - .description = COMPOUND_STRING("Rotates its gears to raise\n" - "Attack and Speed."), + .name = COMPOUND_STRING("Shift Gear"), + .description = COMPOUND_STRING( + "Rotates its gears to raise\n" + "Attack and Speed."), .effect = EFFECT_SHIFT_GEAR, .power = 0, .type = TYPE_STEEL, @@ -11804,7 +12284,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CIRCLE_THROW] = { - .name = MOVE_NAME("Circle Throw"), + .name = COMPOUND_STRING("Circle Throw"), .description = sCircleThrowDescription, .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, @@ -11825,9 +12305,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_INCINERATE] = { - .name = MOVE_NAME("Incinerate"), - .description = COMPOUND_STRING("Burns up Berries and Gems\n" - "preventing their use."), + .name = COMPOUND_STRING("Incinerate"), + .description = COMPOUND_STRING( + "Burns up Berries and Gems\n" + "preventing their use."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 30, .type = TYPE_FIRE, @@ -11847,9 +12328,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_QUASH] = { - .name = MOVE_NAME("Quash"), - .description = COMPOUND_STRING("Suppresses the foe, making\n" - "it move last."), + .name = COMPOUND_STRING("Quash"), + .description = COMPOUND_STRING( + "Suppresses the foe, making\n" + "it move last."), .effect = EFFECT_QUASH, .power = 0, .type = TYPE_DARK, @@ -11868,9 +12350,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ACROBATICS] = { - .name = MOVE_NAME("Acrobatics"), - .description = COMPOUND_STRING("Does double damage if the\n" - "user has no item."), + .name = COMPOUND_STRING("Acrobatics"), + .description = COMPOUND_STRING( + "Does double damage if the\n" + "user has no item."), .effect = EFFECT_ACROBATICS, .power = 55, .type = TYPE_FLYING, @@ -11888,9 +12371,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REFLECT_TYPE] = { - .name = MOVE_NAME("Reflect Type"), - .description = COMPOUND_STRING("The user reflects the foe's\n" - "type, copying it."), + .name = COMPOUND_STRING("Reflect Type"), + .description = COMPOUND_STRING( + "The user reflects the foe's\n" + "type, copying it."), .effect = EFFECT_REFLECT_TYPE, .power = 0, .type = TYPE_NORMAL, @@ -11910,9 +12394,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RETALIATE] = { - .name = MOVE_NAME("Retaliate"), - .description = COMPOUND_STRING("An attack that does more\n" - "damage if an ally fainted."), + .name = COMPOUND_STRING("Retaliate"), + .description = COMPOUND_STRING( + "An attack that does more\n" + "damage if an ally fainted."), .effect = EFFECT_RETALIATE, .power = 70, .type = TYPE_NORMAL, @@ -11930,9 +12415,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FINAL_GAMBIT] = { - .name = MOVE_NAME("Final Gambit"), - .description = COMPOUND_STRING("The user faints to damage\n" - "the foe equal to its HP."), + .name = COMPOUND_STRING("Final Gambit"), + .description = COMPOUND_STRING( + "The user faints to damage\n" + "the foe equal to its HP."), .effect = EFFECT_FINAL_GAMBIT, .power = 1, .type = TYPE_FIGHTING, @@ -11951,9 +12437,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BESTOW] = { - .name = MOVE_NAME("Bestow"), - .description = COMPOUND_STRING("The user gives its held\n" - "item to the foe."), + .name = COMPOUND_STRING("Bestow"), + .description = COMPOUND_STRING( + "The user gives its held\n" + "item to the foe."), .effect = EFFECT_BESTOW, .power = 0, .type = TYPE_NORMAL, @@ -11976,9 +12463,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNO] = { - .name = MOVE_NAME("Inferno"), - .description = COMPOUND_STRING("Powerful and sure to inflict\n" - "a burn, but inaccurate."), + .name = COMPOUND_STRING("Inferno"), + .description = COMPOUND_STRING( + "Powerful and sure to inflict\n" + "a burn, but inaccurate."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIRE, @@ -12000,9 +12488,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PLEDGE] = { - .name = MOVE_NAME("Water Pledge"), - .description = COMPOUND_STRING("Attacks with a column of\n" - "water. May make a rainbow."), + .name = COMPOUND_STRING("Water Pledge"), + .description = COMPOUND_STRING( + "Attacks with a column of\n" + "water. May make a rainbow."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_WATER, @@ -12020,9 +12509,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PLEDGE] = { - .name = MOVE_NAME("Fire Pledge"), - .description = COMPOUND_STRING("Attacks with a column of\n" - "fire. May burn the grass."), + .name = COMPOUND_STRING("Fire Pledge"), + .description = COMPOUND_STRING( + "Attacks with a column of\n" + "fire. May burn the grass."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_FIRE, @@ -12040,9 +12530,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_PLEDGE] = { - .name = MOVE_NAME("Grass Pledge"), - .description = COMPOUND_STRING("Attacks with a column of\n" - "grass. May create a swamp."), + .name = COMPOUND_STRING("Grass Pledge"), + .description = COMPOUND_STRING( + "Attacks with a column of\n" + "grass. May create a swamp."), .effect = EFFECT_PLEDGE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_GRASS, @@ -12060,7 +12551,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_SWITCH] = { - .name = MOVE_NAME("Volt Switch"), + .name = COMPOUND_STRING("Volt Switch"), .description = sUTurnDescription, .effect = EFFECT_HIT_ESCAPE, .power = 70, @@ -12078,9 +12569,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE_BUG] = { - .name = MOVE_NAME("Struggle Bug"), - .description = COMPOUND_STRING("Resisting, the user attacks\n" - "the foe. Lowers Sp. Atk."), + .name = COMPOUND_STRING("Struggle Bug"), + .description = COMPOUND_STRING( + "Resisting, the user attacks\n" + "the foe. Lowers Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 30, .type = TYPE_BUG, @@ -12102,9 +12594,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BULLDOZE] = { - .name = MOVE_NAME("Bulldoze"), - .description = COMPOUND_STRING("Stomps down on the ground.\n" - "Lowers Speed."), + .name = COMPOUND_STRING("Bulldoze"), + .description = COMPOUND_STRING( + "Stomps down on the ground.\n" + "Lowers Speed."), .effect = EFFECT_BULLDOZE, .power = 60, .type = TYPE_GROUND, @@ -12127,7 +12620,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FROST_BREATH] = { - .name = MOVE_NAME("Frost Breath"), + .name = COMPOUND_STRING("Frost Breath"), .description = sStormThrowDescription, .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, @@ -12146,7 +12639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_TAIL] = { - .name = MOVE_NAME("Dragon Tail"), + .name = COMPOUND_STRING("Dragon Tail"), .description = sCircleThrowDescription, .effect = EFFECT_HIT_SWITCH_TARGET, .power = 60, @@ -12167,9 +12660,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WORK_UP] = { - .name = MOVE_NAME("Work Up"), - .description = COMPOUND_STRING("The user is roused.\n" - "Ups Attack and Sp. Atk."), + .name = COMPOUND_STRING("Work Up"), + .description = COMPOUND_STRING( + "The user is roused.\n" + "Ups Attack and Sp. Atk."), .effect = EFFECT_ATTACK_SPATK_UP, .power = 0, .type = TYPE_NORMAL, @@ -12190,9 +12684,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTROWEB] = { - .name = MOVE_NAME("Electroweb"), - .description = COMPOUND_STRING("Snares the foe with an\n" - "electric net. Lowers Speed."), + .name = COMPOUND_STRING("Electroweb"), + .description = COMPOUND_STRING( + "Snares the foe with an\n" + "electric net. Lowers Speed."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_ELECTRIC, @@ -12214,9 +12709,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WILD_CHARGE] = { - .name = MOVE_NAME("Wild Charge"), - .description = COMPOUND_STRING("An electrical tackle that\n" - "also hurts the user."), + .name = COMPOUND_STRING("Wild Charge"), + .description = COMPOUND_STRING( + "An electrical tackle that\n" + "also hurts the user."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_ELECTRIC, @@ -12235,9 +12731,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRILL_RUN] = { - .name = MOVE_NAME("Drill Run"), - .description = COMPOUND_STRING("Spins its body like a drill.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Drill Run"), + .description = COMPOUND_STRING( + "Spins its body like a drill.\n" + "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GROUND, @@ -12256,9 +12753,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_CHOP] = { - .name = MOVE_NAME("Dual Chop"), - .description = COMPOUND_STRING("Attacks with brutal hits\n" - "that strike twice."), + .name = COMPOUND_STRING("Dual Chop"), + .description = COMPOUND_STRING( + "Attacks with brutal hits\n" + "that strike twice."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_DRAGON, @@ -12277,9 +12775,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEART_STAMP] = { - .name = MOVE_NAME("Heart Stamp"), - .description = COMPOUND_STRING("A sudden blow after a cute\n" - "act. May cause flinching."), + .name = COMPOUND_STRING("Heart Stamp"), + .description = COMPOUND_STRING( + "A sudden blow after a cute\n" + "act. May cause flinching."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_PSYCHIC, @@ -12302,7 +12801,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HORN_LEECH] = { - .name = MOVE_NAME("Horn Leech"), + .name = COMPOUND_STRING("Horn Leech"), .description = sMegaDrainDescription, .effect = EFFECT_ABSORB, .power = 75, @@ -12322,7 +12821,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_SWORD] = { - .name = MOVE_NAME("Sacred Sword"), + .name = COMPOUND_STRING("Sacred Sword"), .description = sChipAwayDescription, .effect = EFFECT_HIT, .power = 90, @@ -12343,9 +12842,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAZOR_SHELL] = { - .name = MOVE_NAME("Razor Shell"), - .description = COMPOUND_STRING("Tears at the foe with sharp\n" - "shells. May lower Defense."), + .name = COMPOUND_STRING("Razor Shell"), + .description = COMPOUND_STRING( + "Tears at the foe with sharp\n" + "shells. May lower Defense."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_WATER, @@ -12369,7 +12869,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_CRASH] = { - .name = MOVE_NAME("Heat Crash"), + .name = COMPOUND_STRING("Heat Crash"), .description = sHeavySlamDescription, .effect = EFFECT_HEAT_CRASH, .power = 1, @@ -12389,9 +12889,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_TORNADO] = { - .name = MOVE_NAME("Leaf Tornado"), - .description = COMPOUND_STRING("Circles the foe with leaves\n" - "to damage and cut accuracy."), + .name = COMPOUND_STRING("Leaf Tornado"), + .description = COMPOUND_STRING( + "Circles the foe with leaves\n" + "to damage and cut accuracy."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_GRASS, @@ -12414,9 +12915,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STEAMROLLER] = { - .name = MOVE_NAME("Steamroller"), - .description = COMPOUND_STRING("Crushes the foe with its\n" - "body. May cause flinching."), + .name = COMPOUND_STRING("Steamroller"), + .description = COMPOUND_STRING( + "Crushes the foe with its\n" + "body. May cause flinching."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_BUG, @@ -12440,9 +12942,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_GUARD] = { - .name = MOVE_NAME("Cotton Guard"), - .description = COMPOUND_STRING("Wraps its body in cotton.\n" - "Drastically raises Defense."), + .name = COMPOUND_STRING("Cotton Guard"), + .description = COMPOUND_STRING( + "Wraps its body in cotton.\n" + "Drastically raises Defense."), .effect = EFFECT_DEFENSE_UP_3, .power = 0, .type = TYPE_GRASS, @@ -12463,9 +12966,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHT_DAZE] = { - .name = MOVE_NAME("Night Daze"), - .description = COMPOUND_STRING("Looses a pitch-black shock\n" - "wave. May lower accuracy."), + .name = COMPOUND_STRING("Night Daze"), + .description = COMPOUND_STRING( + "Looses a pitch-black shock\n" + "wave. May lower accuracy."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -12487,7 +12991,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSTRIKE] = { - .name = MOVE_NAME("Psystrike"), + .name = COMPOUND_STRING("Psystrike"), .description = sPsyshockDescription, .effect = EFFECT_PSYSHOCK, .power = 100, @@ -12505,9 +13009,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_SLAP] = { - .name = MOVE_NAME("Tail Slap"), - .description = COMPOUND_STRING("Strikes the foe with its\n" - "tail 2 to 5 times."), + .name = COMPOUND_STRING("Tail Slap"), + .description = COMPOUND_STRING( + "Strikes the foe with its\n" + "tail 2 to 5 times."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_NORMAL, @@ -12525,9 +13030,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HURRICANE] = { - .name = MOVE_NAME("Hurricane"), - .description = COMPOUND_STRING("Traps the foe in a fierce\n" - "wind. May cause confusion."), + .name = COMPOUND_STRING("Hurricane"), + .description = COMPOUND_STRING( + "Traps the foe in a fierce\n" + "wind. May cause confusion."), .effect = EFFECT_THUNDER, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_FLYING, @@ -12551,9 +13057,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_CHARGE] = { - .name = MOVE_NAME("Head Charge"), - .description = COMPOUND_STRING("A charge using guard hair.\n" - "It hurts the user a little."), + .name = COMPOUND_STRING("Head Charge"), + .description = COMPOUND_STRING( + "A charge using guard hair.\n" + "It hurts the user a little."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -12572,9 +13079,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_GRIND] = { - .name = MOVE_NAME("Gear Grind"), - .description = COMPOUND_STRING("Throws two steel gears\n" - "that strike twice."), + .name = COMPOUND_STRING("Gear Grind"), + .description = COMPOUND_STRING( + "Throws two steel gears\n" + "that strike twice."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -12593,7 +13101,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SEARING_SHOT] = { - .name = MOVE_NAME("Searing Shot"), + .name = COMPOUND_STRING("Searing Shot"), .description = sLavaPlumeDescription, .effect = EFFECT_HIT, .power = 100, @@ -12617,9 +13125,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TECHNO_BLAST] = { - .name = MOVE_NAME("Techno Blast"), - .description = COMPOUND_STRING("The type varies with the\n" - "kind of Drive held."), + .name = COMPOUND_STRING("Techno Blast"), + .description = COMPOUND_STRING( + "The type varies with the\n" + "kind of Drive held."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 85, .type = TYPE_NORMAL, @@ -12638,9 +13147,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RELIC_SONG] = { - .name = MOVE_NAME("Relic Song"), - .description = COMPOUND_STRING("Attacks with an ancient\n" - "song. May induce sleep."), + .name = COMPOUND_STRING("Relic Song"), + .description = COMPOUND_STRING( + "Attacks with an ancient\n" + "song. May induce sleep."), .effect = EFFECT_RELIC_SONG, .power = 75, .type = TYPE_NORMAL, @@ -12666,9 +13176,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SECRET_SWORD] = { - .name = MOVE_NAME("Secret Sword"), - .description = COMPOUND_STRING("Cuts with a long horn that\n" - "does physical damage."), + .name = COMPOUND_STRING("Secret Sword"), + .description = COMPOUND_STRING( + "Cuts with a long horn that\n" + "does physical damage."), .effect = EFFECT_PSYSHOCK, .power = 85, .type = TYPE_FIGHTING, @@ -12687,9 +13198,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIATE] = { - .name = MOVE_NAME("Glaciate"), - .description = COMPOUND_STRING("Blows very cold air at the\n" - "foe. It lowers their Speed."), + .name = COMPOUND_STRING("Glaciate"), + .description = COMPOUND_STRING( + "Blows very cold air at the\n" + "foe. It lowers their Speed."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ICE, @@ -12711,9 +13223,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_STRIKE] = { - .name = MOVE_NAME("Bolt Strike"), - .description = COMPOUND_STRING("Strikes with a great amount\n" - "of lightning. May paralyze."), + .name = COMPOUND_STRING("Bolt Strike"), + .description = COMPOUND_STRING( + "Strikes with a great amount\n" + "of lightning. May paralyze."), .effect = EFFECT_HIT, .power = 130, .type = TYPE_ELECTRIC, @@ -12736,9 +13249,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLUE_FLARE] = { - .name = MOVE_NAME("Blue Flare"), - .description = COMPOUND_STRING("Engulfs the foe in a blue\n" - "flame. May inflict a burn."), + .name = COMPOUND_STRING("Blue Flare"), + .description = COMPOUND_STRING( + "Engulfs the foe in a blue\n" + "flame. May inflict a burn."), .effect = EFFECT_HIT, .power = 130, .type = TYPE_FIRE, @@ -12760,9 +13274,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_DANCE] = { - .name = MOVE_NAME("Fiery Dance"), - .description = COMPOUND_STRING("Dances cloaked in flames.\n" - "May raise Sp. Atk."), + .name = COMPOUND_STRING("Fiery Dance"), + .description = COMPOUND_STRING( + "Dances cloaked in flames.\n" + "May raise Sp. Atk."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -12786,9 +13301,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_SHOCK] = { - .name = MOVE_NAME("Freeze Shock"), - .description = COMPOUND_STRING("A powerful 2-turn move that\n" - "may paralyze the foe."), + .name = COMPOUND_STRING("Freeze Shock"), + .description = COMPOUND_STRING( + "A powerful 2-turn move that\n" + "may paralyze the foe."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_ICE, @@ -12814,9 +13330,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BURN] = { - .name = MOVE_NAME("Ice Burn"), - .description = COMPOUND_STRING("A powerful 2-turn move that\n" - "may inflict a burn."), + .name = COMPOUND_STRING("Ice Burn"), + .description = COMPOUND_STRING( + "A powerful 2-turn move that\n" + "may inflict a burn."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_ICE, @@ -12842,9 +13359,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SNARL] = { - .name = MOVE_NAME("Snarl"), - .description = COMPOUND_STRING("Yells and rants at the foe\n" - "lowering its Sp. Atk."), + .name = COMPOUND_STRING("Snarl"), + .description = COMPOUND_STRING( + "Yells and rants at the foe\n" + "lowering its Sp. Atk."), .effect = EFFECT_HIT, .power = 55, .type = TYPE_DARK, @@ -12869,9 +13387,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_CRASH] = { - .name = MOVE_NAME("Icicle Crash"), - .description = COMPOUND_STRING("Drops large icicles on the\n" - "foe. May cause flinching."), + .name = COMPOUND_STRING("Icicle Crash"), + .description = COMPOUND_STRING( + "Drops large icicles on the\n" + "foe. May cause flinching."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_ICE, @@ -12893,9 +13412,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_V_CREATE] = { - .name = MOVE_NAME("V-create"), - .description = COMPOUND_STRING("Very powerful, but lowers\n" - "Defense, Sp. Def and Speed."), + .name = COMPOUND_STRING("V-create"), + .description = COMPOUND_STRING( + "Very powerful, but lowers\n" + "Defense, Sp. Def and Speed."), .effect = EFFECT_HIT, .power = 180, .type = TYPE_FIRE, @@ -12918,9 +13438,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_FLARE] = { - .name = MOVE_NAME("Fusion Flare"), - .description = COMPOUND_STRING("Summons a fireball. Works\n" - "well with a thunderbolt."), + .name = COMPOUND_STRING("Fusion Flare"), + .description = COMPOUND_STRING( + "Summons a fireball. Works\n" + "well with a thunderbolt."), .effect = EFFECT_FUSION_COMBO, .power = 100, .type = TYPE_FIRE, @@ -12938,9 +13459,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FUSION_BOLT] = { - .name = MOVE_NAME("Fusion Bolt"), - .description = COMPOUND_STRING("Summons a thunderbolt.\n" - "Works well with a fireball."), + .name = COMPOUND_STRING("Fusion Bolt"), + .description = COMPOUND_STRING( + "Summons a thunderbolt.\n" + "Works well with a fireball."), .effect = EFFECT_FUSION_COMBO, .power = 100, .type = TYPE_ELECTRIC, @@ -12957,9 +13479,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLYING_PRESS] = { - .name = MOVE_NAME("Flying Press"), - .description = COMPOUND_STRING("This attack does Fighting\n" - "and Flying-type damage."), + .name = COMPOUND_STRING("Flying Press"), + .description = COMPOUND_STRING( + "This attack does Fighting\n" + "and Flying-type damage."), .effect = EFFECT_TWO_TYPED_MOVE, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 100 : 80, .type = TYPE_FIGHTING, @@ -12981,9 +13504,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAT_BLOCK] = { - .name = MOVE_NAME("Mat Block"), - .description = COMPOUND_STRING("Evades damaging moves\n" - "for one turn."), + .name = COMPOUND_STRING("Mat Block"), + .description = COMPOUND_STRING( + "Evades damaging moves\n" + "for one turn."), .effect = EFFECT_MAT_BLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -13009,9 +13533,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BELCH] = { - .name = MOVE_NAME("Belch"), - .description = COMPOUND_STRING("Lets out a loud belch.\n" - "Must eat a Berry to use it."), + .name = COMPOUND_STRING("Belch"), + .description = COMPOUND_STRING( + "Lets out a loud belch.\n" + "Must eat a Berry to use it."), .effect = EFFECT_BELCH, .power = 120, .type = TYPE_POISON, @@ -13036,9 +13561,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ROTOTILLER] = { - .name = MOVE_NAME("Rototiller"), - .description = COMPOUND_STRING("Ups the Attack and Sp. Atk\n" - "of Grass-type Pokémon."), + .name = COMPOUND_STRING("Rototiller"), + .description = COMPOUND_STRING( + "Ups the Attack and Sp. Atk\n" + "of Grass-type Pokémon."), .effect = EFFECT_ROTOTILLER, .power = 0, .type = TYPE_GROUND, @@ -13059,9 +13585,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STICKY_WEB] = { - .name = MOVE_NAME("Sticky Web"), - .description = COMPOUND_STRING("Weaves a sticky net that\n" - "slows foes switching in."), + .name = COMPOUND_STRING("Sticky Web"), + .description = COMPOUND_STRING( + "Weaves a sticky net that\n" + "slows foes switching in."), .effect = EFFECT_STICKY_WEB, .power = 0, .type = TYPE_BUG, @@ -13083,9 +13610,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FELL_STINGER] = { - .name = MOVE_NAME("Fell Stinger"), - .description = COMPOUND_STRING("If it knocks out a foe\n" - "the Attack stat is raised."), + .name = COMPOUND_STRING("Fell Stinger"), + .description = COMPOUND_STRING( + "If it knocks out a foe\n" + "the Attack stat is raised."), .effect = EFFECT_FELL_STINGER, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 50 : 30, .type = TYPE_BUG, @@ -13132,8 +13660,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRICK_OR_TREAT] = { .name = HANDLE_EXPANDED_MOVE_NAME("TrickOrTreat", "Trick-or-Treat"), - .description = COMPOUND_STRING("Goes trick-or-treating\n" - "making the foe Ghost-type."), + .description = COMPOUND_STRING( + "Goes trick-or-treating\n" + "making the foe Ghost-type."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GHOST, @@ -13153,9 +13682,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NOBLE_ROAR] = { - .name = MOVE_NAME("Noble Roar"), - .description = COMPOUND_STRING("Intimidates the foe, to cut\n" - "Attack and Sp. Atk."), + .name = COMPOUND_STRING("Noble Roar"), + .description = COMPOUND_STRING( + "Intimidates the foe, to cut\n" + "Attack and Sp. Atk."), .effect = EFFECT_NOBLE_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -13176,9 +13706,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ION_DELUGE] = { - .name = MOVE_NAME("Ion Deluge"), - .description = COMPOUND_STRING("Electrifies Normal-type\n" - "moves with charged atoms."), + .name = COMPOUND_STRING("Ion Deluge"), + .description = COMPOUND_STRING( + "Electrifies Normal-type\n" + "moves with charged atoms."), .effect = EFFECT_ION_DELUGE, .power = 0, .type = TYPE_ELECTRIC, @@ -13199,8 +13730,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PARABOLIC_CHARGE] = { .name = HANDLE_EXPANDED_MOVE_NAME("ParabolcChrg", "Parabolic Charge"), - .description = COMPOUND_STRING("Damages adjacent Pokémon and\n" - "heals up by half of it."), + .description = COMPOUND_STRING( + "Damages adjacent Pokémon and\n" + "heals up by half of it."), .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 65 : 50, .type = TYPE_ELECTRIC, @@ -13219,8 +13751,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FORESTS_CURSE] = { .name = HANDLE_EXPANDED_MOVE_NAME("Forest'sCurs", "Forest's Curse"), - .description = COMPOUND_STRING("Puts a curse on the foe\n" - "making the foe Grass-type."), + .description = COMPOUND_STRING( + "Puts a curse on the foe\n" + "making the foe Grass-type."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GRASS, @@ -13241,8 +13774,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PETAL_BLIZZARD] = { .name = HANDLE_EXPANDED_MOVE_NAME("PetalBlizzrd", "Petal Blizzard"), - .description = COMPOUND_STRING("Stirs up a violent storm\n" - "of petals to attack."), + .description = COMPOUND_STRING( + "Stirs up a violent storm\n" + "of petals to attack."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GRASS, @@ -13260,9 +13794,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZE_DRY] = { - .name = MOVE_NAME("Freeze-Dry"), - .description = COMPOUND_STRING("Super effective on Water-\n" - "types. May cause freezing."), + .name = COMPOUND_STRING("Freeze-Dry"), + .description = COMPOUND_STRING( + "Super effective on Water-\n" + "types. May cause freezing."), .effect = EFFECT_FREEZE_DRY, .power = 70, .type = TYPE_ICE, @@ -13285,8 +13820,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DISARMING_VOICE] = { .name = HANDLE_EXPANDED_MOVE_NAME("DisrmngVoice", "Disarming Voice"), - .description = COMPOUND_STRING("Lets out a charming cry\n" - "that cannot be evaded."), + .description = COMPOUND_STRING( + "Lets out a charming cry\n" + "that cannot be evaded."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FAIRY, @@ -13305,9 +13841,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PARTING_SHOT] = { - .name = MOVE_NAME("Parting Shot"), - .description = COMPOUND_STRING("Lowers the foe's Attack and\n" - "Sp. Atk, then switches out."), + .name = COMPOUND_STRING("Parting Shot"), + .description = COMPOUND_STRING( + "Lowers the foe's Attack and\n" + "Sp. Atk, then switches out."), .effect = EFFECT_PARTING_SHOT, .power = 0, .type = TYPE_DARK, @@ -13328,9 +13865,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TOPSY_TURVY] = { - .name = MOVE_NAME("Topsy-Turvy"), - .description = COMPOUND_STRING("Swaps all stat changes that\n" - "affect the target."), + .name = COMPOUND_STRING("Topsy-Turvy"), + .description = COMPOUND_STRING( + "Swaps all stat changes that\n" + "affect the target."), .effect = EFFECT_TOPSY_TURVY, .power = 0, .type = TYPE_DARK, @@ -13371,8 +13909,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CRAFTY_SHIELD] = { .name = HANDLE_EXPANDED_MOVE_NAME("CraftyShield", "Crafty Shield"), - .description = COMPOUND_STRING("Evades status moves for\n" - "one turn."), + .description = COMPOUND_STRING( + "Evades status moves for\n" + "one turn."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FAIRY, @@ -13395,8 +13934,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_SHIELD] = { .name = HANDLE_EXPANDED_MOVE_NAME("FlowerShield", "Flower Shield"), - .description = COMPOUND_STRING("Raises the Defense of\n" - "Grass-type Pokémon."), + .description = COMPOUND_STRING( + "Raises the Defense of\n" + "Grass-type Pokémon."), .effect = EFFECT_FLOWER_SHIELD, .power = 0, .type = TYPE_FAIRY, @@ -13417,8 +13957,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_TERRAIN] = { .name = HANDLE_EXPANDED_MOVE_NAME("GrssyTerrain", "Grassy Terrain"), - .description = COMPOUND_STRING("The ground turns to grass\n" - "for 5 turns. Restores HP."), + .description = COMPOUND_STRING( + "The ground turns to grass\n" + "for 5 turns. Restores HP."), .effect = EFFECT_GRASSY_TERRAIN, .power = 0, .type = TYPE_GRASS, @@ -13440,8 +13981,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_TERRAIN] = { .name = HANDLE_EXPANDED_MOVE_NAME("MistyTerrain", "Misty Terrain"), - .description = COMPOUND_STRING("Covers the ground with mist\n" - "for 5 turns. Blocks status."), + .description = COMPOUND_STRING( + "Covers the ground with mist\n" + "for 5 turns. Blocks status."), .effect = EFFECT_MISTY_TERRAIN, .power = 0, .type = TYPE_FAIRY, @@ -13462,9 +14004,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIFY] = { - .name = MOVE_NAME("Electrify"), - .description = COMPOUND_STRING("Electrifies the foe, making\n" - "its next move Electric-type."), + .name = COMPOUND_STRING("Electrify"), + .description = COMPOUND_STRING( + "Electrifies the foe, making\n" + "its next move Electric-type."), .effect = EFFECT_ELECTRIFY, .power = 0, .type = TYPE_ELECTRIC, @@ -13482,9 +14025,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_ROUGH] = { - .name = MOVE_NAME("Play Rough"), - .description = COMPOUND_STRING("Plays rough with the foe.\n" - "May lower Attack."), + .name = COMPOUND_STRING("Play Rough"), + .description = COMPOUND_STRING( + "Plays rough with the foe.\n" + "May lower Attack."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_FAIRY, @@ -13507,9 +14051,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_WIND] = { - .name = MOVE_NAME("Fairy Wind"), - .description = COMPOUND_STRING("Stirs up a fairy wind to\n" - "strike the foe."), + .name = COMPOUND_STRING("Fairy Wind"), + .description = COMPOUND_STRING( + "Stirs up a fairy wind to\n" + "strike the foe."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FAIRY, @@ -13527,9 +14072,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MOONBLAST] = { - .name = MOVE_NAME("Moonblast"), - .description = COMPOUND_STRING("Attacks with the power of\n" - "the moon. May lower Sp. Atk."), + .name = COMPOUND_STRING("Moonblast"), + .description = COMPOUND_STRING( + "Attacks with the power of\n" + "the moon. May lower Sp. Atk."), .effect = EFFECT_HIT, .power = 95, .type = TYPE_FAIRY, @@ -13551,9 +14097,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BOOMBURST] = { - .name = MOVE_NAME("Boomburst"), - .description = COMPOUND_STRING("Attacks everything with a\n" - "destructive sound wave."), + .name = COMPOUND_STRING("Boomburst"), + .description = COMPOUND_STRING( + "Attacks everything with a\n" + "destructive sound wave."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_NORMAL, @@ -13572,9 +14119,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FAIRY_LOCK] = { - .name = MOVE_NAME("Fairy Lock"), - .description = COMPOUND_STRING("Locks down the battlefield\n" - "preventing escape next turn."), + .name = COMPOUND_STRING("Fairy Lock"), + .description = COMPOUND_STRING( + "Locks down the battlefield\n" + "preventing escape next turn."), .effect = EFFECT_FAIRY_LOCK, .power = 0, .type = TYPE_FAIRY, @@ -13595,8 +14143,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_KINGS_SHIELD] = { .name = HANDLE_EXPANDED_MOVE_NAME("King'sShield", "King's Shield"), - .description = COMPOUND_STRING("Evades damage, and sharply\n" - "reduces Attack if struck."), + .description = COMPOUND_STRING( + "Evades damage, and sharply\n" + "reduces Attack if struck."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_STEEL, @@ -13621,9 +14170,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PLAY_NICE] = { - .name = MOVE_NAME("Play Nice"), - .description = COMPOUND_STRING("Befriend the foe, lowering\n" - "its Attack without fail."), + .name = COMPOUND_STRING("Play Nice"), + .description = COMPOUND_STRING( + "Befriend the foe, lowering\n" + "its Attack without fail."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -13644,9 +14194,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CONFIDE] = { - .name = MOVE_NAME("Confide"), - .description = COMPOUND_STRING("Shares a secret with the\n" - "foe, lowering Sp. Atk."), + .name = COMPOUND_STRING("Confide"), + .description = COMPOUND_STRING( + "Shares a secret with the\n" + "foe, lowering Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -13669,8 +14220,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DIAMOND_STORM] = { .name = HANDLE_EXPANDED_MOVE_NAME("DiamondStorm", "Diamond Storm"), - .description = COMPOUND_STRING("Whips up a storm of\n" - "diamonds. May up Defense."), + .description = COMPOUND_STRING( + "Whips up a storm of\n" + "diamonds. May up Defense."), .power = 100, .type = TYPE_ROCK, .accuracy = 95, @@ -13693,8 +14245,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STEAM_ERUPTION] = { .name = HANDLE_EXPANDED_MOVE_NAME("SteamErption", "Steam Eruption"), - .description = COMPOUND_STRING("Immerses the foe in heated\n" - "steam. May inflict a burn."), + .description = COMPOUND_STRING( + "Immerses the foe in heated\n" + "steam. May inflict a burn."), .effect = EFFECT_HIT, .power = 110, .type = TYPE_WATER, @@ -13743,8 +14296,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SHURIKEN] = { .name = HANDLE_EXPANDED_MOVE_NAME("WatrShuriken", "Water Shuriken"), - .description = COMPOUND_STRING("Throws 2 to 5 stars that\n" - "are sure to strike first."), + .description = COMPOUND_STRING( + "Throws 2 to 5 stars that\n" + "are sure to strike first."), .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_WATER, @@ -13762,8 +14316,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_FIRE] = { .name = HANDLE_EXPANDED_MOVE_NAME("MysticalFire", "Mystical Fire"), - .description = COMPOUND_STRING("Breathes a special, hot\n" - "fire. Lowers Sp. Atk."), + .description = COMPOUND_STRING( + "Breathes a special, hot\n" + "fire. Lowers Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 75 : 65, .type = TYPE_FIRE, @@ -13785,9 +14340,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIKY_SHIELD] = { - .name = MOVE_NAME("Spiky Shield"), - .description = COMPOUND_STRING("Evades attack, and damages\n" - "the foe if struck."), + .name = COMPOUND_STRING("Spiky Shield"), + .description = COMPOUND_STRING( + "Evades attack, and damages\n" + "the foe if struck."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_GRASS, @@ -13812,8 +14368,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AROMATIC_MIST] = { .name = HANDLE_EXPANDED_MOVE_NAME("AromaticMist", "Aromatic Mist"), - .description = COMPOUND_STRING("Raises the Sp. Def of a\n" - "partner Pokémon."), + .description = COMPOUND_STRING( + "Raises the Sp. Def of a\n" + "partner Pokémon."), .effect = EFFECT_AROMATIC_MIST, .power = 0, .type = TYPE_FAIRY, @@ -13835,8 +14392,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_IMPULSE] = { .name = HANDLE_EXPANDED_MOVE_NAME("EerieImpulse", "Eerie Impulse"), - .description = COMPOUND_STRING("Exposes the foe to a pulse\n" - "that sharply cuts Sp. Atk."), + .description = COMPOUND_STRING( + "Exposes the foe to a pulse\n" + "that sharply cuts Sp. Atk."), .effect = EFFECT_SPECIAL_ATTACK_DOWN_2, .power = 0, .type = TYPE_ELECTRIC, @@ -13855,9 +14413,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VENOM_DRENCH] = { - .name = MOVE_NAME("Venom Drench"), - .description = COMPOUND_STRING("Lowers the Attack, Sp. Atk\n" - "and Speed of a poisoned foe."), + .name = COMPOUND_STRING("Venom Drench"), + .description = COMPOUND_STRING( + "Lowers the Attack, Sp. Atk\n" + "and Speed of a poisoned foe."), .effect = EFFECT_VENOM_DRENCH, .power = 0, .type = TYPE_POISON, @@ -13876,9 +14435,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWDER] = { - .name = MOVE_NAME("Powder"), - .description = COMPOUND_STRING("Damages the foe if it uses\n" - "a Fire-type move."), + .name = COMPOUND_STRING("Powder"), + .description = COMPOUND_STRING( + "Damages the foe if it uses\n" + "a Fire-type move."), .effect = EFFECT_POWDER, .power = 0, .type = TYPE_BUG, @@ -13898,9 +14458,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GEOMANCY] = { - .name = MOVE_NAME("Geomancy"), - .description = COMPOUND_STRING("Raises Sp. Atk, Sp. Def and\n" - "Speed on the 2nd turn."), + .name = COMPOUND_STRING("Geomancy"), + .description = COMPOUND_STRING( + "Raises Sp. Atk, Sp. Def and\n" + "Speed on the 2nd turn."), .effect = EFFECT_GEOMANCY, .power = 0, .type = TYPE_FAIRY, @@ -13923,8 +14484,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGNETIC_FLUX] = { .name = HANDLE_EXPANDED_MOVE_NAME("MagneticFlux", "Magnetic Flux"), - .description = COMPOUND_STRING("Boosts the defenses of\n" - "those with Plus or Minus."), + .description = COMPOUND_STRING( + "Boosts the defenses of\n" + "those with Plus or Minus."), .effect = EFFECT_MAGNETIC_FLUX, .power = 0, .type = TYPE_ELECTRIC, @@ -13946,9 +14508,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HAPPY_HOUR] = { - .name = MOVE_NAME("Happy Hour"), - .description = COMPOUND_STRING("Doubles the amount of\n" - "Prize Money received."), + .name = COMPOUND_STRING("Happy Hour"), + .description = COMPOUND_STRING( + "Doubles the amount of\n" + "Prize Money received."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -13969,8 +14532,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRIC_TERRAIN] = { .name = HANDLE_EXPANDED_MOVE_NAME("ElctrcTrrain", "Electric Terrain"), - .description = COMPOUND_STRING("Electrifies the ground for\n" - "5 turns. Prevents sleep."), + .description = COMPOUND_STRING( + "Electrifies the ground for\n" + "5 turns. Prevents sleep."), .effect = EFFECT_ELECTRIC_TERRAIN, .power = 0, .type = TYPE_ELECTRIC, @@ -13992,8 +14556,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DAZZLING_GLEAM] = { .name = HANDLE_EXPANDED_MOVE_NAME("DazzlngGleam", "Dazzling Gleam"), - .description = COMPOUND_STRING("Damages foes by emitting\n" - "a bright flash."), + .description = COMPOUND_STRING( + "Damages foes by emitting\n" + "a bright flash."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FAIRY, @@ -14010,9 +14575,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CELEBRATE] = { - .name = MOVE_NAME("Celebrate"), - .description = COMPOUND_STRING("Congratulates you on your\n" - "special day."), + .name = COMPOUND_STRING("Celebrate"), + .description = COMPOUND_STRING( + "Congratulates you on your\n" + "special day."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -14038,9 +14604,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_HANDS] = { - .name = MOVE_NAME("Hold Hands"), - .description = COMPOUND_STRING("The user and ally hold hands\n" - "making them happy."), + .name = COMPOUND_STRING("Hold Hands"), + .description = COMPOUND_STRING( + "The user and ally hold hands\n" + "making them happy."), .effect = EFFECT_DO_NOTHING, .power = 0, .type = TYPE_NORMAL, @@ -14067,8 +14634,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BABY_DOLL_EYES] = { .name = HANDLE_EXPANDED_MOVE_NAME("BabyDollEyes", "Baby-Doll Eyes"), - .description = COMPOUND_STRING("Lowers the foe's Attack\n" - "before it can move."), + .description = COMPOUND_STRING( + "Lowers the foe's Attack\n" + "before it can move."), .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_FAIRY, @@ -14087,9 +14655,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NUZZLE] = { - .name = MOVE_NAME("Nuzzle"), - .description = COMPOUND_STRING("Rubs its cheecks against\n" - "the foe, paralyzing it."), + .name = COMPOUND_STRING("Nuzzle"), + .description = COMPOUND_STRING( + "Rubs its cheecks against\n" + "the foe, paralyzing it."), .effect = EFFECT_HIT, .power = 20, .type = TYPE_ELECTRIC, @@ -14112,7 +14681,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HOLD_BACK] = { - .name = MOVE_NAME("Hold Back"), + .name = COMPOUND_STRING("Hold Back"), .description = sFalseSwipeDescription, .effect = EFFECT_FALSE_SWIPE, .power = 40, @@ -14131,9 +14700,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_INFESTATION] = { - .name = MOVE_NAME("Infestation"), - .description = COMPOUND_STRING("The foe is infested and\n" - "attacked for "BINDING_TURNS" turns."), + .name = COMPOUND_STRING("Infestation"), + .description = COMPOUND_STRING( + "The foe is infested and\n" + "attacked for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = 20, .type = TYPE_BUG, @@ -14155,8 +14725,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_UP_PUNCH] = { .name = HANDLE_EXPANDED_MOVE_NAME("PowerUpPunch", "Power-Up Punch"), - .description = COMPOUND_STRING("A hard punch that raises\n" - "the user's Attack."), + .description = COMPOUND_STRING( + "A hard punch that raises\n" + "the user's Attack."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FIGHTING, @@ -14202,8 +14773,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_ARROWS] = { .name = HANDLE_EXPANDED_MOVE_NAME("ThousndArrws", "Thousand Arrows"), - .description = COMPOUND_STRING("Can hit Flying foes, then\n" - "knocks them to the ground."), + .description = COMPOUND_STRING( + "Can hit Flying foes, then\n" + "knocks them to the ground."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -14228,8 +14800,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_WAVES] = { .name = HANDLE_EXPANDED_MOVE_NAME("ThousndWaves", "Thousand Waves"), - .description = COMPOUND_STRING("Those hit by the wave can\n" - "no longer escape."), + .description = COMPOUND_STRING( + "Those hit by the wave can\n" + "no longer escape."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -14251,9 +14824,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LANDS_WRATH] = { - .name = MOVE_NAME("Land's Wrath"), - .description = COMPOUND_STRING("Gathers the energy of the\n" - "land to attack every foe."), + .name = COMPOUND_STRING("Land's Wrath"), + .description = COMPOUND_STRING( + "Gathers the energy of the\n" + "land to attack every foe."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, @@ -14272,8 +14846,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_OF_RUIN] = { .name = HANDLE_EXPANDED_MOVE_NAME("LightOfRuin", "Light Of Ruin"), - .description = COMPOUND_STRING("Fires a great beam of light\n" - "that also hurts the user."), + .description = COMPOUND_STRING( + "Fires a great beam of light\n" + "that also hurts the user."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_FAIRY, @@ -14288,9 +14863,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ORIGIN_PULSE] = { - .name = MOVE_NAME("Origin Pulse"), - .description = COMPOUND_STRING("Beams of glowing blue light\n" - "blast both foes."), + .name = COMPOUND_STRING("Origin Pulse"), + .description = COMPOUND_STRING( + "Beams of glowing blue light\n" + "blast both foes."), .effect = EFFECT_HIT, .power = 110, .type = TYPE_WATER, @@ -14310,8 +14886,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PRECIPICE_BLADES] = { .name = HANDLE_EXPANDED_MOVE_NAME("PrcipceBldes", "Precipice Blades"), - .description = COMPOUND_STRING("Fearsome blades of stone\n" - "attack both foes."), + .description = COMPOUND_STRING( + "Fearsome blades of stone\n" + "attack both foes."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GROUND, @@ -14381,9 +14958,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHORE_UP] = { - .name = MOVE_NAME("Shore Up"), - .description = COMPOUND_STRING("Restores the user's HP.\n" - "More HP in a sandstorm."), + .name = COMPOUND_STRING("Shore Up"), + .description = COMPOUND_STRING( + "Restores the user's HP.\n" + "More HP in a sandstorm."), .effect = EFFECT_SHORE_UP, .power = 0, .type = TYPE_GROUND, @@ -14406,8 +14984,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIRST_IMPRESSION] = { .name = HANDLE_EXPANDED_MOVE_NAME("FrstImpressn", "First Impression"), - .description = COMPOUND_STRING("Hits hard and first.\n" - "Only works first turn."), + .description = COMPOUND_STRING( + "Hits hard and first.\n" + "Only works first turn."), .effect = EFFECT_FAKE_OUT, .power = 90, .type = TYPE_BUG, @@ -14426,8 +15005,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BANEFUL_BUNKER] = { .name = HANDLE_EXPANDED_MOVE_NAME("BanefulBunkr", "Baneful Bunker"), - .description = COMPOUND_STRING("Protects user and poisons\n" - "foes on contact."), + .description = COMPOUND_STRING( + "Protects user and poisons\n" + "foes on contact."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_POISON, @@ -14452,8 +15032,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_SHACKLE] = { .name = HANDLE_EXPANDED_MOVE_NAME("SpiritShackl", "Spirit Shackle"), - .description = COMPOUND_STRING("After being hit, foes can\n" - "no longer escape."), + .description = COMPOUND_STRING( + "After being hit, foes can\n" + "no longer escape."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GHOST, @@ -14476,8 +15057,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DARKEST_LARIAT] = { .name = HANDLE_EXPANDED_MOVE_NAME("DarkstLariat", "Darkest Lariat"), - .description = COMPOUND_STRING("Swings the arms to strike\n" - "It ignores stat changes."), + .description = COMPOUND_STRING( + "Swings the arms to strike\n" + "It ignores stat changes."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -14497,8 +15079,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLING_ARIA] = { .name = HANDLE_EXPANDED_MOVE_NAME("SparklngAria", "Sparkling Aria"), - .description = COMPOUND_STRING("Sings with bubbles. Cures\n" - "burns on contact."), + .description = COMPOUND_STRING( + "Sings with bubbles. Cures\n" + "burns on contact."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -14523,9 +15106,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_HAMMER] = { - .name = MOVE_NAME("Ice Hammer"), - .description = COMPOUND_STRING("Swings the fist to strike.\n" - "Lowers the user's Speed."), + .name = COMPOUND_STRING("Ice Hammer"), + .description = COMPOUND_STRING( + "Swings the fist to strike.\n" + "Lowers the user's Speed."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_ICE, @@ -14549,8 +15133,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLORAL_HEALING] = { .name = HANDLE_EXPANDED_MOVE_NAME("FloralHealng", "Floral Healng"), - .description = COMPOUND_STRING("Restores an ally's HP.\n" - "Heals more on grass."), + .description = COMPOUND_STRING( + "Restores an ally's HP.\n" + "Heals more on grass."), .effect = EFFECT_HEAL_PULSE, .power = 0, .type = TYPE_FAIRY, @@ -14573,8 +15158,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HIGH_HORSEPOWER] = { .name = HANDLE_EXPANDED_MOVE_NAME("HighHorsepwr", "High Horsepower"), - .description = COMPOUND_STRING("Slams hard into the foe with\n" - "its entire body."), + .description = COMPOUND_STRING( + "Slams hard into the foe with\n" + "its entire body."), .effect = EFFECT_HIT, .power = 95, .type = TYPE_GROUND, @@ -14592,9 +15178,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STRENGTH_SAP] = { - .name = MOVE_NAME("Strength Sap"), - .description = COMPOUND_STRING("Saps the foe's Attack to\n" - "heal HP, then drops Attack."), + .name = COMPOUND_STRING("Strength Sap"), + .description = COMPOUND_STRING( + "Saps the foe's Attack to\n" + "heal HP, then drops Attack."), .effect = EFFECT_STRENGTH_SAP, .power = 0, .type = TYPE_GRASS, @@ -14614,9 +15201,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SOLAR_BLADE] = { - .name = MOVE_NAME("Solar Blade"), - .description = COMPOUND_STRING("Charges first turn, then\n" - "chops with a blade of light."), + .name = COMPOUND_STRING("Solar Blade"), + .description = COMPOUND_STRING( + "Charges first turn, then\n" + "chops with a blade of light."), .effect = EFFECT_SOLAR_BEAM, .power = 125, .type = TYPE_GRASS, @@ -14638,9 +15226,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LEAFAGE] = { - .name = MOVE_NAME("Leafage"), - .description = COMPOUND_STRING("Attacks with a flurry of\n" - "small leaves."), + .name = COMPOUND_STRING("Leafage"), + .description = COMPOUND_STRING( + "Attacks with a flurry of\n" + "small leaves."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GRASS, @@ -14657,9 +15246,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPOTLIGHT] = { - .name = MOVE_NAME("Spotlight"), - .description = COMPOUND_STRING("Makes the foe attack the\n" - "spotlighted Pokémon."), + .name = COMPOUND_STRING("Spotlight"), + .description = COMPOUND_STRING( + "Makes the foe attack the\n" + "spotlighted Pokémon."), .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_NORMAL, @@ -14682,9 +15272,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC_THREAD] = { - .name = MOVE_NAME("Toxic Thread"), - .description = COMPOUND_STRING("Attacks with a thread that\n" - "poisons and drops Speed."), + .name = COMPOUND_STRING("Toxic Thread"), + .description = COMPOUND_STRING( + "Attacks with a thread that\n" + "poisons and drops Speed."), .effect = EFFECT_TOXIC_THREAD, .power = 0, .type = TYPE_POISON, @@ -14703,9 +15294,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LASER_FOCUS] = { - .name = MOVE_NAME("Laser Focus"), - .description = COMPOUND_STRING("Guarantees the next move\n" - "will be a critical hit."), + .name = COMPOUND_STRING("Laser Focus"), + .description = COMPOUND_STRING( + "Guarantees the next move\n" + "will be a critical hit."), .effect = EFFECT_LASER_FOCUS, .power = 0, .type = TYPE_NORMAL, @@ -14726,9 +15318,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GEAR_UP] = { - .name = MOVE_NAME("Gear Up"), - .description = COMPOUND_STRING("Boosts the attacks of\n" - "those with Plus or Minus."), + .name = COMPOUND_STRING("Gear Up"), + .description = COMPOUND_STRING( + "Boosts the attacks of\n" + "those with Plus or Minus."), .effect = EFFECT_GEAR_UP, .power = 0, .type = TYPE_STEEL, @@ -14750,9 +15343,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THROAT_CHOP] = { - .name = MOVE_NAME("Throat Chop"), - .description = COMPOUND_STRING("Chops the throat to disable\n" - "sound moves for a while."), + .name = COMPOUND_STRING("Throat Chop"), + .description = COMPOUND_STRING( + "Chops the throat to disable\n" + "sound moves for a while."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -14775,9 +15369,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POLLEN_PUFF] = { - .name = MOVE_NAME("Pollen Puff"), - .description = COMPOUND_STRING("Explodes on foes, but\n" - "restores ally's HP."), + .name = COMPOUND_STRING("Pollen Puff"), + .description = COMPOUND_STRING( + "Explodes on foes, but\n" + "restores ally's HP."), .effect = EFFECT_HIT_ENEMY_HEAL_ALLY, .power = 90, .type = TYPE_BUG, @@ -14795,9 +15390,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ANCHOR_SHOT] = { - .name = MOVE_NAME("Anchor Shot"), - .description = COMPOUND_STRING("Strangles the foe with a\n" - "chain. The foe can't escape."), + .name = COMPOUND_STRING("Anchor Shot"), + .description = COMPOUND_STRING( + "Strangles the foe with a\n" + "chain. The foe can't escape."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_STEEL, @@ -14821,8 +15417,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_TERRAIN] = { .name = HANDLE_EXPANDED_MOVE_NAME("PsychcTrrain", "Psychic Terrain"), - .description = COMPOUND_STRING("The ground turns weird for\n" - "5 turns. Blocks priority."), + .description = COMPOUND_STRING( + "The ground turns weird for\n" + "5 turns. Blocks priority."), .effect = EFFECT_PSYCHIC_TERRAIN, .power = 0, .type = TYPE_PSYCHIC, @@ -14842,9 +15439,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LUNGE] = { - .name = MOVE_NAME("Lunge"), - .description = COMPOUND_STRING("Lunges at the foe to lower\n" - "its Attack stat."), + .name = COMPOUND_STRING("Lunge"), + .description = COMPOUND_STRING( + "Lunges at the foe to lower\n" + "its Attack stat."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_BUG, @@ -14867,9 +15465,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_LASH] = { - .name = MOVE_NAME("Fire Lash"), - .description = COMPOUND_STRING("Whips the foe with fire\n" - "lowering its Defense."), + .name = COMPOUND_STRING("Fire Lash"), + .description = COMPOUND_STRING( + "Whips the foe with fire\n" + "lowering its Defense."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -14892,9 +15491,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_TRIP] = { - .name = MOVE_NAME("Power Trip"), - .description = COMPOUND_STRING("It hits harder the more\n" - "stat boosts the user has."), + .name = COMPOUND_STRING("Power Trip"), + .description = COMPOUND_STRING( + "It hits harder the more\n" + "stat boosts the user has."), .effect = EFFECT_STORED_POWER, .power = 20, .type = TYPE_DARK, @@ -14912,9 +15512,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BURN_UP] = { - .name = MOVE_NAME("Burn Up"), - .description = COMPOUND_STRING("Burns out the user fully\n" - "removing the Fire type."), + .name = COMPOUND_STRING("Burn Up"), + .description = COMPOUND_STRING( + "Burns out the user fully\n" + "removing the Fire type."), .effect = EFFECT_FAIL_IF_NOT_ARG_TYPE, .power = 130, .type = TYPE_FIRE, @@ -14937,9 +15538,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPEED_SWAP] = { - .name = MOVE_NAME("Speed Swap"), - .description = COMPOUND_STRING("Swaps user's Speed with\n" - "the target's."), + .name = COMPOUND_STRING("Speed Swap"), + .description = COMPOUND_STRING( + "Swaps user's Speed with\n" + "the target's."), .effect = EFFECT_SPEED_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -14958,9 +15560,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SMART_STRIKE] = { - .name = MOVE_NAME("Smart Strike"), - .description = COMPOUND_STRING("Hits with an accurate\n" - "horn that never misses."), + .name = COMPOUND_STRING("Smart Strike"), + .description = COMPOUND_STRING( + "Hits with an accurate\n" + "horn that never misses."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_STEEL, @@ -14978,9 +15581,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PURIFY] = { - .name = MOVE_NAME("Purify"), - .description = COMPOUND_STRING("Cures the foe's status\n" - "to restore HP."), + .name = COMPOUND_STRING("Purify"), + .description = COMPOUND_STRING( + "Cures the foe's status\n" + "to restore HP."), .effect = EFFECT_PURIFY, .power = 0, .type = TYPE_POISON, @@ -15002,8 +15606,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REVELATION_DANCE] = { .name = HANDLE_EXPANDED_MOVE_NAME("RvlationDnce", "Revelation Dance"), - .description = COMPOUND_STRING("Dances with mystical power.\n" - "Matches user's first type."), + .description = COMPOUND_STRING( + "Dances with mystical power.\n" + "Matches user's first type."), .effect = EFFECT_REVELATION_DANCE, .power = 90, .type = TYPE_NORMAL, @@ -15022,8 +15627,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CORE_ENFORCER] = { .name = HANDLE_EXPANDED_MOVE_NAME("CoreEnforcer", "Core Enforcer"), - .description = COMPOUND_STRING("Hits with a ray that\n" - "nullifies the foe's ability."), + .description = COMPOUND_STRING( + "Hits with a ray that\n" + "nullifies the foe's ability."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -15044,9 +15650,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TROP_KICK] = { - .name = MOVE_NAME("Trop Kick"), - .description = COMPOUND_STRING("An intense kick from the\n" - "tropics. Lowers Attack."), + .name = COMPOUND_STRING("Trop Kick"), + .description = COMPOUND_STRING( + "An intense kick from the\n" + "tropics. Lowers Attack."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GRASS, @@ -15069,9 +15676,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_INSTRUCT] = { - .name = MOVE_NAME("Instruct"), - .description = COMPOUND_STRING("Orders the target to use\n" - "its last move again."), + .name = COMPOUND_STRING("Instruct"), + .description = COMPOUND_STRING( + "Orders the target to use\n" + "its last move again."), .effect = EFFECT_INSTRUCT, .power = 0, .type = TYPE_PSYCHIC, @@ -15093,9 +15701,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BEAK_BLAST] = { - .name = MOVE_NAME("Beak Blast"), - .description = COMPOUND_STRING("Heats up beak to attack.\n" - "Burns foe on contact."), + .name = COMPOUND_STRING("Beak Blast"), + .description = COMPOUND_STRING( + "Heats up beak to attack.\n" + "Burns foe on contact."), .effect = EFFECT_BEAK_BLAST, .power = 100, .type = TYPE_FLYING, @@ -15121,8 +15730,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGING_SCALES] = { .name = HANDLE_EXPANDED_MOVE_NAME("ClngngScales", "Clanging Scales"), - .description = COMPOUND_STRING("Makes a big noise with\n" - "its scales. Drops Defense."), + .description = COMPOUND_STRING( + "Makes a big noise with\n" + "its scales. Drops Defense."), .effect = EFFECT_HIT, .power = 110, .type = TYPE_DRAGON, @@ -15146,8 +15756,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_HAMMER] = { .name = HANDLE_EXPANDED_MOVE_NAME("DragonHammer", "Dragon Hammer"), - .description = COMPOUND_STRING("Swings its whole body\n" - "like a hammer to damage."), + .description = COMPOUND_STRING( + "Swings its whole body\n" + "like a hammer to damage."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_DRAGON, @@ -15165,9 +15776,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BRUTAL_SWING] = { - .name = MOVE_NAME("Brutal Swing"), - .description = COMPOUND_STRING("Violently swings around\n" - "to hurt everyone nearby."), + .name = COMPOUND_STRING("Brutal Swing"), + .description = COMPOUND_STRING( + "Violently swings around\n" + "to hurt everyone nearby."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DARK, @@ -15185,9 +15797,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AURORA_VEIL] = { - .name = MOVE_NAME("Aurora Veil"), - .description = COMPOUND_STRING("Weakens all attacks, but\n" - "only usable with hail."), + .name = COMPOUND_STRING("Aurora Veil"), + .description = COMPOUND_STRING( + "Weakens all attacks, but\n" + "only usable with hail."), .effect = EFFECT_AURORA_VEIL, .power = 0, .type = TYPE_ICE, @@ -15208,9 +15821,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_TRAP] = { - .name = MOVE_NAME("Shell Trap"), - .description = COMPOUND_STRING("Sets a shell trap that\n" - "damages on contact."), + .name = COMPOUND_STRING("Shell Trap"), + .description = COMPOUND_STRING( + "Sets a shell trap that\n" + "damages on contact."), .effect = EFFECT_SHELL_TRAP, .power = 150, .type = TYPE_FIRE, @@ -15234,9 +15848,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLEUR_CANNON] = { - .name = MOVE_NAME("Fleur Cannon"), - .description = COMPOUND_STRING("A strong ray that harshly\n" - "lowers Sp. Attack."), + .name = COMPOUND_STRING("Fleur Cannon"), + .description = COMPOUND_STRING( + "A strong ray that harshly\n" + "lowers Sp. Attack."), .effect = EFFECT_HIT, .power = 130, .type = TYPE_FAIRY, @@ -15259,8 +15874,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_FANGS] = { .name = HANDLE_EXPANDED_MOVE_NAME("PsychicFangs", "Psychic Fangs"), - .description = COMPOUND_STRING("Chomps with psychic fangs.\n" - "Destroys any barriers."), + .description = COMPOUND_STRING( + "Chomps with psychic fangs.\n" + "Destroys any barriers."), .effect = EFFECT_BRICK_BREAK, .power = 85, .type = TYPE_PSYCHIC, @@ -15280,8 +15896,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STOMPING_TANTRUM] = { .name = HANDLE_EXPANDED_MOVE_NAME("StmpngTantrm", "Stomping Tantrum"), - .description = COMPOUND_STRING("Stomps around angrily.\n" - "Stronger after a failure."), + .description = COMPOUND_STRING( + "Stomps around angrily.\n" + "Stronger after a failure."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, .type = TYPE_GROUND, @@ -15300,9 +15917,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHADOW_BONE] = { - .name = MOVE_NAME("Shadow Bone"), - .description = COMPOUND_STRING("Strikes with a haunted\n" - "bone. Might drop Defense."), + .name = COMPOUND_STRING("Shadow Bone"), + .description = COMPOUND_STRING( + "Strikes with a haunted\n" + "bone. Might drop Defense."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_GHOST, @@ -15324,9 +15942,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ACCELEROCK] = { - .name = MOVE_NAME("Accelerock"), - .description = COMPOUND_STRING("Hits with a high-speed\n" - "rock that always goes first."), + .name = COMPOUND_STRING("Accelerock"), + .description = COMPOUND_STRING( + "Hits with a high-speed\n" + "rock that always goes first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ROCK, @@ -15344,9 +15963,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LIQUIDATION] = { - .name = MOVE_NAME("Liquidation"), - .description = COMPOUND_STRING("Slams the foe with water.\n" - "Can lower Defense."), + .name = COMPOUND_STRING("Liquidation"), + .description = COMPOUND_STRING( + "Slams the foe with water.\n" + "Can lower Defense."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_WATER, @@ -15370,8 +15990,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PRISMATIC_LASER] = { .name = HANDLE_EXPANDED_MOVE_NAME("PrsmaticLasr", "Prismatic Laser"), - .description = COMPOUND_STRING("A high power laser that\n" - "forces recharge next turn."), + .description = COMPOUND_STRING( + "A high power laser that\n" + "forces recharge next turn."), .effect = EFFECT_HIT, .power = 160, .type = TYPE_PSYCHIC, @@ -15393,8 +16014,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPECTRAL_THIEF] = { .name = HANDLE_EXPANDED_MOVE_NAME("SpectrlThief", "Spectral Thief"), - .description = COMPOUND_STRING("Steals the target's stat\n" - "boosts, then attacks."), + .description = COMPOUND_STRING( + "Steals the target's stat\n" + "boosts, then attacks."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GHOST, @@ -15418,8 +16040,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUNSTEEL_STRIKE] = { .name = HANDLE_EXPANDED_MOVE_NAME("SnsteelStrke", "Sunsteel Strike"), - .description = COMPOUND_STRING("A sun-fueled strike that\n" - "ignores abilities."), + .description = COMPOUND_STRING( + "A sun-fueled strike that\n" + "ignores abilities."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_STEEL, @@ -15440,8 +16063,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MOONGEIST_BEAM] = { .name = HANDLE_EXPANDED_MOVE_NAME("MoongestBeam", "Moongeist Beam"), - .description = COMPOUND_STRING("A moon-powered beam that\n" - "ignores abilities."), + .description = COMPOUND_STRING( + "A moon-powered beam that\n" + "ignores abilities."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_GHOST, @@ -15460,9 +16084,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TEARFUL_LOOK] = { - .name = MOVE_NAME("Tearful Look"), - .description = COMPOUND_STRING("The user tears up, dropping\n" - "Attack and Sp. Attack."), + .name = COMPOUND_STRING("Tearful Look"), + .description = COMPOUND_STRING( + "The user tears up, dropping\n" + "Attack and Sp. Attack."), .effect = EFFECT_NOBLE_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -15482,9 +16107,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ZING_ZAP] = { - .name = MOVE_NAME("Zing Zap"), - .description = COMPOUND_STRING("An electrified impact that\n" - "can cause flinching."), + .name = COMPOUND_STRING("Zing Zap"), + .description = COMPOUND_STRING( + "An electrified impact that\n" + "can cause flinching."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -15507,8 +16133,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NATURES_MADNESS] = { .name = HANDLE_EXPANDED_MOVE_NAME("Natur'sMadns", "Nature's Madness"), - .description = COMPOUND_STRING("Halves the foe's HP with\n" - "the power of nature."), + .description = COMPOUND_STRING( + "Halves the foe's HP with\n" + "the power of nature."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_FAIRY, @@ -15526,9 +16153,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MULTI_ATTACK] = { - .name = MOVE_NAME("Multi-Attack"), - .description = COMPOUND_STRING("An attack that changes\n" - "with Memories."), + .name = COMPOUND_STRING("Multi-Attack"), + .description = COMPOUND_STRING( + "An attack that changes\n" + "with Memories."), .effect = EFFECT_CHANGE_TYPE_ON_ITEM, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 120 : 90, .type = TYPE_NORMAL, @@ -15547,9 +16175,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_BLOWN] = { - .name = MOVE_NAME("Mind Blown"), - .description = COMPOUND_STRING("It explodes the user's head\n" - "to damage everything around."), + .name = COMPOUND_STRING("Mind Blown"), + .description = COMPOUND_STRING( + "It explodes the user's head\n" + "to damage everything around."), .effect = EFFECT_MIND_BLOWN, .power = 150, .type = TYPE_FIRE, @@ -15567,9 +16196,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PLASMA_FISTS] = { - .name = MOVE_NAME("Plasma Fists"), - .description = COMPOUND_STRING("Hits with electrical fists.\n" - "Normal moves become Electric."), + .name = COMPOUND_STRING("Plasma Fists"), + .description = COMPOUND_STRING( + "Hits with electrical fists.\n" + "Normal moves become Electric."), .effect = EFFECT_PLASMA_FISTS, .power = 100, .type = TYPE_ELECTRIC, @@ -15590,8 +16220,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PHOTON_GEYSER] = { .name = HANDLE_EXPANDED_MOVE_NAME("PhotonGeyser", "Photon Geyser"), - .description = COMPOUND_STRING("User's highest attack stat\n" - "determines its category."), + .description = COMPOUND_STRING( + "User's highest attack stat\n" + "determines its category."), .effect = EFFECT_PHOTON_GEYSER, .power = 100, .type = TYPE_PSYCHIC, @@ -15610,9 +16241,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ZIPPY_ZAP] = { - .name = MOVE_NAME("Zippy Zap"), - .description = COMPOUND_STRING("Electric bursts always go\n" - "first and land a critical hit."), + .name = COMPOUND_STRING("Zippy Zap"), + .description = COMPOUND_STRING( + "Electric bursts always go\n" + "first and land a critical hit."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 50, .type = TYPE_ELECTRIC, @@ -15637,8 +16269,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPLISHY_SPLASH] = { .name = HANDLE_EXPANDED_MOVE_NAME("SplishySplsh", "Splishy Splash"), - .description = COMPOUND_STRING("A huge electrified wave that\n" - "may paralyze the foe."), + .description = COMPOUND_STRING( + "A huge electrified wave that\n" + "may paralyze the foe."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -15658,9 +16291,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLOATY_FALL] = { - .name = MOVE_NAME("Floaty Fall"), - .description = COMPOUND_STRING("Floats in air and dives at\n" - "angle. May cause flinching."), + .name = COMPOUND_STRING("Floaty Fall"), + .description = COMPOUND_STRING( + "Floats in air and dives at\n" + "angle. May cause flinching."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_FLYING, @@ -15682,9 +16316,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PIKA_PAPOW] = { - .name = MOVE_NAME("Pika Papow"), - .description = COMPOUND_STRING("Pikachu's love increases its\n" - "power. It never misses."), + .name = COMPOUND_STRING("Pika Papow"), + .description = COMPOUND_STRING( + "Pikachu's love increases its\n" + "power. It never misses."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_ELECTRIC, @@ -15700,12 +16335,13 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCY_BUBBLE] = { .name = HANDLE_EXPANDED_MOVE_NAME("BouncyBubble", "Bouncy Bubble"), - .description = COMPOUND_STRING("An attack that absorbs\n" - #if B_UPDATED_MOVE_DATA >= GEN_8 - "all the damage inflicted."), - #else - "half the damage inflicted."), - #endif + .description = COMPOUND_STRING( + "An attack that absorbs\n" + #if B_UPDATED_MOVE_DATA >= GEN_8 + "all the damage inflicted."), + #else + "half the damage inflicted."), + #endif .effect = EFFECT_ABSORB, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_WATER, @@ -15722,9 +16358,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BUZZY_BUZZ] = { - .name = MOVE_NAME("Buzzy Buzz"), - .description = COMPOUND_STRING("Shoots a jolt of electricity\n" - "that always paralyzes."), + .name = COMPOUND_STRING("Buzzy Buzz"), + .description = COMPOUND_STRING( + "Shoots a jolt of electricity\n" + "that always paralyzes."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_ELECTRIC, @@ -15743,9 +16380,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SIZZLY_SLIDE] = { - .name = MOVE_NAME("Sizzly Slide"), - .description = COMPOUND_STRING("User cloaked in fire charges.\n" - "Leaves the foe with a burn."), + .name = COMPOUND_STRING("Sizzly Slide"), + .description = COMPOUND_STRING( + "User cloaked in fire charges.\n" + "Leaves the foe with a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_FIRE, @@ -15766,9 +16404,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GLITZY_GLOW] = { - .name = MOVE_NAME("Glitzy Glow"), - .description = COMPOUND_STRING("Telekinetic force that sets\n" - "wall, lowering Sp. Atk damage."), + .name = COMPOUND_STRING("Glitzy Glow"), + .description = COMPOUND_STRING( + "Telekinetic force that sets\n" + "wall, lowering Sp. Atk damage."), .effect = EFFECT_GLITZY_GLOW, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 90, .type = TYPE_PSYCHIC, @@ -15783,9 +16422,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BADDY_BAD] = { - .name = MOVE_NAME("Baddy Bad"), - .description = COMPOUND_STRING("Acting badly, attacks. Sets\n" - "wall, lowering Attack damage."), + .name = COMPOUND_STRING("Baddy Bad"), + .description = COMPOUND_STRING( + "Acting badly, attacks. Sets\n" + "wall, lowering Attack damage."), .effect = EFFECT_BADDY_BAD, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 90, .type = TYPE_DARK, @@ -15800,9 +16440,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SAPPY_SEED] = { - .name = MOVE_NAME("Sappy Seed"), - .description = COMPOUND_STRING("Giant stalk scatters seeds\n" - "that drain HP every turn."), + .name = COMPOUND_STRING("Sappy Seed"), + .description = COMPOUND_STRING( + "Giant stalk scatters seeds\n" + "that drain HP every turn."), .effect = EFFECT_SAPPY_SEED, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 90, .type = TYPE_GRASS, @@ -15818,9 +16459,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZY_FROST] = { - .name = MOVE_NAME("Freezy Frost"), - .description = COMPOUND_STRING("Crystal from cold haze hits.\n" - "Eliminates all stat changes."), + .name = COMPOUND_STRING("Freezy Frost"), + .description = COMPOUND_STRING( + "Crystal from cold haze hits.\n" + "Eliminates all stat changes."), .effect = EFFECT_FREEZY_FROST, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 90, .type = TYPE_ICE, @@ -15836,8 +16478,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLY_SWIRL] = { .name = HANDLE_EXPANDED_MOVE_NAME("SparklySwirl", "Sparkly Swirl"), - .description = COMPOUND_STRING("Wrap foe with whirlwind of\n" - "scent. Heals party's status."), + .description = COMPOUND_STRING( + "Wrap foe with whirlwind of\n" + "scent. Heals party's status."), .effect = EFFECT_SPARKLY_SWIRL, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 120 : 90, .type = TYPE_FAIRY, @@ -15853,8 +16496,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VEEVEE_VOLLEY] = { .name = HANDLE_EXPANDED_MOVE_NAME("VeeveeVolley", "Veevee Volley"), - .description = COMPOUND_STRING("Eevee's love increases its\n" - "power. It never misses."), + .description = COMPOUND_STRING( + "Eevee's love increases its\n" + "power. It never misses."), .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -15871,8 +16515,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_IRON_BASH] = { .name = HANDLE_EXPANDED_MOVE_NAME("DublIronBash", "Double Iron Bash"), - .description = COMPOUND_STRING("The user spins and hits with\n" - "its arms. May cause flinch."), + .description = COMPOUND_STRING( + "The user spins and hits with\n" + "its arms. May cause flinch."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_STEEL, @@ -15900,8 +16545,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DYNAMAX_CANNON] = { .name = HANDLE_EXPANDED_MOVE_NAME("DynamxCannon", "Dynamax Cannon"), - .description = COMPOUND_STRING("Fires a strong beam. Deals\n" - "2x damage to Dynamaxed foes."), + .description = COMPOUND_STRING( + "Fires a strong beam. Deals\n" + "2x damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_DRAGON, @@ -15927,9 +16573,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SNIPE_SHOT] = { - .name = MOVE_NAME("Snipe Shot"), - .description = COMPOUND_STRING("The user ignores effects\n" - "that draw in moves."), + .name = COMPOUND_STRING("Snipe Shot"), + .description = COMPOUND_STRING( + "The user ignores effects\n" + "that draw in moves."), .effect = EFFECT_SNIPE_SHOT, .power = 80, .type = TYPE_WATER, @@ -15947,9 +16594,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_JAW_LOCK] = { - .name = MOVE_NAME("Jaw Lock"), - .description = COMPOUND_STRING("Prevents the user and\n" - "the target from escaping."), + .name = COMPOUND_STRING("Jaw Lock"), + .description = COMPOUND_STRING( + "Prevents the user and\n" + "the target from escaping."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -15971,9 +16619,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STUFF_CHEEKS] = { - .name = MOVE_NAME("Stuff Cheeks"), - .description = COMPOUND_STRING("Consumes the user's Berry,\n" - "then sharply raises Def."), + .name = COMPOUND_STRING("Stuff Cheeks"), + .description = COMPOUND_STRING( + "Consumes the user's Berry,\n" + "then sharply raises Def."), .effect = EFFECT_STUFF_CHEEKS, .power = 0, .type = TYPE_NORMAL, @@ -15993,9 +16642,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NO_RETREAT] = { - .name = MOVE_NAME("No Retreat"), - .description = COMPOUND_STRING("Raises all of the user's\n" - "stats but prevents escape."), + .name = COMPOUND_STRING("No Retreat"), + .description = COMPOUND_STRING( + "Raises all of the user's\n" + "stats but prevents escape."), .effect = EFFECT_NO_RETREAT, .power = 0, .type = TYPE_FIGHTING, @@ -16015,9 +16665,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TAR_SHOT] = { - .name = MOVE_NAME("Tar Shot"), - .description = COMPOUND_STRING("Lowers the foe's Speed and\n" - "makes it weak to Fire."), + .name = COMPOUND_STRING("Tar Shot"), + .description = COMPOUND_STRING( + "Lowers the foe's Speed and\n" + "makes it weak to Fire."), .effect = EFFECT_TAR_SHOT, .power = 0, .type = TYPE_ROCK, @@ -16035,9 +16686,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_POWDER] = { - .name = MOVE_NAME("Magic Powder"), - .description = COMPOUND_STRING("Magic powder changes the\n" - "target into a Psychic-type."), + .name = COMPOUND_STRING("Magic Powder"), + .description = COMPOUND_STRING( + "Magic powder changes the\n" + "target into a Psychic-type."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_PSYCHIC, @@ -16057,9 +16709,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_DARTS] = { - .name = MOVE_NAME("Dragon Darts"), - .description = COMPOUND_STRING("The user attacks twice. Two\n" - "targets are hit once each."), + .name = COMPOUND_STRING("Dragon Darts"), + .description = COMPOUND_STRING( + "The user attacks twice. Two\n" + "targets are hit once each."), .effect = EFFECT_HIT, // TODO: EFFECT_DRAGON_DARTS .power = 50, .type = TYPE_DRAGON, @@ -16078,9 +16731,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TEATIME] = { - .name = MOVE_NAME("Teatime"), - .description = COMPOUND_STRING("All Pokémon have teatime\n" - "and eat their Berries."), + .name = COMPOUND_STRING("Teatime"), + .description = COMPOUND_STRING( + "All Pokémon have teatime\n" + "and eat their Berries."), .effect = EFFECT_TEATIME, .power = 0, .type = TYPE_NORMAL, @@ -16100,9 +16754,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OCTOLOCK] = { - .name = MOVE_NAME("Octolock"), - .description = COMPOUND_STRING("Traps the foe to lower Def\n" - "and Sp. Def fall each turn."), + .name = COMPOUND_STRING("Octolock"), + .description = COMPOUND_STRING( + "Traps the foe to lower Def\n" + "and Sp. Def fall each turn."), .effect = EFFECT_OCTOLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -16119,9 +16774,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BOLT_BEAK] = { - .name = MOVE_NAME("Bolt Beak"), - .description = COMPOUND_STRING("Double power if the user\n" - "moves before the target."), + .name = COMPOUND_STRING("Bolt Beak"), + .description = COMPOUND_STRING( + "Double power if the user\n" + "moves before the target."), .effect = EFFECT_BOLT_BEAK, .power = 85, .type = TYPE_ELECTRIC, @@ -16140,8 +16796,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FISHIOUS_REND] = { .name = HANDLE_EXPANDED_MOVE_NAME("FishiousRend", "Fishious Rend"), - .description = COMPOUND_STRING("Double power if the user\n" - "moves before the target."), + .description = COMPOUND_STRING( + "Double power if the user\n" + "moves before the target."), .effect = EFFECT_BOLT_BEAK, .power = 85, .type = TYPE_WATER, @@ -16160,9 +16817,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COURT_CHANGE] = { - .name = MOVE_NAME("Court Change"), - .description = COMPOUND_STRING("The user swaps effects on\n" - "either side of the field."), + .name = COMPOUND_STRING("Court Change"), + .description = COMPOUND_STRING( + "The user swaps effects on\n" + "either side of the field."), .effect = EFFECT_COURT_CHANGE, .power = 0, .type = TYPE_NORMAL, @@ -16181,8 +16839,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGOROUS_SOUL] = { .name = HANDLE_EXPANDED_MOVE_NAME("ClngrousSoul", "Clangorous Soul"), - .description = COMPOUND_STRING("The user uses some of its\n" - "HP to raise all its stats."), + .description = COMPOUND_STRING( + "The user uses some of its\n" + "HP to raise all its stats."), .effect = EFFECT_CLANGOROUS_SOUL, .power = 0, .type = TYPE_DRAGON, @@ -16205,9 +16864,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BODY_PRESS] = { - .name = MOVE_NAME("Body Press"), - .description = COMPOUND_STRING("Does more damage the\n" - "higher the user's Def."), + .name = COMPOUND_STRING("Body Press"), + .description = COMPOUND_STRING( + "Does more damage the\n" + "higher the user's Def."), .effect = EFFECT_BODY_PRESS, .power = 80, .type = TYPE_FIGHTING, @@ -16227,9 +16887,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DECORATE] = { - .name = MOVE_NAME("Decorate"), - .description = COMPOUND_STRING("The user sharply raises\n" - "the target's Atk and Sp.Atk"), + .name = COMPOUND_STRING("Decorate"), + .description = COMPOUND_STRING( + "The user sharply raises\n" + "the target's Atk and Sp.Atk"), .effect = EFFECT_DECORATE, .power = 0, .type = TYPE_FAIRY, @@ -16249,9 +16910,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRUM_BEATING] = { - .name = MOVE_NAME("Drum Beating"), - .description = COMPOUND_STRING("Plays a drum to attack.\n" - "The foe's Speed is lowered."), + .name = COMPOUND_STRING("Drum Beating"), + .description = COMPOUND_STRING( + "Plays a drum to attack.\n" + "The foe's Speed is lowered."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GRASS, @@ -16274,9 +16936,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SNAP_TRAP] = { - .name = MOVE_NAME("Snap Trap"), - .description = COMPOUND_STRING("Snares the target in a snap\n" - "trap for four to five turns."), + .name = COMPOUND_STRING("Snap Trap"), + .description = COMPOUND_STRING( + "Snares the target in a snap\n" + "trap for four to five turns."), .effect = EFFECT_HIT, .power = 35, .type = TYPE_GRASS, @@ -16299,9 +16962,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PYRO_BALL] = { - .name = MOVE_NAME("Pyro Ball"), - .description = COMPOUND_STRING("Launches a fiery ball at the\n" - "target. It may cause a burn."), + .name = COMPOUND_STRING("Pyro Ball"), + .description = COMPOUND_STRING( + "Launches a fiery ball at the\n" + "target. It may cause a burn."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIRE, @@ -16327,8 +16991,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BLADE] = { .name = HANDLE_EXPANDED_MOVE_NAME("BehemthBlade", "Behemoth Blade"), - .description = COMPOUND_STRING("Strikes as a sword. Deals 2x\n" - "damage to Dynamaxed foes."), + .description = COMPOUND_STRING( + "Strikes as a sword. Deals 2x\n" + "damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_STEEL, @@ -16352,8 +17017,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BEHEMOTH_BASH] = { .name = HANDLE_EXPANDED_MOVE_NAME("BehemothBash", "Behemoth Bash"), - .description = COMPOUND_STRING("Attacks as a shield. Deals 2x\n" - "damage to Dynamaxed foes."), + .description = COMPOUND_STRING( + "Attacks as a shield. Deals 2x\n" + "damage to Dynamaxed foes."), .effect = EFFECT_DYNAMAX_DOUBLE_DMG, .power = 100, .type = TYPE_STEEL, @@ -16375,9 +17041,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_WHEEL] = { - .name = MOVE_NAME("Aura Wheel"), - .description = COMPOUND_STRING("Raises Speed to attack. The\n" - "Type is based on its form."), + .name = COMPOUND_STRING("Aura Wheel"), + .description = COMPOUND_STRING( + "Raises Speed to attack. The\n" + "Type is based on its form."), .effect = EFFECT_AURA_WHEEL, .power = 110, .type = TYPE_ELECTRIC, @@ -16402,8 +17069,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BREAKING_SWIPE] = { .name = HANDLE_EXPANDED_MOVE_NAME("BreakngSwipe", "Breaking Swipe"), - .description = COMPOUND_STRING("Swings its tail to attack.\n" - "Lowers the Atk of those hit."), + .description = COMPOUND_STRING( + "Swings its tail to attack.\n" + "Lowers the Atk of those hit."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DRAGON, @@ -16427,9 +17095,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BRANCH_POKE] = { - .name = MOVE_NAME("Branch Poke"), - .description = COMPOUND_STRING("The user pokes the target\n" - "with a pointed branch."), + .name = COMPOUND_STRING("Branch Poke"), + .description = COMPOUND_STRING( + "The user pokes the target\n" + "with a pointed branch."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_GRASS, @@ -16448,9 +17117,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OVERDRIVE] = { - .name = MOVE_NAME("Overdrive"), - .description = COMPOUND_STRING("The user twangs its guitar,\n" - "causing strong vibrations."), + .name = COMPOUND_STRING("Overdrive"), + .description = COMPOUND_STRING( + "The user twangs its guitar,\n" + "causing strong vibrations."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -16470,9 +17140,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_APPLE_ACID] = { - .name = MOVE_NAME("Apple Acid"), - .description = COMPOUND_STRING("Attacks with tart apple acid\n" - "to lower the foe's Sp. Def."), + .name = COMPOUND_STRING("Apple Acid"), + .description = COMPOUND_STRING( + "Attacks with tart apple acid\n" + "to lower the foe's Sp. Def."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_GRASS, @@ -16495,9 +17166,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRAV_APPLE] = { - .name = MOVE_NAME("Grav Apple"), - .description = COMPOUND_STRING("Drops an apple from above.\n" - "Lowers the foe's Defense."), + .name = COMPOUND_STRING("Grav Apple"), + .description = COMPOUND_STRING( + "Drops an apple from above.\n" + "Lowers the foe's Defense."), .effect = EFFECT_GRAV_APPLE, .power = 80, .type = TYPE_GRASS, @@ -16520,9 +17192,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIRIT_BREAK] = { - .name = MOVE_NAME("Spirit Break"), - .description = COMPOUND_STRING("Attacks with spirit-breaking\n" - "force. Lowers Sp. Atk."), + .name = COMPOUND_STRING("Spirit Break"), + .description = COMPOUND_STRING( + "Attacks with spirit-breaking\n" + "force. Lowers Sp. Atk."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_FAIRY, @@ -16547,8 +17220,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STRANGE_STEAM] = { .name = HANDLE_EXPANDED_MOVE_NAME("StrangeSteam", "Strange Steam"), - .description = COMPOUND_STRING("Emits a strange steam to\n" - "potentially confuse the foe."), + .description = COMPOUND_STRING( + "Emits a strange steam to\n" + "potentially confuse the foe."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_FAIRY, @@ -16571,9 +17245,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LIFE_DEW] = { - .name = MOVE_NAME("Life Dew"), - .description = COMPOUND_STRING("Scatters water to restore\n" - "the HP of itself and allies."), + .name = COMPOUND_STRING("Life Dew"), + .description = COMPOUND_STRING( + "Scatters water to restore\n" + "the HP of itself and allies."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_WATER, @@ -16596,9 +17271,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OBSTRUCT] = { - .name = MOVE_NAME("Obstruct"), - .description = COMPOUND_STRING("Protects itself, harshly\n" - "lowering Def on contact."), + .name = COMPOUND_STRING("Obstruct"), + .description = COMPOUND_STRING( + "Protects itself, harshly\n" + "lowering Def on contact."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_DARK, @@ -16621,8 +17297,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FALSE_SURRENDER] = { .name = HANDLE_EXPANDED_MOVE_NAME("FalsSurrendr", "False Surrender"), - .description = COMPOUND_STRING("Bows to stab the foe\n" - "with hair. It never misses."), + .description = COMPOUND_STRING( + "Bows to stab the foe\n" + "with hair. It never misses."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -16642,8 +17319,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_ASSAULT] = { .name = HANDLE_EXPANDED_MOVE_NAME("MeteorAssalt", "Meteor Assault"), - .description = COMPOUND_STRING("Attacks with a thick leek.\n" - "The user must then rest."), + .description = COMPOUND_STRING( + "Attacks with a thick leek.\n" + "The user must then rest."), .effect = EFFECT_HIT, .power = 150, .type = TYPE_FIGHTING, @@ -16666,9 +17344,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ETERNABEAM] = { - .name = MOVE_NAME("Eternabeam"), - .description = COMPOUND_STRING("Eternatus' strongest move.\n" - "The user rests next turn."), + .name = COMPOUND_STRING("Eternabeam"), + .description = COMPOUND_STRING( + "Eternatus' strongest move.\n" + "The user rests next turn."), .effect = EFFECT_HIT, .power = 160, .type = TYPE_DRAGON, @@ -16690,9 +17369,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_BEAM] = { - .name = MOVE_NAME("Steel Beam"), - .description = COMPOUND_STRING("Fires a beam of steel from\n" - "its body. It hurts the user."), + .name = COMPOUND_STRING("Steel Beam"), + .description = COMPOUND_STRING( + "Fires a beam of steel from\n" + "its body. It hurts the user."), .effect = EFFECT_MAX_HP_50_RECOIL, .power = 140, .type = TYPE_STEEL, @@ -16711,8 +17391,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EXPANDING_FORCE] = { .name = HANDLE_EXPANDED_MOVE_NAME("ExpandngForc", "Expanding Force"), - .description = COMPOUND_STRING("Power goes up and damages\n" - "all foes on Psychic Terrain."), + .description = COMPOUND_STRING( + "Power goes up and damages\n" + "all foes on Psychic Terrain."), .effect = EFFECT_EXPANDING_FORCE, .power = 80, .type = TYPE_PSYCHIC, @@ -16729,9 +17410,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STEEL_ROLLER] = { - .name = MOVE_NAME("Steel Roller"), - .description = COMPOUND_STRING("Destroys terrain. Fails if\n" - "ground isn't terrain."), + .name = COMPOUND_STRING("Steel Roller"), + .description = COMPOUND_STRING( + "Destroys terrain. Fails if\n" + "ground isn't terrain."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 130, .type = TYPE_STEEL, @@ -16751,9 +17433,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SCALE_SHOT] = { - .name = MOVE_NAME("Scale Shot"), - .description = COMPOUND_STRING("Shoots scales 2 to 5 times.\n" - "Ups Speed, lowers defense."), + .name = COMPOUND_STRING("Scale Shot"), + .description = COMPOUND_STRING( + "Shoots scales 2 to 5 times.\n" + "Ups Speed, lowers defense."), .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_DRAGON, @@ -16771,9 +17454,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_BEAM] = { - .name = MOVE_NAME("Meteor Beam"), - .description = COMPOUND_STRING("A 2-turn move that raises\n" - "Sp. Attack before attacking."), + .name = COMPOUND_STRING("Meteor Beam"), + .description = COMPOUND_STRING( + "A 2-turn move that raises\n" + "Sp. Attack before attacking."), .effect = EFFECT_METEOR_BEAM, .power = 120, .type = TYPE_ROCK, @@ -16798,8 +17482,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHELL_SIDE_ARM] = { .name = HANDLE_EXPANDED_MOVE_NAME("ShellSideArm", "Shell Side Arm"), - .description = COMPOUND_STRING("Deals better of physical and\n" - "special damage. May poison."), + .description = COMPOUND_STRING( + "Deals better of physical and\n" + "special damage. May poison."), .effect = EFFECT_SHELL_SIDE_ARM, .power = 90, .type = TYPE_POISON, @@ -16822,8 +17507,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MISTY_EXPLOSION] = { .name = HANDLE_EXPANDED_MOVE_NAME("MstyExplsion", "Misty Explosion"), - .description = COMPOUND_STRING("Hit everything and faint.\n" - "Powers up on Misty Terrain."), + .description = COMPOUND_STRING( + "Hit everything and faint.\n" + "Powers up on Misty Terrain."), .effect = EFFECT_EXPLOSION, .power = 100, .type = TYPE_FAIRY, @@ -16840,9 +17526,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_GLIDE] = { - .name = MOVE_NAME("Grassy Glide"), - .description = COMPOUND_STRING("Gliding on ground, hits. Goes\n" - "first on Grassy Terrain."), + .name = COMPOUND_STRING("Grassy Glide"), + .description = COMPOUND_STRING( + "Gliding on ground, hits. Goes\n" + "first on Grassy Terrain."), .effect = EFFECT_GRASSY_GLIDE, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 55 : 70, .type = TYPE_GRASS, @@ -16862,8 +17549,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RISING_VOLTAGE] = { .name = HANDLE_EXPANDED_MOVE_NAME("RisngVoltage", "Rising Voltage"), - .description = COMPOUND_STRING("This move's power doubles\n" - "when on Electric Terrain."), + .description = COMPOUND_STRING( + "This move's power doubles\n" + "when on Electric Terrain."), .effect = EFFECT_RISING_VOLTAGE, .power = 70, .type = TYPE_ELECTRIC, @@ -16881,8 +17569,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TERRAIN_PULSE] = { .name = HANDLE_EXPANDED_MOVE_NAME("TerrainPulse", "Terrain Pulse"), - .description = COMPOUND_STRING("Type and power changes\n" - "depending on the terrain."), + .description = COMPOUND_STRING( + "Type and power changes\n" + "depending on the terrain."), .effect = EFFECT_TERRAIN_PULSE, .power = 50, .type = TYPE_NORMAL, @@ -16901,8 +17590,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SKITTER_SMACK] = { .name = HANDLE_EXPANDED_MOVE_NAME("SkitterSmack", "Skitter Smack"), - .description = COMPOUND_STRING("User skitters behind foe to\n" - "attack. Lowers foe's Sp. Atk."), + .description = COMPOUND_STRING( + "User skitters behind foe to\n" + "attack. Lowers foe's Sp. Atk."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_BUG, @@ -16926,8 +17616,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_JEALOUSY] = { .name = HANDLE_EXPANDED_MOVE_NAME("BrningJelosy", "Burning Jealousy"), - .description = COMPOUND_STRING("Foes that have stats upped\n" - "during the turn get burned."), + .description = COMPOUND_STRING( + "Foes that have stats upped\n" + "during the turn get burned."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_FIRE, @@ -16950,9 +17641,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LASH_OUT] = { - .name = MOVE_NAME("Lash Out"), - .description = COMPOUND_STRING("If stats lowered during this\n" - "turn, power is doubled."), + .name = COMPOUND_STRING("Lash Out"), + .description = COMPOUND_STRING( + "If stats lowered during this\n" + "turn, power is doubled."), .effect = EFFECT_LASH_OUT, .power = 75, .type = TYPE_DARK, @@ -16970,9 +17662,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POLTERGEIST] = { - .name = MOVE_NAME("Poltergeist"), - .description = COMPOUND_STRING("Control foe's item to attack.\n" - "Fails if foe has no item."), + .name = COMPOUND_STRING("Poltergeist"), + .description = COMPOUND_STRING( + "Control foe's item to attack.\n" + "Fails if foe has no item."), .effect = EFFECT_POLTERGEIST, .power = 110, .type = TYPE_GHOST, @@ -16990,8 +17683,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CORROSIVE_GAS] = { .name = HANDLE_EXPANDED_MOVE_NAME("CorrosiveGas", "Corrosive Gas"), - .description = COMPOUND_STRING("Highly acidic gas melts items\n" - "held by surrounding Pokémon."), + .description = COMPOUND_STRING( + "Highly acidic gas melts items\n" + "held by surrounding Pokémon."), .effect = EFFECT_CORROSIVE_GAS, .power = 0, .type = TYPE_POISON, @@ -17009,9 +17703,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COACHING] = { - .name = MOVE_NAME("Coaching"), - .description = COMPOUND_STRING("Properly coaches allies to\n" - "up their Attack and Defense."), + .name = COMPOUND_STRING("Coaching"), + .description = COMPOUND_STRING( + "Properly coaches allies to\n" + "up their Attack and Defense."), .effect = EFFECT_COACHING, .power = 0, .type = TYPE_FIGHTING, @@ -17031,9 +17726,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLIP_TURN] = { - .name = MOVE_NAME("Flip Turn"), - .description = COMPOUND_STRING("Attacks and rushes back to\n" - "switch with a party Pokémon."), + .name = COMPOUND_STRING("Flip Turn"), + .description = COMPOUND_STRING( + "Attacks and rushes back to\n" + "switch with a party Pokémon."), .effect = EFFECT_HIT_ESCAPE, .power = 60, .type = TYPE_WATER, @@ -17051,9 +17747,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_AXEL] = { - .name = MOVE_NAME("Triple Axel"), - .description = COMPOUND_STRING("A 3-kick attack that gets\n" - "more powerful with each hit."), + .name = COMPOUND_STRING("Triple Axel"), + .description = COMPOUND_STRING( + "A 3-kick attack that gets\n" + "more powerful with each hit."), .effect = EFFECT_TRIPLE_KICK, .power = 20, .type = TYPE_ICE, @@ -17073,8 +17770,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DUAL_WINGBEAT] = { .name = HANDLE_EXPANDED_MOVE_NAME("DualWingbeat", "Dual Wingbeat"), - .description = COMPOUND_STRING("User slams the target with\n" - "wings and hits twice in a row."), + .description = COMPOUND_STRING( + "User slams the target with\n" + "wings and hits twice in a row."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_FLYING, @@ -17094,8 +17792,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SCORCHING_SANDS] = { .name = HANDLE_EXPANDED_MOVE_NAME("ScorchngSnds", "Scorching Sands"), - .description = COMPOUND_STRING("Throws scorching sand at\n" - "the target. May leave a burn."), + .description = COMPOUND_STRING( + "Throws scorching sand at\n" + "the target. May leave a burn."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GROUND, @@ -17119,8 +17818,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_JUNGLE_HEALING] = { .name = HANDLE_EXPANDED_MOVE_NAME("JungleHealng", "Jungle Healng"), - .description = COMPOUND_STRING("Heals HP and status of\n" - "itself and allies in battle."), + .description = COMPOUND_STRING( + "Heals HP and status of\n" + "itself and allies in battle."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_GRASS, @@ -17142,9 +17842,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_BLOW] = { - .name = MOVE_NAME("Wicked Blow"), - .description = COMPOUND_STRING("Mastering the Dark style,\n" - "strikes with a critical hit."), + .name = COMPOUND_STRING("Wicked Blow"), + .description = COMPOUND_STRING( + "Mastering the Dark style,\n" + "strikes with a critical hit."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 75 : 80, .type = TYPE_DARK, @@ -17166,8 +17867,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SURGING_STRIKES] = { .name = HANDLE_EXPANDED_MOVE_NAME("SurgngStrkes", "Surging Strikes"), - .description = COMPOUND_STRING("Mastering the Water style,\n" - "strikes with 3 critical hits."), + .description = COMPOUND_STRING( + "Mastering the Water style,\n" + "strikes with 3 critical hits."), .effect = EFFECT_HIT, .power = 25, .type = TYPE_WATER, @@ -17189,9 +17891,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_CAGE] = { - .name = MOVE_NAME("Thunder Cage"), - .description = COMPOUND_STRING("Traps the foe in a cage of\n" - "electricity for "BINDING_TURNS" turns."), + .name = COMPOUND_STRING("Thunder Cage"), + .description = COMPOUND_STRING( + "Traps the foe in a cage of\n" + "electricity for "BINDING_TURNS" turns."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -17213,8 +17916,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_ENERGY] = { .name = HANDLE_EXPANDED_MOVE_NAME("DragonEnergy", "Dragon Energy"), - .description = COMPOUND_STRING("The higher the user's HP\n" - "the more damage caused."), + .description = COMPOUND_STRING( + "The higher the user's HP\n" + "the more damage caused."), .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_DRAGON, @@ -17233,12 +17937,13 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZING_GLARE] = { .name = HANDLE_EXPANDED_MOVE_NAME("FreezngGlare", "Freezing Glare"), - .description = COMPOUND_STRING("Shoots psychic power from\n" - #if B_USE_FROSTBITE == TRUE - "the eyes. May frostbite."), - #else - "the eyes. May freeze the foe."), - #endif + .description = COMPOUND_STRING( + "Shoots psychic power from\n" + #if B_USE_FROSTBITE == TRUE + "the eyes. May frostbite."), + #else + "the eyes. May freeze the foe."), + #endif .power = 90, .effect = EFFECT_HIT, .type = TYPE_PSYCHIC, @@ -17261,9 +17966,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FIERY_WRATH] = { - .name = MOVE_NAME("Fiery Wrath"), - .description = COMPOUND_STRING("An attack fueled by your\n" - "wrath. May cause flinching."), + .name = COMPOUND_STRING("Fiery Wrath"), + .description = COMPOUND_STRING( + "An attack fueled by your\n" + "wrath. May cause flinching."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_DARK, @@ -17286,8 +17992,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDEROUS_KICK] = { .name = HANDLE_EXPANDED_MOVE_NAME("ThnderusKick", "Thunderous Kick"), - .description = COMPOUND_STRING("Uses a lightning-like kick\n" - "to hit. Lowers foe's Defense."), + .description = COMPOUND_STRING( + "Uses a lightning-like kick\n" + "to hit. Lowers foe's Defense."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_FIGHTING, @@ -17312,8 +18019,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIAL_LANCE] = { .name = HANDLE_EXPANDED_MOVE_NAME("GlacialLance", "Glacial Lance"), - .description = COMPOUND_STRING("Strikes by hurling a blizzard-\n" - "cloaked icicle lance at foes."), + .description = COMPOUND_STRING( + "Strikes by hurling a blizzard-\n" + "cloaked icicle lance at foes."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 130, .type = TYPE_ICE, @@ -17332,8 +18040,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ASTRAL_BARRAGE] = { .name = HANDLE_EXPANDED_MOVE_NAME("AstrlBarrage", "Astral Barrage"), - .description = COMPOUND_STRING("Strikes by sending a frightful\n" - "amount of ghosts at foes."), + .description = COMPOUND_STRING( + "Strikes by sending a frightful\n" + "amount of ghosts at foes."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_GHOST, @@ -17351,9 +18060,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EERIE_SPELL] = { - .name = MOVE_NAME("Eerie Spell"), - .description = COMPOUND_STRING("Attacks with psychic power.\n" - "Foe's last move has 3 PP cut."), + .name = COMPOUND_STRING("Eerie Spell"), + .description = COMPOUND_STRING( + "Attacks with psychic power.\n" + "Foe's last move has 3 PP cut."), .effect = EFFECT_EERIE_SPELL, .power = 80, .type = TYPE_PSYCHIC, @@ -17373,9 +18083,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DIRE_CLAW] = { - .name = MOVE_NAME("Dire Claw"), - .description = COMPOUND_STRING("High critical hit chance. May\n" - "paralyze, poison or drowse."), + .name = COMPOUND_STRING("Dire Claw"), + .description = COMPOUND_STRING( + "High critical hit chance. May\n" + "paralyze, poison or drowse."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 80 : 60, .type = TYPE_POISON, @@ -17395,8 +18106,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYSHIELD_BASH] = { .name = HANDLE_EXPANDED_MOVE_NAME("PsyshieldBsh", "Psyshield Bash"), - .description = COMPOUND_STRING("Hits a foe with psychic\n" - "energy. May raise Defense."), + .description = COMPOUND_STRING( + "Hits a foe with psychic\n" + "energy. May raise Defense."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -17416,9 +18128,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POWER_SHIFT] = { - .name = MOVE_NAME("Power Shift"), - .description = COMPOUND_STRING("The user swaps its Attack\n" - "and Defense stats."), + .name = COMPOUND_STRING("Power Shift"), + .description = COMPOUND_STRING( + "The user swaps its Attack\n" + "and Defense stats."), .effect = EFFECT_POWER_TRICK, .power = 0, .type = TYPE_NORMAL, @@ -17435,9 +18148,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STONE_AXE] = { - .name = MOVE_NAME("Stone Axe"), - .description = COMPOUND_STRING("High critical hit ratio. Sets\n" - "Splinters that hurt the foe."), + .name = COMPOUND_STRING("Stone Axe"), + .description = COMPOUND_STRING( + "High critical hit ratio. Sets\n" + "Splinters that hurt the foe."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ROCK, @@ -17458,8 +18172,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPRINGTIDE_STORM] = { .name = HANDLE_EXPANDED_MOVE_NAME("SprngtdeStrm", "Springtide Storm"), - .description = COMPOUND_STRING("Wraps a foe in fierce winds.\n" - "Varies with the user's form."), + .description = COMPOUND_STRING( + "Wraps a foe in fierce winds.\n" + "Varies with the user's form."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_FAIRY, @@ -17480,8 +18195,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MYSTICAL_POWER] = { .name = HANDLE_EXPANDED_MOVE_NAME("MystcalPower", "Mystical Power"), - .description = COMPOUND_STRING("A mysterious power strikes,\n" - "raising the user's Sp. Atk."), + .description = COMPOUND_STRING( + "A mysterious power strikes,\n" + "raising the user's Sp. Atk."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -17500,9 +18216,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_FURY] = { - .name = MOVE_NAME("Raging Fury"), - .description = COMPOUND_STRING("A rampage of 2 to 3 turns\n" - "that confuses the user."), + .name = COMPOUND_STRING("Raging Fury"), + .description = COMPOUND_STRING( + "A rampage of 2 to 3 turns\n" + "that confuses the user."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 90, .type = TYPE_FIRE, @@ -17520,9 +18237,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WAVE_CRASH] = { - .name = MOVE_NAME("Wave Crash"), - .description = COMPOUND_STRING("A slam shrouded in water.\n" - "It also hurts the user."), + .name = COMPOUND_STRING("Wave Crash"), + .description = COMPOUND_STRING( + "A slam shrouded in water.\n" + "It also hurts the user."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 75, .type = TYPE_WATER, @@ -17538,9 +18256,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHLOROBLAST] = { - .name = MOVE_NAME("Chloroblast"), - .description = COMPOUND_STRING("A user-hurting blast of\n" - "amassed chlorophyll."), + .name = COMPOUND_STRING("Chloroblast"), + .description = COMPOUND_STRING( + "A user-hurting blast of\n" + "amassed chlorophyll."), .effect = EFFECT_MAX_HP_50_RECOIL, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 150 : 120, .type = TYPE_GRASS, @@ -17554,8 +18273,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MOUNTAIN_GALE] = { .name = HANDLE_EXPANDED_MOVE_NAME("MountainGale", "Mountain Gale"), - .description = COMPOUND_STRING("Giant chunks of ice damage\n" - "the foe. It may flinch."), + .description = COMPOUND_STRING( + "Giant chunks of ice damage\n" + "the foe. It may flinch."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_ICE, @@ -17574,8 +18294,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_VICTORY_DANCE] = { .name = HANDLE_EXPANDED_MOVE_NAME("VictoryDance", "Victory Dance"), - .description = COMPOUND_STRING("Dances to raise Attack,\n" - "Defense and Speed."), + .description = COMPOUND_STRING( + "Dances to raise Attack,\n" + "Defense and Speed."), .effect = EFFECT_VICTORY_DANCE, .power = 0, .type = TYPE_FIGHTING, @@ -17593,8 +18314,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HEADLONG_RUSH] = { .name = HANDLE_EXPANDED_MOVE_NAME("HeadlongRush", "Headlong Rush"), - .description = COMPOUND_STRING("Hits with a full-body tackle.\n" - "Lowers the users's defenses."), + .description = COMPOUND_STRING( + "Hits with a full-body tackle.\n" + "Lowers the users's defenses."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 100, .type = TYPE_GROUND, @@ -17613,9 +18335,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BARB_BARRAGE] = { - .name = MOVE_NAME("Barb Barrage"), - .description = COMPOUND_STRING("Can poison on impact. Powers\n" - "up against poisoned foes."), + .name = COMPOUND_STRING("Barb Barrage"), + .description = COMPOUND_STRING( + "Can poison on impact. Powers\n" + "up against poisoned foes."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = 60, .type = TYPE_POISON, @@ -17634,9 +18357,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ESPER_WING] = { - .name = MOVE_NAME("Esper Wing"), - .description = COMPOUND_STRING("High critical hit ratio.\n" - "Ups the user's Speed."), + .name = COMPOUND_STRING("Esper Wing"), + .description = COMPOUND_STRING( + "High critical hit ratio.\n" + "Ups the user's Speed."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 80 : 75, .type = TYPE_PSYCHIC, @@ -17657,8 +18381,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_MALICE] = { .name = HANDLE_EXPANDED_MOVE_NAME("BitterMalice", "Bitter Malice"), - .description = COMPOUND_STRING("A spine-chilling resentment.\n" - "May lower the foe's Attack."), + .description = COMPOUND_STRING( + "A spine-chilling resentment.\n" + "May lower the foe's Attack."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 75 : 60, .type = TYPE_GHOST, @@ -17676,9 +18401,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHELTER] = { - .name = MOVE_NAME("Shelter"), - .description = COMPOUND_STRING("The user hardens their skin,\n" - "sharply raising its Defense."), + .name = COMPOUND_STRING("Shelter"), + .description = COMPOUND_STRING( + "The user hardens their skin,\n" + "sharply raising its Defense."), .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -17695,8 +18421,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_ARROWS] = { .name = HANDLE_EXPANDED_MOVE_NAME("TripleArrows", "Triple Arrows"), - .description = COMPOUND_STRING("High critical hit ratio.\n" - "May lower Defense or flinch."), + .description = COMPOUND_STRING( + "High critical hit ratio.\n" + "May lower Defense or flinch."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 90 : 50, .type = TYPE_FIGHTING, @@ -17720,8 +18447,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNAL_PARADE] = { .name = HANDLE_EXPANDED_MOVE_NAME("InfrnlParade", "Infernal Parade"), - .description = COMPOUND_STRING("Hurts a foe harder if it has\n" - "an ailment. May leave a burn."), + .description = COMPOUND_STRING( + "Hurts a foe harder if it has\n" + "an ailment. May leave a burn."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = 60, .type = TYPE_GHOST, @@ -17741,8 +18469,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CEASELESS_EDGE] = { .name = HANDLE_EXPANDED_MOVE_NAME("CeaslessEdge", "Ceaseless Edge"), - .description = COMPOUND_STRING("High critical hit ratio. Sets\n" - "Splinters that hurt the foe."), + .description = COMPOUND_STRING( + "High critical hit ratio. Sets\n" + "Splinters that hurt the foe."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_DARK, @@ -17763,8 +18492,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLEAKWIND_STORM] = { .name = HANDLE_EXPANDED_MOVE_NAME("BlekwndStorm", "Bleakwind Storm"), - .description = COMPOUND_STRING("Hits with brutal, cold winds.\n" - "May lower the foe's Speed."), + .description = COMPOUND_STRING( + "Hits with brutal, cold winds.\n" + "May lower the foe's Speed."), .effect = EFFECT_RAIN_ALWAYS_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_FLYING, @@ -17784,8 +18514,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WILDBOLT_STORM] = { .name = HANDLE_EXPANDED_MOVE_NAME("WildbltStorm", "Wildbolt Storm"), - .description = COMPOUND_STRING("Hits with a brutal tempest.\n" - "May inflict paralysis."), + .description = COMPOUND_STRING( + "Hits with a brutal tempest.\n" + "May inflict paralysis."), .effect = EFFECT_RAIN_ALWAYS_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_ELECTRIC, @@ -17805,8 +18536,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSEAR_STORM] = { .name = HANDLE_EXPANDED_MOVE_NAME("SndsearStorm", "Sandsear Storm"), - .description = COMPOUND_STRING("Hits with brutally hot sand.\n" - "May inflict a burn."), + .description = COMPOUND_STRING( + "Hits with brutally hot sand.\n" + "May inflict a burn."), .effect = EFFECT_RAIN_ALWAYS_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_GROUND, @@ -17826,8 +18558,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LUNAR_BLESSING] = { .name = HANDLE_EXPANDED_MOVE_NAME("LunarBlessng", "Lunar Blessing"), - .description = COMPOUND_STRING("The user heals and cures\n" - "itself and its ally."), + .description = COMPOUND_STRING( + "The user heals and cures\n" + "itself and its ally."), .effect = EFFECT_JUNGLE_HEALING, .power = 0, .type = TYPE_PSYCHIC, @@ -17844,9 +18577,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TAKE_HEART] = { - .name = MOVE_NAME("Take Heart"), - .description = COMPOUND_STRING("The user lifts its spirits to\n" - "heal and strengthen itself."), + .name = COMPOUND_STRING("Take Heart"), + .description = COMPOUND_STRING( + "The user lifts its spirits to\n" + "heal and strengthen itself."), .effect = EFFECT_TAKE_HEART, .power = 0, .type = TYPE_PSYCHIC, @@ -17862,9 +18596,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_BLAST] = { - .name = MOVE_NAME("Tera Blast"), - .description = COMPOUND_STRING("If the user's Terastallized,\n" - "it hits with its Tera-type."), + .name = COMPOUND_STRING("Tera Blast"), + .description = COMPOUND_STRING( + "If the user's Terastallized,\n" + "it hits with its Tera-type."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TERA_BLAST, .power = 80, .type = TYPE_NORMAL, @@ -17879,9 +18614,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SILK_TRAP] = { - .name = MOVE_NAME("Silk Trap"), - .description = COMPOUND_STRING("Protects itself, lowering\n" - "Speed on contact."), + .name = COMPOUND_STRING("Silk Trap"), + .description = COMPOUND_STRING( + "Protects itself, lowering\n" + "Speed on contact."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_BUG, @@ -17898,9 +18634,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AXE_KICK] = { - .name = MOVE_NAME("Axe Kick"), - .description = COMPOUND_STRING("May miss and hurt the kicker.\n" - "May cause confusion."), + .name = COMPOUND_STRING("Axe Kick"), + .description = COMPOUND_STRING( + "May miss and hurt the kicker.\n" + "May cause confusion."), .effect = EFFECT_RECOIL_IF_MISS, .power = 120, .type = TYPE_FIGHTING, @@ -17920,8 +18657,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESPECTS] = { .name = HANDLE_EXPANDED_MOVE_NAME("LastRespects", "Last Respects"), - .description = COMPOUND_STRING("This move deals more damage\n" - "for each defeated ally."), + .description = COMPOUND_STRING( + "This move deals more damage\n" + "for each defeated ally."), .effect = EFFECT_PLACEHOLDER, // EFFECT_LAST_RESPECTS .power = 50, .type = TYPE_GHOST, @@ -17935,9 +18673,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LUMINA_CRASH] = { - .name = MOVE_NAME("Lumina Crash"), - .description = COMPOUND_STRING("A mind-affecting light\n" - "harshly lowers Sp. Def."), + .name = COMPOUND_STRING("Lumina Crash"), + .description = COMPOUND_STRING( + "A mind-affecting light\n" + "harshly lowers Sp. Def."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -17955,9 +18694,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ORDER_UP] = { - .name = MOVE_NAME("Order Up"), - .description = COMPOUND_STRING("Boosts a user's stats\n" - "depending on Tatsugiri."), + .name = COMPOUND_STRING("Order Up"), + .description = COMPOUND_STRING( + "Boosts a user's stats\n" + "depending on Tatsugiri."), .effect = EFFECT_PLACEHOLDER, // EFFECT_ORDER_UP .power = 80, .type = TYPE_DRAGON, @@ -17973,9 +18713,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_JET_PUNCH] = { - .name = MOVE_NAME("Jet Punch"), - .description = COMPOUND_STRING("A punch is thrown at blinding\n" - "speed to strike first."), + .name = COMPOUND_STRING("Jet Punch"), + .description = COMPOUND_STRING( + "A punch is thrown at blinding\n" + "speed to strike first."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_WATER, @@ -17993,8 +18734,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPICY_EXTRACT] = { .name = HANDLE_EXPANDED_MOVE_NAME("SpicyExtract", "Spicy Extract"), - .description = COMPOUND_STRING("Sharply ups target's Attack,\n" - "harshly lowers its Defense."), + .description = COMPOUND_STRING( + "Sharply ups target's Attack,\n" + "harshly lowers its Defense."), .effect = EFFECT_PLACEHOLDER, // EFFECT_SPICY_EXTRACT .power = 0, .type = TYPE_GRASS, @@ -18009,9 +18751,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPIN_OUT] = { - .name = MOVE_NAME("Spin Out"), - .description = COMPOUND_STRING("Furiously strains its legs.\n" - "Harshly lowers user's Speed."), + .name = COMPOUND_STRING("Spin Out"), + .description = COMPOUND_STRING( + "Furiously strains its legs.\n" + "Harshly lowers user's Speed."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_STEEL, @@ -18031,8 +18774,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POPULATION_BOMB] = { .name = HANDLE_EXPANDED_MOVE_NAME("PoplatinBomb", "Population Bomb"), - .description = COMPOUND_STRING("The user's fellows hit one\n" - "to ten times in a row."), + .description = COMPOUND_STRING( + "The user's fellows hit one\n" + "to ten times in a row."), .effect = EFFECT_POPULATION_BOMB, .power = 20, .type = TYPE_NORMAL, @@ -18049,9 +18793,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_SPINNER] = { - .name = MOVE_NAME("Ice Spinner"), - .description = COMPOUND_STRING("Ice-covered feet hit a foe\n" - "and destroy the terrain."), + .name = COMPOUND_STRING("Ice Spinner"), + .description = COMPOUND_STRING( + "Ice-covered feet hit a foe\n" + "and destroy the terrain."), .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 80, .type = TYPE_ICE, @@ -18067,9 +18812,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GLAIVE_RUSH] = { - .name = MOVE_NAME("Glaive Rush"), - .description = COMPOUND_STRING("Foe attacks next turn can't\n" - "miss and do double damage."), + .name = COMPOUND_STRING("Glaive Rush"), + .description = COMPOUND_STRING( + "Foe attacks next turn can't\n" + "miss and do double damage."), .effect = EFFECT_GLAIVE_RUSH, .power = 120, .type = TYPE_DRAGON, @@ -18085,8 +18831,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_REVIVAL_BLESSING] = { .name = HANDLE_EXPANDED_MOVE_NAME("RevivlBlesng", "Revival Blessing"), - .description = COMPOUND_STRING("Revives a fainted party {PKMN}\n" - "and restores half of its HP."), + .description = COMPOUND_STRING( + "Revives a fainted party {PKMN}\n" + "and restores half of its HP."), .effect = EFFECT_REVIVAL_BLESSING, .power = 0, .type = TYPE_NORMAL, @@ -18104,9 +18851,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SALT_CURE] = { - .name = MOVE_NAME("Salt Cure"), - .description = COMPOUND_STRING("Hurts foe every turn. Double\n" - "damage to Steel and Water."), + .name = COMPOUND_STRING("Salt Cure"), + .description = COMPOUND_STRING( + "Hurts foe every turn. Double\n" + "damage to Steel and Water."), .effect = EFFECT_SALT_CURE, .power = 40, .type = TYPE_ROCK, @@ -18121,9 +18869,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_DIVE] = { - .name = MOVE_NAME("Triple Dive"), - .description = COMPOUND_STRING("Hits target with splashes\n" - "of water 3 times in a row."), + .name = COMPOUND_STRING("Triple Dive"), + .description = COMPOUND_STRING( + "Hits target with splashes\n" + "of water 3 times in a row."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_WATER, @@ -18138,9 +18887,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MORTAL_SPIN] = { - .name = MOVE_NAME("Mortal Spin"), - .description = COMPOUND_STRING("Erases trap moves and Leech\n" - "Seed. Poisons adjecent foes."), + .name = COMPOUND_STRING("Mortal Spin"), + .description = COMPOUND_STRING( + "Erases trap moves and Leech\n" + "Seed. Poisons adjecent foes."), .effect = EFFECT_HIT, .power = 30, .type = TYPE_POISON, @@ -18163,9 +18913,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOODLE] = { - .name = MOVE_NAME("Doodle"), - .description = COMPOUND_STRING("Changes user's and ally's\n" - "Ability into the target's."), + .name = COMPOUND_STRING("Doodle"), + .description = COMPOUND_STRING( + "Changes user's and ally's\n" + "Ability into the target's."), .effect = EFFECT_DOODLE, .power = 0, .type = TYPE_NORMAL, @@ -18181,9 +18932,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FILLET_AWAY] = { - .name = MOVE_NAME("Fillet Away"), - .description = COMPOUND_STRING("Sharply boosts offenses and\n" - "Speed by using its own HP."), + .name = COMPOUND_STRING("Fillet Away"), + .description = COMPOUND_STRING( + "Sharply boosts offenses and\n" + "Speed by using its own HP."), .effect = EFFECT_FILLET_AWAY, .power = 0, .type = TYPE_NORMAL, @@ -18202,8 +18954,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_KOWTOW_CLEAVE] = { .name = HANDLE_EXPANDED_MOVE_NAME("KowtowCleave", "Kowtow Cleave"), - .description = COMPOUND_STRING("User slashes the foe after\n" - "kowtowing. It never misses."), + .description = COMPOUND_STRING( + "User slashes the foe after\n" + "kowtowing. It never misses."), .effect = EFFECT_HIT, .power = 85, .type = TYPE_DARK, @@ -18218,9 +18971,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FLOWER_TRICK] = { - .name = MOVE_NAME("Flower Trick"), - .description = COMPOUND_STRING("Rigged bouquet. Always gets\n" - "a critical hit, never missing."), + .name = COMPOUND_STRING("Flower Trick"), + .description = COMPOUND_STRING( + "Rigged bouquet. Always gets\n" + "a critical hit, never missing."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_GRASS, @@ -18234,9 +18988,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TORCH_SONG] = { - .name = MOVE_NAME("Torch Song"), - .description = COMPOUND_STRING("Flames scorch the target.\n" - "Boosts the user's Sp. Atk."), + .name = COMPOUND_STRING("Torch Song"), + .description = COMPOUND_STRING( + "Flames scorch the target.\n" + "Boosts the user's Sp. Atk."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -18257,9 +19012,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_STEP] = { - .name = MOVE_NAME("Aqua Step"), - .description = COMPOUND_STRING("Hits with light, fluid dance\n" - "steps. Ups the user's Speed."), + .name = COMPOUND_STRING("Aqua Step"), + .description = COMPOUND_STRING( + "Hits with light, fluid dance\n" + "steps. Ups the user's Speed."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_WATER, @@ -18280,9 +19036,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_BULL] = { - .name = MOVE_NAME("Raging Bull"), - .description = COMPOUND_STRING("Tackle that breaks barriers.\n" - "User's form determines type."), + .name = COMPOUND_STRING("Raging Bull"), + .description = COMPOUND_STRING( + "Tackle that breaks barriers.\n" + "User's form determines type."), .effect = EFFECT_RAGING_BULL, .power = 90, .type = TYPE_NORMAL, @@ -18297,9 +19054,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAKE_IT_RAIN] = { - .name = MOVE_NAME("Make It Rain"), - .description = COMPOUND_STRING("Lowers the user's Sp. Atk.\n" - "Money is recovered after."), + .name = COMPOUND_STRING("Make It Rain"), + .description = COMPOUND_STRING( + "Lowers the user's Sp. Atk.\n" + "Money is recovered after."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_STEEL, @@ -18320,9 +19078,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RUINATION] = { - .name = MOVE_NAME("Ruination"), - .description = COMPOUND_STRING("Summons a ruinous disaster\n" - "and cuts half the foe's HP."), + .name = COMPOUND_STRING("Ruination"), + .description = COMPOUND_STRING( + "Summons a ruinous disaster\n" + "and cuts half the foe's HP."), .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_DARK, @@ -18337,8 +19096,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COLLISION_COURSE] = { .name = HANDLE_EXPANDED_MOVE_NAME("ColisinCours", "Collision Course"), - .description = COMPOUND_STRING("Prehistoric explosion that's\n" - "stronger if supereffective."), + .description = COMPOUND_STRING( + "Prehistoric explosion that's\n" + "stronger if supereffective."), .effect = EFFECT_COLLISION_COURSE, .power = 100, .type = TYPE_FIGHTING, @@ -18354,8 +19114,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_DRIFT] = { .name = HANDLE_EXPANDED_MOVE_NAME("ElectroDrift", "Electro Drift"), - .description = COMPOUND_STRING("Futuristic electricity. It's\n" - "stronger if supereffective."), + .description = COMPOUND_STRING( + "Futuristic electricity. It's\n" + "stronger if supereffective."), .effect = EFFECT_COLLISION_COURSE, .power = 100, .type = TYPE_ELECTRIC, @@ -18370,9 +19131,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHED_TAIL] = { - .name = MOVE_NAME("Shed Tail"), - .description = COMPOUND_STRING("Creates a Substitute for\n" - "itself before switching out."), + .name = COMPOUND_STRING("Shed Tail"), + .description = COMPOUND_STRING( + "Creates a Substitute for\n" + "itself before switching out."), .effect = EFFECT_SHED_TAIL, .power = 0, .type = TYPE_NORMAL, @@ -18390,8 +19152,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLY_RECEPTION] = { .name = HANDLE_EXPANDED_MOVE_NAME("ChilReceptin", "Chilly Reception"), - .description = COMPOUND_STRING("Bad joke summons snowstorm.\n" - "The user also switches out."), + .description = COMPOUND_STRING( + "Bad joke summons snowstorm.\n" + "The user also switches out."), .effect = EFFECT_CHILLY_RECEPTION, .power = 0, .type = TYPE_ICE, @@ -18408,9 +19171,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TIDY_UP] = { - .name = MOVE_NAME("Tidy Up"), - .description = COMPOUND_STRING("User tidies up hazards and\n" - "raises its Attack and Speed."), + .name = COMPOUND_STRING("Tidy Up"), + .description = COMPOUND_STRING( + "User tidies up hazards and\n" + "raises its Attack and Speed."), .effect = EFFECT_PLACEHOLDER, // EFFECT_TIDY_UP .power = 0, .type = TYPE_NORMAL, @@ -18426,9 +19190,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SNOWSCAPE] = { - .name = MOVE_NAME("Snowscape"), - .description = COMPOUND_STRING("Summons a snowstorm that\n" - "lasts for five turns."), + .name = COMPOUND_STRING("Snowscape"), + .description = COMPOUND_STRING( + "Summons a snowstorm that\n" + "lasts for five turns."), .effect = EFFECT_SNOWSCAPE, .power = 0, .type = TYPE_ICE, @@ -18445,9 +19210,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_POUNCE] = { - .name = MOVE_NAME("Pounce"), - .description = COMPOUND_STRING("The user pounces on the foe,\n" - "lowering its Speed."), + .name = COMPOUND_STRING("Pounce"), + .description = COMPOUND_STRING( + "The user pounces on the foe,\n" + "lowering its Speed."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_BUG, @@ -18467,9 +19233,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TRAILBLAZE] = { - .name = MOVE_NAME("Trailblaze"), - .description = COMPOUND_STRING("The user attacks suddenly,\n" - "raising its Speed."), + .name = COMPOUND_STRING("Trailblaze"), + .description = COMPOUND_STRING( + "The user attacks suddenly,\n" + "raising its Speed."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_GRASS, @@ -18490,8 +19257,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLING_WATER] = { .name = HANDLE_EXPANDED_MOVE_NAME("ChillingWatr", "Chilling Water"), - .description = COMPOUND_STRING("A shower with ice-cold water\n" - "lowers the target's Attack."), + .description = COMPOUND_STRING( + "A shower with ice-cold water\n" + "lowers the target's Attack."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_WATER, @@ -18509,9 +19277,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYPER_DRILL] = { - .name = MOVE_NAME("Hyper Drill"), - .description = COMPOUND_STRING("A spinning pointed part\n" - "bypasses a foe's Protect."), + .name = COMPOUND_STRING("Hyper Drill"), + .description = COMPOUND_STRING( + "A spinning pointed part\n" + "bypasses a foe's Protect."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -18527,9 +19296,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TWIN_BEAM] = { - .name = MOVE_NAME("Twin Beam"), - .description = COMPOUND_STRING("Mystical eye-beams that hit\n" - "the target twice in a row."), + .name = COMPOUND_STRING("Twin Beam"), + .description = COMPOUND_STRING( + "Mystical eye-beams that hit\n" + "the target twice in a row."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_PSYCHIC, @@ -18544,9 +19314,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_FIST] = { - .name = MOVE_NAME("Rage Fist"), - .description = COMPOUND_STRING("The more the user has been\n" - "hit, the stronger the move."), + .name = COMPOUND_STRING("Rage Fist"), + .description = COMPOUND_STRING( + "The more the user has been\n" + "hit, the stronger the move."), .effect = EFFECT_RAGE_FIST, .power = 50, .type = TYPE_GHOST, @@ -18562,9 +19333,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ARMOR_CANNON] = { - .name = MOVE_NAME("Armor Cannon"), - .description = COMPOUND_STRING("A strong attack but lowers\n" - "the defensive stats."), + .name = COMPOUND_STRING("Armor Cannon"), + .description = COMPOUND_STRING( + "A strong attack but lowers\n" + "the defensive stats."), .effect = EFFECT_HIT, .power = 120, .type = TYPE_FIRE, @@ -18582,9 +19354,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_BLADE] = { - .name = MOVE_NAME("Bitter Blade"), - .description = COMPOUND_STRING("An attack that absorbs\n" - "half the damage inflicted."), + .name = COMPOUND_STRING("Bitter Blade"), + .description = COMPOUND_STRING( + "An attack that absorbs\n" + "half the damage inflicted."), .effect = EFFECT_ABSORB, .power = 90, .type = TYPE_FIRE, @@ -18600,9 +19373,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DOUBLE_SHOCK] = { - .name = MOVE_NAME("Double Shock"), - .description = COMPOUND_STRING("Discharges all electricity,\n" - "losing the Electric type."), + .name = COMPOUND_STRING("Double Shock"), + .description = COMPOUND_STRING( + "Discharges all electricity,\n" + "losing the Electric type."), .effect = EFFECT_FAIL_IF_NOT_ARG_TYPE, .power = 120, .type = TYPE_ELECTRIC, @@ -18623,8 +19397,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GIGATON_HAMMER] = { .name = HANDLE_EXPANDED_MOVE_NAME("GigatonHammr", "Gigaton Hammer"), - .description = COMPOUND_STRING("Swings a huge hammer. Can't\n" - "be used twice in a row."), + .description = COMPOUND_STRING( + "Swings a huge hammer. Can't\n" + "be used twice in a row."), .effect = EFFECT_HIT, .power = 160, .type = TYPE_STEEL, @@ -18638,9 +19413,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COMEUPPANCE] = { - .name = MOVE_NAME("Comeuppance"), - .description = COMPOUND_STRING("Retaliates strongly against\n" - "who last hurt the user."), + .name = COMPOUND_STRING("Comeuppance"), + .description = COMPOUND_STRING( + "Retaliates strongly against\n" + "who last hurt the user."), .effect = EFFECT_METAL_BURST, .power = 1, .type = TYPE_DARK, @@ -18656,9 +19432,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_AQUA_CUTTER] = { - .name = MOVE_NAME("Aqua Cutter"), - .description = COMPOUND_STRING("Pressurized water cut with a\n" - "high critical-hit ratio."), + .name = COMPOUND_STRING("Aqua Cutter"), + .description = COMPOUND_STRING( + "Pressurized water cut with a\n" + "high critical-hit ratio."), .effect = EFFECT_HIT, .power = 70, .type = TYPE_WATER, @@ -18818,9 +19595,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYBLADE] = { - .name = MOVE_NAME("Psyblade"), - .description = COMPOUND_STRING("This move's power increases\n" - "when on Electric Terrain."), + .name = COMPOUND_STRING("Psyblade"), + .description = COMPOUND_STRING( + "This move's power increases\n" + "when on Electric Terrain."), .effect = EFFECT_PSYBLADE, .power = 80, .type = TYPE_PSYCHIC, @@ -18835,9 +19613,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_STEAM] = { - .name = MOVE_NAME("Hydro Steam"), - .description = COMPOUND_STRING("This move's power increases\n" - "under harsh sunlight."), + .name = COMPOUND_STRING("Hydro Steam"), + .description = COMPOUND_STRING( + "This move's power increases\n" + "under harsh sunlight."), .effect = EFFECT_HYDRO_STEAM, .power = 80, .type = TYPE_WATER, @@ -18851,9 +19630,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLOOD_MOON] = { - .name = MOVE_NAME("Blood Moon"), - .description = COMPOUND_STRING("Unleashes the blood moon.\n" - "Can't be used twice in a row."), + .name = COMPOUND_STRING("Blood Moon"), + .description = COMPOUND_STRING( + "Unleashes the blood moon.\n" + "Can't be used twice in a row."), .effect = EFFECT_HIT, .power = 140, .type = TYPE_NORMAL, @@ -18868,8 +19648,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MATCHA_GOTCHA] = { .name = HANDLE_EXPANDED_MOVE_NAME("MatchaGotcha", "Matcha Gotcha"), - .description = COMPOUND_STRING("Absorbs half the damage\n" - "inflicted. May cause a burn."), + .description = COMPOUND_STRING( + "Absorbs half the damage\n" + "inflicted. May cause a burn."), .effect = EFFECT_ABSORB, .power = 80, .type = TYPE_GRASS, @@ -18889,9 +19670,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SYRUP_BOMB] = { - .name = MOVE_NAME("Syrup Bomb"), - .description = COMPOUND_STRING("Lowers the foe's speed\n" - "each turn for 3 turns."), + .name = COMPOUND_STRING("Syrup Bomb"), + .description = COMPOUND_STRING( + "Lowers the foe's speed\n" + "each turn for 3 turns."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_GRASS, @@ -18910,9 +19692,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_IVY_CUDGEL] = { - .name = MOVE_NAME("Ivy Cudgel"), - .description = COMPOUND_STRING("Type changes with held mask.\n" - "High critical-hit ratio."), + .name = COMPOUND_STRING("Ivy Cudgel"), + .description = COMPOUND_STRING( + "Type changes with held mask.\n" + "High critical-hit ratio."), .effect = EFFECT_IVY_CUDGEL, .power = 100, .type = TYPE_GRASS, @@ -18927,9 +19710,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_SHOT] = { - .name = MOVE_NAME("Electro Shot"), - .description = COMPOUND_STRING("Absorbs electricity in one turn,\n" - "then attacks next turn."), + .name = COMPOUND_STRING("Electro Shot"), + .description = COMPOUND_STRING( + "Absorbs electricity in one turn,\n" + "then attacks next turn."), .effect = EFFECT_METEOR_BEAM, .power = 130, .type = TYPE_ELECTRIC, @@ -18949,8 +19733,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TERA_STARSTORM] = { .name = HANDLE_EXPANDED_MOVE_NAME("TeraStarstrm", "Tera Starstorm"), - .description = COMPOUND_STRING("Damages all opponents if user is\n" - "Stellar form Terapagos."), + .description = COMPOUND_STRING( + "Damages all opponents if user is\n" + "Stellar form Terapagos."), .effect = EFFECT_PLACEHOLDER, //EFFECT_TERA_STARSTORM .power = 120, .type = TYPE_NORMAL, // Stellar type if used by Terapagos-Stellar @@ -18967,9 +19752,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_FICKLE_BEAM] = { - .name = MOVE_NAME("Fickle Beam"), - .description = COMPOUND_STRING("Shoots a beam of light. Sometimes\n" - "twice as strong."), + .name = COMPOUND_STRING("Fickle Beam"), + .description = COMPOUND_STRING( + "Shoots a beam of light. Sometimes\n" + "twice as strong."), .effect = EFFECT_FICKLE_BEAM, .power = 80, .type = TYPE_DRAGON, @@ -18983,8 +19769,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_BULWARK] = { .name = HANDLE_EXPANDED_MOVE_NAME("BurnngBulwrk", "Burning Bulwark"), - .description = COMPOUND_STRING("Evades attack, and burns\n" - "the foe if struck."), + .description = COMPOUND_STRING( + "Evades attack, and burns\n" + "the foe if struck."), .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIRE, @@ -19004,7 +19791,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERCLAP] = { - .name = MOVE_NAME("Thunderclap"), + .name = COMPOUND_STRING("Thunderclap"), .description = sSuckerPunchDescription, .effect = EFFECT_SUCKER_PUNCH, .power = 70, @@ -19036,8 +19823,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TACHYON_CUTTER] = { .name = HANDLE_EXPANDED_MOVE_NAME("TachyonCuttr", "Tachyon Cutter"), - .description = COMPOUND_STRING("Launches particle blades at\n" - "the target. Strikes twice."), + .description = COMPOUND_STRING( + "Launches particle blades at\n" + "the target. Strikes twice."), .effect = EFFECT_HIT, .power = 50, .type = TYPE_STEEL, @@ -19052,7 +19840,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HARD_PRESS] = { - .name = MOVE_NAME("Hard Press"), + .name = COMPOUND_STRING("Hard Press"), .description = sWringOutDescription, .effect = EFFECT_WRING_OUT, .power = 1, @@ -19067,9 +19855,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_CHEER] = { - .name = MOVE_NAME("Dragon Cheer"), - .description = COMPOUND_STRING("Increases allies' critical hit\n" - "ratio, especially if Dragons."), + .name = COMPOUND_STRING("Dragon Cheer"), + .description = COMPOUND_STRING( + "Increases allies' critical hit\n" + "ratio, especially if Dragons."), .effect = EFFECT_PLACEHOLDER, //EFFECT_DRAGON_CHEER .power = 0, .type = TYPE_DRAGON, @@ -19084,8 +19873,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ALLURING_VOICE] = { .name = HANDLE_EXPANDED_MOVE_NAME("AllurngVoice", "Alluring Voice"), - .description = COMPOUND_STRING("Confuses the target if their\n" - "stats were boosted this turn."), + .description = COMPOUND_STRING( + "Confuses the target if their\n" + "stats were boosted this turn."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_FAIRY, @@ -19106,9 +19896,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TEMPER_FLARE] = { - .name = MOVE_NAME("Temper Flare"), - .description = COMPOUND_STRING("A desperation attack. Power\n" - "doubles if last move failed."), + .name = COMPOUND_STRING("Temper Flare"), + .description = COMPOUND_STRING( + "A desperation attack. Power\n" + "doubles if last move failed."), .effect = EFFECT_STOMPING_TANTRUM, .power = 75, .type = TYPE_FIRE, @@ -19123,8 +19914,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERCELL_SLAM] = { .name = HANDLE_EXPANDED_MOVE_NAME("SuprcellSlam", "Supercell Slam"), - .description = COMPOUND_STRING("An electrified slam. If it\n" - "misses, the user is hurt."), + .description = COMPOUND_STRING( + "An electrified slam. If it\n" + "misses, the user is hurt."), .effect = EFFECT_RECOIL_IF_MISS, .power = 100, .type = TYPE_ELECTRIC, @@ -19139,8 +19931,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHIC_NOISE] = { .name = HANDLE_EXPANDED_MOVE_NAME("PsychicNoise", "Psychic Noise"), - .description = COMPOUND_STRING("Unpleasant sound waves that\n" - "damage and prevent healing."), + .description = COMPOUND_STRING( + "Unpleasant sound waves that\n" + "damage and prevent healing."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_PSYCHIC, @@ -19159,9 +19952,10 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_UPPER_HAND] = { - .name = MOVE_NAME("Upper Hand"), - .description = COMPOUND_STRING("Makes the target flinch if\n" - "readying a priority move."), + .name = COMPOUND_STRING("Upper Hand"), + .description = COMPOUND_STRING( + "Makes the target flinch if\n" + "readying a priority move."), .effect = EFFECT_PLACEHOLDER, //EFFECT_UPPER_HAND .power = 65, .type = TYPE_FIGHTING, @@ -19176,8 +19970,9 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MALIGNANT_CHAIN] = { .name = HANDLE_EXPANDED_MOVE_NAME("MalignntChan", "Malignant Chain"), - .description = COMPOUND_STRING("A corrosive chain attack\n" - "that may badly poison."), + .description = COMPOUND_STRING( + "A corrosive chain attack\n" + "that may badly poison."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_POISON, @@ -19195,7 +19990,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = // Z-Moves [MOVE_BREAKNECK_BLITZ] = { - .name = LONG_MOVE_NAME("Breakneck Blitz"), + .name = COMPOUND_STRING("Breakneck Blitz"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19208,7 +20003,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_ALL_OUT_PUMMELING] = { - .name = LONG_MOVE_NAME("All Out Pummeling"), + .name = COMPOUND_STRING("All Out Pummeling"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19221,7 +20016,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUPERSONIC_SKYSTRIKE] = { - .name = LONG_MOVE_NAME("Supersonic Skystrike"), + .name = COMPOUND_STRING("Supersonic Skystrike"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19234,7 +20029,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_ACID_DOWNPOUR] = { - .name = LONG_MOVE_NAME("Acid Downpour"), + .name = COMPOUND_STRING("Acid Downpour"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19247,7 +20042,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_TECTONIC_RAGE] = { - .name = LONG_MOVE_NAME("Tectonic Rage"), + .name = COMPOUND_STRING("Tectonic Rage"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19261,7 +20056,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_CONTINENTAL_CRUSH] = { - .name = LONG_MOVE_NAME("Continental Crush"), + .name = COMPOUND_STRING("Continental Crush"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19274,7 +20069,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_SAVAGE_SPIN_OUT] = { - .name = LONG_MOVE_NAME("Savage Spin Out"), + .name = COMPOUND_STRING("Savage Spin Out"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19287,7 +20082,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_NEVER_ENDING_NIGHTMARE] = { - .name = LONG_MOVE_NAME("Never Ending Nightmare"), + .name = COMPOUND_STRING("Never Ending Nightmare"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19300,7 +20095,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_CORKSCREW_CRASH] = { - .name = LONG_MOVE_NAME("Corkscrew Crash"), + .name = COMPOUND_STRING("Corkscrew Crash"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19313,7 +20108,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_INFERNO_OVERDRIVE] = { - .name = LONG_MOVE_NAME("Inferno Overdrive"), + .name = COMPOUND_STRING("Inferno Overdrive"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19326,7 +20121,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_HYDRO_VORTEX] = { - .name = LONG_MOVE_NAME("Hydro Vortex"), + .name = COMPOUND_STRING("Hydro Vortex"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19339,7 +20134,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLOOM_DOOM] = { - .name = LONG_MOVE_NAME("Bloom Doom"), + .name = COMPOUND_STRING("Bloom Doom"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19352,7 +20147,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_GIGAVOLT_HAVOC] = { - .name = LONG_MOVE_NAME("Gigavolt Havoc"), + .name = COMPOUND_STRING("Gigavolt Havoc"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19365,7 +20160,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_SHATTERED_PSYCHE] = { - .name = LONG_MOVE_NAME("Shattered Psyche"), + .name = COMPOUND_STRING("Shattered Psyche"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19378,7 +20173,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_SUBZERO_SLAMMER] = { - .name = LONG_MOVE_NAME("Subzero Slammer"), + .name = COMPOUND_STRING("Subzero Slammer"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19391,7 +20186,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_DEVASTATING_DRAKE] = { - .name = LONG_MOVE_NAME("Devastating Drake"), + .name = COMPOUND_STRING("Devastating Drake"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19404,7 +20199,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_BLACK_HOLE_ECLIPSE] = { - .name = LONG_MOVE_NAME("Black Hole Eclipse"), + .name = COMPOUND_STRING("Black Hole Eclipse"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19417,7 +20212,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_TWINKLE_TACKLE] = { - .name = LONG_MOVE_NAME("Twinkle Tackle"), + .name = COMPOUND_STRING("Twinkle Tackle"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 1, @@ -19430,7 +20225,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_CATASTROPIKA] = { - .name = LONG_MOVE_NAME("Catastropika"), + .name = COMPOUND_STRING("Catastropika"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 210, @@ -19443,7 +20238,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_10000000_VOLT_THUNDERBOLT] = { - .name = LONG_MOVE_NAME("10000000 Volt Thunderbolt"), + .name = COMPOUND_STRING("10000000 Volt Thunderbolt"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, @@ -19457,7 +20252,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_STOKED_SPARKSURFER] = { - .name = LONG_MOVE_NAME("Stoked Sparksurfer"), + .name = COMPOUND_STRING("Stoked Sparksurfer"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 175, @@ -19474,7 +20269,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_EXTREME_EVOBOOST] = { - .name = LONG_MOVE_NAME("Extreme Evoboost"), + .name = COMPOUND_STRING("Extreme Evoboost"), .description = sNullDescription, .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, @@ -19487,7 +20282,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_PULVERIZING_PANCAKE] = { - .name = LONG_MOVE_NAME("Pulverizing Pancake"), + .name = COMPOUND_STRING("Pulverizing Pancake"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 210, @@ -19500,7 +20295,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_GENESIS_SUPERNOVA] = { - .name = LONG_MOVE_NAME("Genesis Supernova"), + .name = COMPOUND_STRING("Genesis Supernova"), .description = sNullDescription, .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, @@ -19514,7 +20309,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_SINISTER_ARROW_RAID] = { - .name = LONG_MOVE_NAME("Sinister Arrow Raid"), + .name = COMPOUND_STRING("Sinister Arrow Raid"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 180, @@ -19527,7 +20322,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_MALICIOUS_MOONSAULT] = { - .name = LONG_MOVE_NAME("Malicious Moonsault"), + .name = COMPOUND_STRING("Malicious Moonsault"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 180, @@ -19540,7 +20335,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_OCEANIC_OPERETTA] = { - .name = LONG_MOVE_NAME("Oceaning Operetta"), + .name = COMPOUND_STRING("Oceaning Operetta"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, @@ -19553,7 +20348,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_SPLINTERED_STORMSHARDS] = { - .name = LONG_MOVE_NAME("Splintered Stormshards"), + .name = COMPOUND_STRING("Splintered Stormshards"), .description = sNullDescription, .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, @@ -19567,7 +20362,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_LETS_SNUGGLE_FOREVER] = { - .name = LONG_MOVE_NAME("Let's Snuggle Forever"), + .name = COMPOUND_STRING("Let's Snuggle Forever"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 190, @@ -19580,7 +20375,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_CLANGOROUS_SOULBLAZE] = { - .name = LONG_MOVE_NAME("Clangorous Soulblaze"), + .name = COMPOUND_STRING("Clangorous Soulblaze"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 185, @@ -19600,7 +20395,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_GUARDIAN_OF_ALOLA] = { - .name = LONG_MOVE_NAME("Guardian Of Alola"), + .name = COMPOUND_STRING("Guardian Of Alola"), .description = sNullDescription, .effect = EFFECT_SUPER_FANG, .power = 1, @@ -19613,7 +20408,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_SEARING_SUNRAZE_SMASH] = { - .name = LONG_MOVE_NAME("Searing Sunraze Smash"), + .name = COMPOUND_STRING("Searing Sunraze Smash"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, @@ -19626,7 +20421,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { - .name = LONG_MOVE_NAME("Menacing Moonraze Maelstrom"), + .name = COMPOUND_STRING("Menacing Moonraze Maelstrom"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, @@ -19639,7 +20434,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { - .name = LONG_MOVE_NAME("Light That Burns The Sky"), + .name = COMPOUND_STRING("Light That Burns The Sky"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 200, @@ -19652,7 +20447,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { - .name = LONG_MOVE_NAME("Soul Stealing 7 Star Strike"), + .name = COMPOUND_STRING("Soul Stealing 7 Star Strike"), .description = sNullDescription, .effect = EFFECT_HIT, .power = 195, @@ -19666,7 +20461,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { - .name = LONG_MOVE_NAME("Max Guard"), + .name = COMPOUND_STRING("Max Guard"), .description = sNullDescription, .effect = EFFECT_PROTECT, .power = 0, @@ -19681,7 +20476,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { - .name = LONG_MOVE_NAME("Max Flare"), + .name = COMPOUND_STRING("Max Flare"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19696,7 +20491,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { - .name = LONG_MOVE_NAME("Max Flutterby"), + .name = COMPOUND_STRING("Max Flutterby"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19711,7 +20506,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { - .name = LONG_MOVE_NAME("Max Lightning"), + .name = COMPOUND_STRING("Max Lightning"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19726,7 +20521,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { - .name = LONG_MOVE_NAME("Max Strike"), + .name = COMPOUND_STRING("Max Strike"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19741,7 +20536,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { - .name = LONG_MOVE_NAME("Max Knuckle"), + .name = COMPOUND_STRING("Max Knuckle"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19756,7 +20551,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { - .name = LONG_MOVE_NAME("Max Phantasm"), + .name = COMPOUND_STRING("Max Phantasm"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19771,7 +20566,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { - .name = LONG_MOVE_NAME("Max Hailstorm"), + .name = COMPOUND_STRING("Max Hailstorm"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19786,7 +20581,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { - .name = LONG_MOVE_NAME("Max Ooze"), + .name = COMPOUND_STRING("Max Ooze"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19801,7 +20596,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { - .name = LONG_MOVE_NAME("Max Geyser"), + .name = COMPOUND_STRING("Max Geyser"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19816,7 +20611,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { - .name = LONG_MOVE_NAME("Max Airstream"), + .name = COMPOUND_STRING("Max Airstream"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19831,7 +20626,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { - .name = LONG_MOVE_NAME("Max Starfall"), + .name = COMPOUND_STRING("Max Starfall"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19846,7 +20641,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { - .name = LONG_MOVE_NAME("Max Wyrmwind"), + .name = COMPOUND_STRING("Max Wyrmwind"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19861,7 +20656,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { - .name = LONG_MOVE_NAME("Max Mindstorm"), + .name = COMPOUND_STRING("Max Mindstorm"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19876,7 +20671,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { - .name = LONG_MOVE_NAME("Max Rockfall"), + .name = COMPOUND_STRING("Max Rockfall"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19891,7 +20686,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { - .name = LONG_MOVE_NAME("Max Quake"), + .name = COMPOUND_STRING("Max Quake"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19907,7 +20702,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { - .name = LONG_MOVE_NAME("Max Darkness"), + .name = COMPOUND_STRING("Max Darkness"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 1, @@ -19922,7 +20717,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { - .name = LONG_MOVE_NAME("Max Overgrowth"), + .name = COMPOUND_STRING("Max Overgrowth"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -19937,7 +20732,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { - .name = LONG_MOVE_NAME("Max Steelspike"), + .name = COMPOUND_STRING("Max Steelspike"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -19952,7 +20747,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VINE_LASH] = { - .name = LONG_MOVE_NAME("G-Max Vine Lash"), + .name = COMPOUND_STRING("G-Max Vine Lash"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -19967,7 +20762,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { - .name = LONG_MOVE_NAME("G-Max Wildfire"), + .name = COMPOUND_STRING("G-Max Wildfire"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -19982,7 +20777,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CANNONADE] = { - .name = LONG_MOVE_NAME("G-Max Canonade"), + .name = COMPOUND_STRING("G-Max Canonade"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -19997,7 +20792,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { - .name = LONG_MOVE_NAME("G-Max Befuddle"), + .name = COMPOUND_STRING("G-Max Befuddle"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20012,7 +20807,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { - .name = LONG_MOVE_NAME("G-Max Volt Crash"), + .name = COMPOUND_STRING("G-Max Volt Crash"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20027,7 +20822,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { - .name = LONG_MOVE_NAME("G-Max Gold Rush"), + .name = COMPOUND_STRING("G-Max Gold Rush"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20042,7 +20837,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { - .name = LONG_MOVE_NAME("G-Max Chi Strike"), + .name = COMPOUND_STRING("G-Max Chi Strike"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20057,7 +20852,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { - .name = LONG_MOVE_NAME("G-Max Terror"), + .name = COMPOUND_STRING("G-Max Terror"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20072,7 +20867,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { - .name = LONG_MOVE_NAME("G-Max Foam Burst"), + .name = COMPOUND_STRING("G-Max Foam Burst"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20087,7 +20882,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { - .name = LONG_MOVE_NAME("G-Max Resonance"), + .name = COMPOUND_STRING("G-Max Resonance"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20102,7 +20897,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { - .name = LONG_MOVE_NAME("G-Max Cuddle"), + .name = COMPOUND_STRING("G-Max Cuddle"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20117,7 +20912,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { - .name = LONG_MOVE_NAME("G-Max Replenish"), + .name = COMPOUND_STRING("G-Max Replenish"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20132,7 +20927,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { - .name = LONG_MOVE_NAME("G-Max Malodor"), + .name = COMPOUND_STRING("G-Max Malodor"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20147,7 +20942,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { - .name = LONG_MOVE_NAME("G-Max Meltdown"), + .name = COMPOUND_STRING("G-Max Meltdown"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20162,7 +20957,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DRUM_SOLO] = { - .name = LONG_MOVE_NAME("G-Max Drum Solo"), + .name = COMPOUND_STRING("G-Max Drum Solo"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20178,7 +20973,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FIREBALL] = { - .name = LONG_MOVE_NAME("G-Max Fireball"), + .name = COMPOUND_STRING("G-Max Fireball"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20194,7 +20989,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_HYDROSNIPE] = { - .name = LONG_MOVE_NAME("G-Max Hydrosnipe"), + .name = COMPOUND_STRING("G-Max Hydrosnipe"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20210,7 +21005,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { - .name = LONG_MOVE_NAME("G-Max Wind Rage"), + .name = COMPOUND_STRING("G-Max Wind Rage"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20225,7 +21020,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { - .name = LONG_MOVE_NAME("G-Max Gravitas"), + .name = COMPOUND_STRING("G-Max Gravitas"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20240,7 +21035,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { - .name = LONG_MOVE_NAME("G-Max Stonesurge"), + .name = COMPOUND_STRING("G-Max Stonesurge"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20255,7 +21050,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { - .name = LONG_MOVE_NAME("G-Max Volcalith"), + .name = COMPOUND_STRING("G-Max Volcalith"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20270,7 +21065,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { - .name = LONG_MOVE_NAME("G-Max Tartness"), + .name = COMPOUND_STRING("G-Max Tartness"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20285,7 +21080,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { - .name = LONG_MOVE_NAME("G-Max Sweetness"), + .name = COMPOUND_STRING("G-Max Sweetness"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20300,7 +21095,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { - .name = LONG_MOVE_NAME("G-Max Sandblast"), + .name = COMPOUND_STRING("G-Max Sandblast"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20315,7 +21110,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { - .name = LONG_MOVE_NAME("G-Max Stun Shock"), + .name = COMPOUND_STRING("G-Max Stun Shock"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20330,7 +21125,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { - .name = LONG_MOVE_NAME("G-Max Centiferno"), + .name = COMPOUND_STRING("G-Max Centiferno"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20345,7 +21140,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { - .name = LONG_MOVE_NAME("G-Max Smite"), + .name = COMPOUND_STRING("G-Max Smite"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20361,7 +21156,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { - .name = LONG_MOVE_NAME("G-Max Snooze"), + .name = COMPOUND_STRING("G-Max Snooze"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20376,7 +21171,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { - .name = LONG_MOVE_NAME("G-Max Finale"), + .name = COMPOUND_STRING("G-Max Finale"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20391,7 +21186,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { - .name = LONG_MOVE_NAME("G-Max Steelsurge"), + .name = COMPOUND_STRING("G-Max Steelsurge"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20406,7 +21201,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { - .name = LONG_MOVE_NAME("G-Max Depletion"), + .name = COMPOUND_STRING("G-Max Depletion"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20421,7 +21216,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { - .name = LONG_MOVE_NAME("G-Max One Blow"), + .name = COMPOUND_STRING("G-Max One Blow"), .description = sNullDescription, .effect = EFFECT_MAX_MOVE, .power = 10, @@ -20436,7 +21231,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RAPID_FLOW] = { - .name = LONG_MOVE_NAME("G-Max Rapid Flow"), + .name = COMPOUND_STRING("G-Max Rapid Flow"), .description = sNullDescription, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, diff --git a/src/data/party_menu.h b/src/data/party_menu.h index 25133d5a1be2..99488d4ebe9d 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -690,7 +690,7 @@ struct { const u8 *text; TaskFunc func; -} static const sCursorOptions[] = +} static const sCursorOptions[MENU_FIELD_MOVES] = { [MENU_SUMMARY] = {gText_Summary5, CursorCb_Summary}, [MENU_SWITCH] = {gText_Switch2, CursorCb_Switch}, @@ -719,20 +719,6 @@ struct [MENU_CATALOG_MOWER] = {gText_LawnMower, CursorCb_CatalogMower}, [MENU_CHANGE_FORM] = {gText_ChangeForm, CursorCb_ChangeForm}, [MENU_CHANGE_ABILITY] = {gText_ChangeAbility, CursorCb_ChangeAbility}, - [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gMovesInfo[MOVE_CUT].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gMovesInfo[MOVE_FLASH].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gMovesInfo[MOVE_ROCK_SMASH].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gMovesInfo[MOVE_STRENGTH].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gMovesInfo[MOVE_SURF].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gMovesInfo[MOVE_FLY].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gMovesInfo[MOVE_DIVE].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gMovesInfo[MOVE_WATERFALL].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gMovesInfo[MOVE_TELEPORT].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gMovesInfo[MOVE_DIG].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gMovesInfo[MOVE_SECRET_POWER].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gMovesInfo[MOVE_MILK_DRINK].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gMovesInfo[MOVE_SOFT_BOILED].name.moveName, CursorCb_FieldMove}, - [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gMovesInfo[MOVE_SWEET_SCENT].name.moveName, CursorCb_FieldMove}, }; static const u8 sPartyMenuAction_SummarySwitchCancel[] = {MENU_SUMMARY, MENU_SWITCH, MENU_CANCEL1}; diff --git a/src/party_menu.c b/src/party_menu.c index 4f143bfab510..19f50b7c88d7 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2732,8 +2732,14 @@ static u8 DisplaySelectionWindow(u8 windowType) for (i = 0; i < sPartyMenuInternal->numActions; i++) { + const u8 *text; u8 fontColorsId = (sPartyMenuInternal->actions[i] >= MENU_FIELD_MOVES) ? 4 : 3; - AddTextPrinterParameterized4(sPartyMenuInternal->windowId[0], FONT_NORMAL, cursorDimension, (i * 16) + 1, letterSpacing, 0, sFontColorTable[fontColorsId], 0, sCursorOptions[sPartyMenuInternal->actions[i]].text); + if (sPartyMenuInternal->actions[i] >= MENU_FIELD_MOVES) + text = gMovesInfo[sFieldMoves[sPartyMenuInternal->actions[i] - MENU_FIELD_MOVES]].name; + else + text = sCursorOptions[sPartyMenuInternal->actions[i]].text; + + AddTextPrinterParameterized4(sPartyMenuInternal->windowId[0], FONT_NORMAL, cursorDimension, (i * 16) + 1, letterSpacing, 0, sFontColorTable[fontColorsId], 0, text); } InitMenuInUpperLeftCorner(sPartyMenuInternal->windowId[0], sPartyMenuInternal->numActions, 0, TRUE); @@ -2939,11 +2945,17 @@ static void Task_HandleSelectionMenuInput(u8 taskId) case MENU_B_PRESSED: PlaySE(SE_SELECT); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[2]); - sCursorOptions[sPartyMenuInternal->actions[sPartyMenuInternal->numActions - 1]].func(taskId); + if (sPartyMenuInternal->actions[sPartyMenuInternal->numActions - 1] >= MENU_FIELD_MOVES) + CursorCb_FieldMove(taskId); + else + sCursorOptions[sPartyMenuInternal->actions[sPartyMenuInternal->numActions - 1]].func(taskId); break; default: PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[2]); - sCursorOptions[sPartyMenuInternal->actions[input]].func(taskId); + if (sPartyMenuInternal->actions[input] >= MENU_FIELD_MOVES) + CursorCb_FieldMove(taskId); + else + sCursorOptions[sPartyMenuInternal->actions[input]].func(taskId); break; } } diff --git a/src/pokemon.c b/src/pokemon.c index d5ab45c60343..46e696a4be00 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6467,8 +6467,5 @@ u16 GetSpeciesPreEvolution(u16 species) const u8 *GetMoveName(u16 moveId) { - if (IsZMove(moveId) || IsMaxMove(moveId)) - return gMovesInfo[moveId].name.longMoveName; - - return gMovesInfo[moveId].name.moveName; + return gMovesInfo[moveId].name; } From fc208d338d55e5a7be59362a097b6777c2984f37 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 29 Jan 2024 08:26:34 -0300 Subject: [PATCH 29/30] Updated Pursuit test after merge --- test/battle/move_effect/pursuit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/battle/move_effect/pursuit.c b/test/battle/move_effect/pursuit.c index 9d53f3057347..4cc1662413c0 100644 --- a/test/battle/move_effect/pursuit.c +++ b/test/battle/move_effect/pursuit.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_PURSUIT].effect == EFFECT_PURSUIT); + ASSUME(gMovesInfo[MOVE_PURSUIT].effect == EFFECT_PURSUIT); } SINGLE_BATTLE_TEST("Pursuited mon correctly switches out after it got hit and activated ability Tangling Hair") From 2c2f1a6ee2ba8b34dc1734f523e22af0ce59bae4 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 29 Jan 2024 08:35:37 -0300 Subject: [PATCH 30/30] Renamed the BATTLE_CATEGORY constants to DAMAGE_CATEGORY --- include/battle.h | 6 +- include/constants/pokemon.h | 6 +- include/test/battle.h | 4 +- src/battle_ai_main.c | 82 +- src/battle_ai_util.c | 50 +- src/battle_controller_player.c | 2 +- src/battle_dynamax.c | 2 +- src/battle_main.c | 2 +- src/battle_script_commands.c | 6 +- src/battle_util.c | 24 +- src/battle_z_move.c | 4 +- src/data/moves_info.h | 1870 ++++++++--------- test/battle/ability/beads_of_ruin.c | 2 +- test/battle/ability/contrary.c | 4 +- test/battle/ability/defeatist.c | 4 +- test/battle/ability/download.c | 4 +- test/battle/ability/dragons_maw.c | 4 +- test/battle/ability/earth_eater.c | 2 +- test/battle/ability/electromorphosis.c | 4 +- test/battle/ability/flower_gift.c | 4 +- test/battle/ability/ice_scales.c | 6 +- test/battle/ability/innards_out.c | 2 +- test/battle/ability/intimidate.c | 2 +- test/battle/ability/opportunist.c | 2 +- test/battle/ability/parental_bond.c | 4 +- test/battle/ability/prankster.c | 2 +- test/battle/ability/protosynthesis.c | 4 +- test/battle/ability/quark_drive.c | 4 +- test/battle/ability/rocky_payload.c | 4 +- test/battle/ability/stamina.c | 4 +- test/battle/ability/steelworker.c | 4 +- test/battle/ability/swarm.c | 2 +- test/battle/ability/sword_of_ruin.c | 2 +- test/battle/ability/tablets_of_ruin.c | 2 +- test/battle/ability/toxic_debris.c | 4 +- test/battle/ability/transistor.c | 4 +- test/battle/ability/vessel_of_ruin.c | 2 +- test/battle/ability/volt_absorb.c | 2 +- test/battle/ability/water_absorb.c | 2 +- test/battle/ability/weak_armor.c | 4 +- test/battle/ai.c | 64 +- test/battle/ai_check_viability.c | 4 +- test/battle/damage_formula.c | 6 +- test/battle/hold_effect/berserk_gene.c | 12 +- test/battle/hold_effect/jaboca_berry.c | 6 +- test/battle/hold_effect/kee_berry.c | 6 +- test/battle/hold_effect/maranga_berry.c | 6 +- test/battle/hold_effect/mirror_herb.c | 2 +- test/battle/hold_effect/rowap_berry.c | 6 +- test/battle/item_effect/increase_stat.c | 8 +- test/battle/move.c | 4 +- test/battle/move_effect/attack_down.c | 2 +- test/battle/move_effect/attack_up.c | 2 +- test/battle/move_effect/attack_up_user_ally.c | 6 +- test/battle/move_effect/belly_drum.c | 2 +- test/battle/move_effect/defense_down.c | 2 +- test/battle/move_effect/defense_up.c | 2 +- test/battle/move_effect/defog.c | 4 +- test/battle/move_effect/fling.c | 2 +- test/battle/move_effect/haze.c | 2 +- test/battle/move_effect/hit_escape.c | 2 +- test/battle/move_effect/make_it_rain.c | 2 +- test/battle/move_effect/photon_geyser.c | 2 +- test/battle/move_effect/pledge.c | 2 +- test/battle/move_effect/protect.c | 8 +- test/battle/move_effect/rage_fist.c | 2 +- test/battle/move_effect/reflect.c | 4 +- test/battle/move_effect/shell_trap.c | 6 +- test/battle/move_effect/special_attack_down.c | 2 +- test/battle/move_effect/special_attack_up_3.c | 2 +- test/battle/move_effect/stockpile.c | 8 +- test/battle/status1/burn.c | 2 +- test/battle/status1/frostbite.c | 2 +- test/battle/weather/sandstorm.c | 2 +- test/battle/weather/snow.c | 2 +- test/dynamax.c | 8 +- 76 files changed, 1176 insertions(+), 1176 deletions(-) diff --git a/include/battle.h b/include/battle.h index fe218282a9f5..1563819c7819 100644 --- a/include/battle.h +++ b/include/battle.h @@ -789,9 +789,9 @@ STATIC_ASSERT(sizeof(((struct BattleStruct *)0)->palaceFlags) * 8 >= MAX_BATTLER typeArg = gMovesInfo[move].type; \ } -#define IS_MOVE_PHYSICAL(move)(GetBattleMoveCategory(move) == BATTLE_CATEGORY_PHYSICAL) -#define IS_MOVE_SPECIAL(move)(GetBattleMoveCategory(move) == BATTLE_CATEGORY_SPECIAL) -#define IS_MOVE_STATUS(move)(gMovesInfo[move].category == BATTLE_CATEGORY_STATUS) +#define IS_MOVE_PHYSICAL(move)(GetBattleMoveCategory(move) == DAMAGE_CATEGORY_PHYSICAL) +#define IS_MOVE_SPECIAL(move)(GetBattleMoveCategory(move) == DAMAGE_CATEGORY_SPECIAL) +#define IS_MOVE_STATUS(move)(gMovesInfo[move].category == DAMAGE_CATEGORY_STATUS) #define IS_MOVE_RECOIL(move)(gMovesInfo[move].recoil > 0 || gMovesInfo[move].effect == EFFECT_RECOIL_IF_MISS) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index fd330b29f4ef..c801c4ea06fb 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -216,9 +216,9 @@ #define EV_ITEM_RAISE_LIMIT ((I_VITAMIN_EV_CAP >= GEN_8) ? MAX_PER_STAT_EVS : 100) // Move category defines. -#define BATTLE_CATEGORY_PHYSICAL 0 -#define BATTLE_CATEGORY_SPECIAL 1 -#define BATTLE_CATEGORY_STATUS 2 +#define DAMAGE_CATEGORY_PHYSICAL 0 +#define DAMAGE_CATEGORY_SPECIAL 1 +#define DAMAGE_CATEGORY_STATUS 2 // Growth rates #define GROWTH_MEDIUM_FAST 0 diff --git a/include/test/battle.h b/include/test/battle.h index c35b412a1887..b44186ed3d0c 100644 --- a/include/test/battle.h +++ b/include/test/battle.h @@ -129,7 +129,7 @@ * PARAMETRIZE { raiseAttack = FALSE; } * PARAMETRIZE { raiseAttack = TRUE; } * GIVEN { - * ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + * ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); * PLAYER(SPECIES_WOBBUFFET); * OPPONENT(SPECIES_WOBBUFFET); * } WHEN { @@ -176,7 +176,7 @@ * Pokémon we can observe the damage of a physical attack with and * without the burn. To document that this test assumes the attack is * physical we can use: - * ASSUME(gMovesInfo[MOVE_WHATEVER].category == BATTLE_CATEGORY_PHYSICAL); + * ASSUME(gMovesInfo[MOVE_WHATEVER].category == DAMAGE_CATEGORY_PHYSICAL); * * ASSUMPTIONS * Should be placed immediately after any #includes and contain any diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index bb9765ad4e06..ec8c96223c4b 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -1090,7 +1090,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_ATTACK_UP: case EFFECT_ATTACK_UP_2: case EFFECT_ATTACK_UP_USER_ALLY: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); break; case EFFECT_STUFF_CHEEKS: @@ -1107,7 +1107,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_SPECIAL_ATTACK_UP: case EFFECT_SPECIAL_ATTACK_UP_2: case EFFECT_SPECIAL_ATTACK_UP_3: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE(-10); break; case EFFECT_SPECIAL_DEFENSE_UP: @@ -1133,7 +1133,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-8); break; case EFFECT_BULK_UP: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_DEF)) ADJUST_SCORE(-8); @@ -1145,7 +1145,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-8); break; case EFFECT_DRAGON_DANCE: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-8); @@ -1153,7 +1153,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_COIL: if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ACC)) ADJUST_SCORE(-10); - else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-8); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_DEF)) ADJUST_SCORE(-6); @@ -1162,7 +1162,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (aiData->abilities[battlerAtk] != ABILITY_CONTRARY) { if (gBattleMons[battlerAtk].statStages[STAT_ATK] >= MAX_STAT_STAGE - && (gBattleMons[battlerAtk].statStages[STAT_ACC] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL))) + && (gBattleMons[battlerAtk].statStages[STAT_ACC] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL))) ADJUST_SCORE(-10); break; } @@ -1182,7 +1182,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_QUIVER_DANCE: case EFFECT_GEOMANCY: - if (gBattleMons[battlerAtk].statStages[STAT_SPATK] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) + if (gBattleMons[battlerAtk].statStages[STAT_SPATK] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-8); @@ -1190,7 +1190,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-6); break; case EFFECT_VICTORY_DANCE: - if (gBattleMons[battlerAtk].statStages[STAT_ATK] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + if (gBattleMons[battlerAtk].statStages[STAT_ATK] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-8); @@ -1198,7 +1198,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-6); break; case EFFECT_SHIFT_GEAR: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-8); @@ -1213,9 +1213,9 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) } else { - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); - else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) + else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE(-8); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-6); @@ -1253,9 +1253,9 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (aiData->abilities[battlerAtk] == ABILITY_PLUS || aiData->abilities[battlerAtk] == ABILITY_MINUS) { // same as growth, work up - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); - else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) + else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE(-8); break; } @@ -1268,8 +1268,8 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) { if (aiData->abilities[BATTLE_PARTNER(battlerAtk)] == ABILITY_PLUS || aiData->abilities[BATTLE_PARTNER(battlerAtk)] == ABILITY_MINUS) { - if ((!BattlerStatCanRise(BATTLE_PARTNER(battlerAtk), aiData->abilities[BATTLE_PARTNER(battlerAtk)], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) - && (!BattlerStatCanRise(BATTLE_PARTNER(battlerAtk), aiData->abilities[BATTLE_PARTNER(battlerAtk)], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL))) + if ((!BattlerStatCanRise(BATTLE_PARTNER(battlerAtk), aiData->abilities[BATTLE_PARTNER(battlerAtk)], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) + && (!BattlerStatCanRise(BATTLE_PARTNER(battlerAtk), aiData->abilities[BATTLE_PARTNER(battlerAtk)], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL))) ADJUST_SCORE(-10); } else if (aiData->abilities[battlerAtk] != ABILITY_PLUS && aiData->abilities[battlerAtk] != ABILITY_MINUS) @@ -1313,7 +1313,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) // stat lowering effects case EFFECT_ATTACK_DOWN: case EFFECT_ATTACK_DOWN_2: - if (!ShouldLowerStat(battlerDef, aiData->abilities[battlerDef], STAT_ATK)) //|| !HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) + if (!ShouldLowerStat(battlerDef, aiData->abilities[battlerDef], STAT_ATK)) //|| !HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (aiData->abilities[battlerDef] == ABILITY_HYPER_CUTTER) ADJUST_SCORE(-10); @@ -1332,7 +1332,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_SPECIAL_ATTACK_DOWN: case EFFECT_SPECIAL_ATTACK_DOWN_2: - if (!ShouldLowerStat(battlerDef, aiData->abilities[battlerDef], STAT_SPATK)) //|| !HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) + if (!ShouldLowerStat(battlerDef, aiData->abilities[battlerDef], STAT_SPATK)) //|| !HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE(-10); break; case EFFECT_SPECIAL_DEFENSE_DOWN: @@ -1415,7 +1415,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_MIRROR_COAT: if (IsBattlerIncapacitated(battlerDef, aiData->abilities[battlerDef]) || gBattleMons[battlerDef].status2 & (STATUS2_INFATUATION | STATUS2_CONFUSION)) ADJUST_SCORE(-1); - if (predictedMove == MOVE_NONE || GetBattleMoveCategory(predictedMove) == BATTLE_CATEGORY_STATUS + if (predictedMove == MOVE_NONE || GetBattleMoveCategory(predictedMove) == DAMAGE_CATEGORY_STATUS || DoesSubstituteBlockMove(battlerAtk, BATTLE_PARTNER(battlerDef), predictedMove)) ADJUST_SCORE(-10); break; @@ -1560,7 +1560,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) } else // regular curse { - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_DEF)) ADJUST_SCORE(-8); @@ -2192,7 +2192,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_POWER_TRICK: if (IS_TARGETING_PARTNER(battlerAtk, battlerDef)) ADJUST_SCORE(-10); - else if (gBattleMons[battlerAtk].defense >= gBattleMons[battlerAtk].attack && !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + else if (gBattleMons[battlerAtk].defense >= gBattleMons[battlerAtk].attack && !HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); break; case EFFECT_POWER_SWAP: // Don't use if attacker's stat stages are higher than opponents @@ -2824,7 +2824,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case ABILITY_LIGHTNING_ROD: if (moveType == TYPE_ELECTRIC - && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_SPECIAL) + && HasMoveWithCategory(battlerAtkPartner, DAMAGE_CATEGORY_SPECIAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_SPATK)) { RETURN_SCORE_PLUS(WEAK_EFFECT); @@ -2839,7 +2839,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; // handled in AI_HPAware case ABILITY_STORM_DRAIN: if (moveType == TYPE_WATER - && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_SPECIAL) + && HasMoveWithCategory(battlerAtkPartner, DAMAGE_CATEGORY_SPECIAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_SPATK)) { RETURN_SCORE_PLUS(WEAK_EFFECT); @@ -2862,7 +2862,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case ABILITY_SAP_SIPPER: if (moveType == TYPE_GRASS - && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_PHYSICAL) + && HasMoveWithCategory(battlerAtkPartner, DAMAGE_CATEGORY_PHYSICAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_ATK)) { RETURN_SCORE_PLUS(WEAK_EFFECT); @@ -2871,7 +2871,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case ABILITY_JUSTIFIED: if (moveType == TYPE_DARK && !IS_MOVE_STATUS(move) - && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_PHYSICAL) + && HasMoveWithCategory(battlerAtkPartner, DAMAGE_CATEGORY_PHYSICAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_ATK) && !CanIndexMoveFaintTarget(battlerAtk, battlerAtkPartner, AI_THINKING_STRUCT->movesetIndex, 1)) { @@ -2923,7 +2923,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_SWAGGER: if (gBattleMons[battlerAtkPartner].statStages[STAT_ATK] < MAX_STAT_STAGE - && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_PHYSICAL) + && HasMoveWithCategory(battlerAtkPartner, DAMAGE_CATEGORY_PHYSICAL) && (!AI_CanBeConfused(battlerAtkPartner, TRUE) || atkPartnerHoldEffect == HOLD_EFFECT_CURE_CONFUSION || atkPartnerHoldEffect == HOLD_EFFECT_CURE_STATUS)) @@ -2933,7 +2933,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_FLATTER: if (gBattleMons[battlerAtkPartner].statStages[STAT_SPATK] < MAX_STAT_STAGE - && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_SPECIAL) + && HasMoveWithCategory(battlerAtkPartner, DAMAGE_CATEGORY_SPECIAL) && (!AI_CanBeConfused(battlerAtkPartner, TRUE) || atkPartnerHoldEffect == HOLD_EFFECT_CURE_CONFUSION || atkPartnerHoldEffect == HOLD_EFFECT_CURE_STATUS)) @@ -2945,7 +2945,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (atkPartnerAbility == ABILITY_JUSTIFIED && moveType == TYPE_DARK && !IS_MOVE_STATUS(move) - && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_PHYSICAL) + && HasMoveWithCategory(battlerAtkPartner, DAMAGE_CATEGORY_PHYSICAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_ATK) && !CanIndexMoveFaintTarget(battlerAtk, battlerAtkPartner, AI_THINKING_STRUCT->movesetIndex, 0)) { @@ -3209,7 +3209,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) u32 i; // The AI should understand that while Dynamaxed, status moves function like Protect. - if (IsDynamaxed(battlerAtk) && gMovesInfo[move].category == BATTLE_CATEGORY_STATUS) + if (IsDynamaxed(battlerAtk) && gMovesInfo[move].category == DAMAGE_CATEGORY_STATUS) moveEffect = EFFECT_PROTECT; // check status move preference @@ -3223,8 +3223,8 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) // check burn / frostbite if (AI_THINKING_STRUCT->aiFlags[battlerAtk] & AI_FLAG_SMART_SWITCHING && AI_DATA->abilities[battlerAtk] == ABILITY_NATURAL_CURE) { - if ((gBattleMons[battlerAtk].status1 & STATUS1_BURN && HasOnlyMovesWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL, TRUE)) - || (gBattleMons[battlerAtk].status1 & STATUS1_FROSTBITE && HasOnlyMovesWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL, TRUE))) + if ((gBattleMons[battlerAtk].status1 & STATUS1_BURN && HasOnlyMovesWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL, TRUE)) + || (gBattleMons[battlerAtk].status1 & STATUS1_FROSTBITE && HasOnlyMovesWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL, TRUE))) ADJUST_SCORE(-20); // Force switch if all your attacking moves are physical and you have Natural Cure. } @@ -3572,7 +3572,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) if (CountUsablePartyMons(battlerAtk) == 0) break; // Can't switch - //if (switchAbility == ABILITY_INTIMIDATE && PartyHasMoveCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) + //if (switchAbility == ABILITY_INTIMIDATE && PartyHasMoveCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL)) //ADJUST_SCORE(7); } break; @@ -3795,7 +3795,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) case EFFECT_BELLY_DRUM: if (!CanTargetFaintAi(battlerDef, battlerAtk) && gBattleMons[battlerAtk].statStages[STAT_ATK] < MAX_STAT_STAGE - 2 - && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) + && HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL) && aiData->abilities[battlerAtk] != ABILITY_CONTRARY) ADJUST_SCORE(BEST_EFFECT); break; @@ -3917,7 +3917,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) case EFFECT_TAUNT: if (IS_MOVE_STATUS(predictedMove)) ADJUST_SCORE(GOOD_EFFECT); - else if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_STATUS)) + else if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_STATUS)) ADJUST_SCORE(DECENT_EFFECT); break; case EFFECT_TRICK: @@ -3928,11 +3928,11 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) ADJUST_SCORE(DECENT_EFFECT); // assume its beneficial break; case HOLD_EFFECT_CHOICE_BAND: - if (!HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) + if (!HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(DECENT_EFFECT); break; case HOLD_EFFECT_CHOICE_SPECS: - if (!HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) + if (!HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE(DECENT_EFFECT); break; case HOLD_EFFECT_TOXIC_ORB: @@ -4111,7 +4111,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) ADJUST_SCORE(WEAK_EFFECT); break; case EFFECT_TICKLE: - if (gBattleMons[battlerDef].statStages[STAT_DEF] > 4 && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) + if (gBattleMons[battlerDef].statStages[STAT_DEF] > 4 && HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL) && aiData->abilities[battlerDef] != ABILITY_CONTRARY && ShouldLowerDefense(battlerAtk, battlerDef, aiData->abilities[battlerDef])) ADJUST_SCORE(DECENT_EFFECT); else if (ShouldLowerAttack(battlerAtk, battlerDef, aiData->abilities[battlerDef])) @@ -4174,7 +4174,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) case EFFECT_POWER_TRICK: if (!(gStatuses3[battlerAtk] & STATUS3_POWER_TRICK) && gBattleMons[battlerAtk].defense > gBattleMons[battlerAtk].attack - && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + && HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(DECENT_EFFECT); break; case EFFECT_HEART_SWAP: @@ -4244,8 +4244,8 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) ADJUST_SCORE(WEAK_EFFECT); break; case EFFECT_WONDER_ROOM: - if ((HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL) && gBattleMons[battlerAtk].defense < gBattleMons[battlerAtk].spDefense) - || (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) && gBattleMons[battlerAtk].spDefense < gBattleMons[battlerAtk].defense)) + if ((HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL) && gBattleMons[battlerAtk].defense < gBattleMons[battlerAtk].spDefense) + || (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL) && gBattleMons[battlerAtk].spDefense < gBattleMons[battlerAtk].defense)) ADJUST_SCORE(DECENT_EFFECT); break; case EFFECT_GRAVITY: @@ -4374,13 +4374,13 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) case EFFECT_COUNTER: if ((!IsBattlerIncapacitated(battlerDef, aiData->abilities[battlerDef]) && predictedMove != MOVE_NONE) && (GetNoOfHitsToKOBattler(battlerDef, battlerAtk, predictedMoveSlot) >= 2) - && (GetBattleMoveCategory(predictedMove) == BATTLE_CATEGORY_PHYSICAL)) + && (GetBattleMoveCategory(predictedMove) == DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE(GOOD_EFFECT); break; case EFFECT_MIRROR_COAT: if ((!IsBattlerIncapacitated(battlerDef, aiData->abilities[battlerDef]) && predictedMove != MOVE_NONE) && (GetNoOfHitsToKOBattler(battlerDef, battlerAtk, predictedMoveSlot) >= 2) - && (GetBattleMoveCategory(predictedMove) == BATTLE_CATEGORY_SPECIAL)) + && (GetBattleMoveCategory(predictedMove) == DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE(GOOD_EFFECT); break; case EFFECT_SHORE_UP: diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index d535512529cd..f901d61b59c9 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -381,7 +381,7 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes gBattleStruct->zmove.active = TRUE; } else if (gMovesInfo[move].effect == EFFECT_PHOTON_GEYSER) - gBattleStruct->swapDamageCategory = (GetCategoryBasedOnStats(gBattlerAttacker) == BATTLE_CATEGORY_PHYSICAL); + gBattleStruct->swapDamageCategory = (GetCategoryBasedOnStats(gBattlerAttacker) == DAMAGE_CATEGORY_PHYSICAL); if (gMovesInfo[move].effect == EFFECT_NATURE_POWER) move = GetNaturePowerMove(); @@ -1494,7 +1494,7 @@ bool32 ShouldLowerAttack(u32 battlerAtk, u32 battlerDef, u32 defAbility) return FALSE; // Don't bother lowering stats if can kill enemy. if (gBattleMons[battlerDef].statStages[STAT_ATK] > 4 - && HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL) + && HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL) && defAbility != ABILITY_CONTRARY && defAbility != ABILITY_CLEAR_BODY && defAbility != ABILITY_WHITE_SMOKE @@ -1513,7 +1513,7 @@ bool32 ShouldLowerDefense(u32 battlerAtk, u32 battlerDef, u32 defAbility) return FALSE; // Don't bother lowering stats if can kill enemy. if (gBattleMons[battlerDef].statStages[STAT_DEF] > 4 - && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) + && HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL) && defAbility != ABILITY_CONTRARY && defAbility != ABILITY_CLEAR_BODY && defAbility != ABILITY_WHITE_SMOKE @@ -1549,7 +1549,7 @@ bool32 ShouldLowerSpAtk(u32 battlerAtk, u32 battlerDef, u32 defAbility) return FALSE; // Don't bother lowering stats if can kill enemy. if (gBattleMons[battlerDef].statStages[STAT_SPATK] > 4 - && HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) + && HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL) && defAbility != ABILITY_CONTRARY && defAbility != ABILITY_CLEAR_BODY && defAbility != ABILITY_FULL_METAL_BODY @@ -1567,7 +1567,7 @@ bool32 ShouldLowerSpDef(u32 battlerAtk, u32 battlerDef, u32 defAbility) return FALSE; // Don't bother lowering stats if can kill enemy. if (gBattleMons[battlerDef].statStages[STAT_SPDEF] > 4 - && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL) + && HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL) && defAbility != ABILITY_CONTRARY && defAbility != ABILITY_CLEAR_BODY && defAbility != ABILITY_FULL_METAL_BODY @@ -2212,11 +2212,11 @@ static bool32 AnyUsefulStatIsRaised(u32 battler) switch (statId) { case STAT_ATK: - if (HasMoveWithCategory(battler, BATTLE_CATEGORY_PHYSICAL)) + if (HasMoveWithCategory(battler, DAMAGE_CATEGORY_PHYSICAL)) return TRUE; break; case STAT_SPATK: - if (HasMoveWithCategory(battler, BATTLE_CATEGORY_SPECIAL)) + if (HasMoveWithCategory(battler, DAMAGE_CATEGORY_SPECIAL)) return TRUE; break; case STAT_SPEED: @@ -2541,8 +2541,8 @@ bool32 ShouldPoisonSelf(u32 battler, u32 ability) || ability == ABILITY_POISON_HEAL || ability == ABILITY_QUICK_FEET || ability == ABILITY_MAGIC_GUARD - || (ability == ABILITY_TOXIC_BOOST && HasMoveWithCategory(battler, BATTLE_CATEGORY_PHYSICAL)) - || (ability == ABILITY_GUTS && HasMoveWithCategory(battler, BATTLE_CATEGORY_PHYSICAL)) + || (ability == ABILITY_TOXIC_BOOST && HasMoveWithCategory(battler, DAMAGE_CATEGORY_PHYSICAL)) + || (ability == ABILITY_GUTS && HasMoveWithCategory(battler, DAMAGE_CATEGORY_PHYSICAL)) || HasMoveEffect(battler, EFFECT_FACADE) || HasMoveEffect(battler, EFFECT_PSYCHO_SHIFT))) return TRUE; // battler can be poisoned and has move/ability that synergizes with being poisoned @@ -2640,8 +2640,8 @@ bool32 ShouldBurnSelf(u32 battler, u32 ability) ability == ABILITY_QUICK_FEET || ability == ABILITY_HEATPROOF || ability == ABILITY_MAGIC_GUARD - || (ability == ABILITY_FLARE_BOOST && HasMoveWithCategory(battler, BATTLE_CATEGORY_SPECIAL)) - || (ability == ABILITY_GUTS && HasMoveWithCategory(battler, BATTLE_CATEGORY_PHYSICAL)) + || (ability == ABILITY_FLARE_BOOST && HasMoveWithCategory(battler, DAMAGE_CATEGORY_SPECIAL)) + || (ability == ABILITY_GUTS && HasMoveWithCategory(battler, DAMAGE_CATEGORY_PHYSICAL)) || HasMoveEffect(battler, EFFECT_FACADE) || HasMoveEffect(battler, EFFECT_PSYCHO_SHIFT))) return TRUE; @@ -2871,13 +2871,13 @@ bool32 ShouldSetScreen(u32 battlerAtk, u32 battlerDef, u32 moveEffect) break; case EFFECT_REFLECT: // Use only if the player has a physical move and AI doesn't already have Reflect itself active. - if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL) + if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL) && !(gSideStatuses[atkSide] & SIDE_STATUS_REFLECT)) return TRUE; break; case EFFECT_LIGHT_SCREEN: // Use only if the player has a special move and AI doesn't already have Light Screen itself active. - if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) + if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL) && !(gSideStatuses[atkSide] & SIDE_STATUS_LIGHTSCREEN)) return TRUE; break; @@ -3308,11 +3308,11 @@ void IncreaseStatUpScore(u32 battlerAtk, u32 battlerDef, u32 statId, s32 *score) switch (statId) { case STAT_CHANGE_ATK: - if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) && shouldSetUp) + if (HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL) && shouldSetUp) ADJUST_SCORE_PTR(DECENT_EFFECT); break; case STAT_CHANGE_DEF: - if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL) || !HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) + if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL) || !HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE_PTR(DECENT_EFFECT); break; case STAT_CHANGE_SPEED: @@ -3320,19 +3320,19 @@ void IncreaseStatUpScore(u32 battlerAtk, u32 battlerDef, u32 statId, s32 *score) ADJUST_SCORE_PTR(DECENT_EFFECT); break; case STAT_CHANGE_SPATK: - if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL) && shouldSetUp) + if (HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL) && shouldSetUp) ADJUST_SCORE_PTR(DECENT_EFFECT); break; case STAT_CHANGE_SPDEF: - if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) || !HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) + if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL) || !HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE_PTR(DECENT_EFFECT); break; case STAT_CHANGE_ATK_2: - if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) && shouldSetUp) + if (HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL) && shouldSetUp) ADJUST_SCORE_PTR(GOOD_EFFECT); break; case STAT_CHANGE_DEF_2: - if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL) || !HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) + if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL) || !HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL)) ADJUST_SCORE_PTR(GOOD_EFFECT); break; case STAT_CHANGE_SPEED_2: @@ -3340,11 +3340,11 @@ void IncreaseStatUpScore(u32 battlerAtk, u32 battlerDef, u32 statId, s32 *score) ADJUST_SCORE_PTR(GOOD_EFFECT); break; case STAT_CHANGE_SPATK_2: - if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL) && shouldSetUp) + if (HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL) && shouldSetUp) ADJUST_SCORE_PTR(GOOD_EFFECT); break; case STAT_CHANGE_SPDEF_2: - if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) || !HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) + if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL) || !HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL)) ADJUST_SCORE_PTR(GOOD_EFFECT); break; case STAT_CHANGE_ACC: @@ -3392,7 +3392,7 @@ void IncreaseBurnScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score) if (AI_CanBurn(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef], BATTLE_PARTNER(battlerAtk), move, AI_DATA->partnerMove)) { ADJUST_SCORE_PTR(WEAK_EFFECT); // burning is good - if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) + if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL)) { if (CanTargetFaintAi(battlerDef, battlerAtk)) ADJUST_SCORE_PTR(DECENT_EFFECT); // burning the target to stay alive is cool @@ -3473,7 +3473,7 @@ void IncreaseFrostbiteScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score if (AI_CanGiveFrostbite(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef], BATTLE_PARTNER(battlerAtk), move, AI_DATA->partnerMove)) { ADJUST_SCORE_PTR(WEAK_EFFECT); // frostbite is good - if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) + if (HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_SPECIAL)) { if (CanTargetFaintAi(battlerDef, battlerAtk)) ADJUST_SCORE_PTR(DECENT_EFFECT); // frostbiting the target to stay alive is cool @@ -3550,9 +3550,9 @@ bool32 AI_ShouldCopyStatChanges(u32 battlerAtk, u32 battlerDef) switch (i) { case STAT_ATK: - return (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)); + return (HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_PHYSICAL)); case STAT_SPATK: - return (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)); + return (HasMoveWithCategory(battlerAtk, DAMAGE_CATEGORY_SPECIAL)); case STAT_ACC: case STAT_EVASION: case STAT_SPEED: diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index b0cc14dc838e..e70784e153e0 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -705,7 +705,7 @@ static void HandleInputChooseMove(u32 battler) QueueZMove(battler, chosenMove); gBattleStruct->zmove.viewing = FALSE; - if (gMovesInfo[moveInfo->moves[gMoveSelectionCursor[battler]]].category != BATTLE_CATEGORY_STATUS) + if (gMovesInfo[moveInfo->moves[gMoveSelectionCursor[battler]]].category != DAMAGE_CATEGORY_STATUS) moveTarget = MOVE_TARGET_SELECTED; //damaging z moves always have selected target } diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 4a7938f185cd..eeec22f73422 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -322,7 +322,7 @@ u16 GetMaxMove(u16 battlerId, u16 baseMove) { return MOVE_STRUGGLE; } - else if (gMovesInfo[baseMove].category == BATTLE_CATEGORY_STATUS) + else if (gMovesInfo[baseMove].category == DAMAGE_CATEGORY_STATUS) { move = MOVE_MAX_GUARD; } diff --git a/src/battle_main.c b/src/battle_main.c index d53eb7c4fa31..f3366ac19e6f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4711,7 +4711,7 @@ s8 GetMovePriority(u32 battler, u16 move) priority = gMovesInfo[move].priority; // Max Guard check - if (gBattleStruct->dynamax.usingMaxMove[battler] && gMovesInfo[move].category == BATTLE_CATEGORY_STATUS) + if (gBattleStruct->dynamax.usingMaxMove[battler] && gMovesInfo[move].category == DAMAGE_CATEGORY_STATUS) return gMovesInfo[MOVE_MAX_GUARD].priority; if (ability == ABILITY_GALE_WINGS diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index cd6470dddd80..a0cb1ce71182 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5695,7 +5695,7 @@ static void Cmd_moveend(void) break; case MOVEEND_NUM_HITS: if (gBattlerAttacker != gBattlerTarget - && gMovesInfo[gCurrentMove].category != BATTLE_CATEGORY_STATUS + && gMovesInfo[gCurrentMove].category != DAMAGE_CATEGORY_STATUS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED) { @@ -15612,7 +15612,7 @@ bool32 IsMoveAffectedByParentalBond(u32 move, u32 battler) { if (move != MOVE_NONE && move != MOVE_UNAVAILABLE && move != MOVE_STRUGGLE && !gMovesInfo[move].parentalBondBanned - && gMovesInfo[move].category != BATTLE_CATEGORY_STATUS + && gMovesInfo[move].category != DAMAGE_CATEGORY_STATUS && gMovesInfo[move].strikeCount < 2) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) @@ -16571,6 +16571,6 @@ void BS_AllySwitchFailChance(void) void BS_SetPhotonGeyserCategory(void) { NATIVE_ARGS(); - gBattleStruct->swapDamageCategory = (GetCategoryBasedOnStats(gBattlerAttacker) == BATTLE_CATEGORY_PHYSICAL); + gBattleStruct->swapDamageCategory = (GetCategoryBasedOnStats(gBattlerAttacker) == DAMAGE_CATEGORY_PHYSICAL); gBattlescriptCurrInstr = cmd->nextInstr; } diff --git a/src/battle_util.c b/src/battle_util.c index dbf74cd9733c..c506a83a9e89 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3541,7 +3541,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) gBattleStruct->zmove.used[BATTLE_PARTNER(gBattlerAttacker)] = TRUE; //if 1v1 double, set partner used flag as well gBattleScripting.battler = gBattlerAttacker; - if (gBattleStruct->zmove.activeCategory == BATTLE_CATEGORY_STATUS) + if (gBattleStruct->zmove.activeCategory == DAMAGE_CATEGORY_STATUS) { gBattleStruct->zmove.effect = gMovesInfo[gBattleStruct->zmove.baseMoves[gBattlerAttacker]].zMove.effect; BattleScriptPushCursor(); @@ -6709,11 +6709,11 @@ static u8 ItemEffectMoveEnd(u32 battler, u16 holdEffect) break; case HOLD_EFFECT_KEE_BERRY: // consume and boost defense if used physical move if (B_BERRIES_INSTANT >= GEN_4) - effect = DamagedStatBoostBerryEffect(battler, STAT_DEF, BATTLE_CATEGORY_PHYSICAL); + effect = DamagedStatBoostBerryEffect(battler, STAT_DEF, DAMAGE_CATEGORY_PHYSICAL); break; case HOLD_EFFECT_MARANGA_BERRY: // consume and boost sp. defense if used special move if (B_BERRIES_INSTANT >= GEN_4) - effect = DamagedStatBoostBerryEffect(battler, STAT_SPDEF, BATTLE_CATEGORY_SPECIAL); + effect = DamagedStatBoostBerryEffect(battler, STAT_SPDEF, DAMAGE_CATEGORY_SPECIAL); break; case HOLD_EFFECT_RANDOM_STAT_UP: if (B_BERRIES_INSTANT >= GEN_4) @@ -7693,10 +7693,10 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) } break; case HOLD_EFFECT_KEE_BERRY: // consume and boost defense if used physical move - effect = DamagedStatBoostBerryEffect(battler, STAT_DEF, BATTLE_CATEGORY_PHYSICAL); + effect = DamagedStatBoostBerryEffect(battler, STAT_DEF, DAMAGE_CATEGORY_PHYSICAL); break; case HOLD_EFFECT_MARANGA_BERRY: // consume and boost sp. defense if used special move - effect = DamagedStatBoostBerryEffect(battler, STAT_SPDEF, BATTLE_CATEGORY_SPECIAL); + effect = DamagedStatBoostBerryEffect(battler, STAT_SPDEF, DAMAGE_CATEGORY_SPECIAL); break; case HOLD_EFFECT_STICKY_BARB: if (TARGET_TURN_DAMAGED @@ -9827,7 +9827,7 @@ static inline uq4_12_t CalcTypeEffectivenessMultiplierInternal(u32 move, u32 mov if (recordAbilities && (illusionSpecies = GetIllusionMonSpecies(battlerDef))) TryNoticeIllusionInTypeEffectiveness(move, moveType, battlerAtk, battlerDef, modifier, illusionSpecies); - if (gMovesInfo[move].category == BATTLE_CATEGORY_STATUS && move != MOVE_THUNDER_WAVE) + if (gMovesInfo[move].category == DAMAGE_CATEGORY_STATUS && move != MOVE_THUNDER_WAVE) { modifier = UQ_4_12(1.0); if (B_GLARE_GHOST < GEN_4 && move == MOVE_GLARE && IS_BATTLER_OF_TYPE(battlerDef, TYPE_GHOST)) @@ -10467,16 +10467,16 @@ u8 GetBattleMoveCategory(u32 moveId) if (gBattleStruct != NULL && IsMaxMove(moveId)) // TODO: Might be buggy depending on when this is called. return gBattleStruct->dynamax.activeCategory; if (gBattleStruct != NULL && gBattleStruct->swapDamageCategory) // Photon Geyser, Shell Side Arm, Light That Burns the Sky - return BATTLE_CATEGORY_PHYSICAL; + return DAMAGE_CATEGORY_PHYSICAL; if (B_PHYSICAL_SPECIAL_SPLIT >= GEN_4) return gMovesInfo[moveId].category; if (IS_MOVE_STATUS(moveId)) - return BATTLE_CATEGORY_STATUS; + return DAMAGE_CATEGORY_STATUS; else if (gMovesInfo[moveId].type < TYPE_MYSTERY) - return BATTLE_CATEGORY_PHYSICAL; + return DAMAGE_CATEGORY_PHYSICAL; else - return BATTLE_CATEGORY_SPECIAL; + return DAMAGE_CATEGORY_SPECIAL; } static bool32 TryRemoveScreens(u32 battler) @@ -10530,9 +10530,9 @@ u8 GetCategoryBasedOnStats(u32 battler) spAttack = spAttack / gStatStageRatios[gBattleMons[battler].statStages[STAT_SPATK]][1]; if (spAttack >= attack) - return BATTLE_CATEGORY_SPECIAL; + return DAMAGE_CATEGORY_SPECIAL; else - return BATTLE_CATEGORY_PHYSICAL; + return DAMAGE_CATEGORY_PHYSICAL; } static u32 GetFlingPowerFromItemId(u32 itemId) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 50ba075ea117..8cb379d8926c 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -519,7 +519,7 @@ static void ZMoveSelectionDisplayPower(u16 move, u16 zMove) if (zMove >= MOVE_CATASTROPIKA) power = gMovesInfo[zMove].power; - if (gMovesInfo[move].category != BATTLE_CATEGORY_STATUS) + if (gMovesInfo[move].category != DAMAGE_CATEGORY_STATUS) { txtPtr = StringCopy(gDisplayedStringBattle, sText_PowerColon); ConvertIntToDecimalStringN(txtPtr, power, STR_CONV_MODE_LEFT_ALIGN, 3); @@ -680,7 +680,7 @@ static bool32 AreStatsMaxed(u8 battler, u8 n) u16 GetZMovePower(u16 move) { - if (gMovesInfo[move].category == BATTLE_CATEGORY_STATUS) + if (gMovesInfo[move].category == DAMAGE_CATEGORY_STATUS) return 0; if (gMovesInfo[move].effect == EFFECT_OHKO) return 180; diff --git a/src/data/moves_info.h b/src/data/moves_info.h index 5282694f55cf..3aec5e12e75d 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -123,7 +123,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .mirrorMoveBanned = TRUE, .sketchBanned = TRUE, @@ -142,7 +142,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS == GEN_4, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, @@ -165,7 +165,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -186,7 +186,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -207,7 +207,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, @@ -229,7 +229,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, @@ -251,7 +251,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PAYDAY, }), @@ -274,7 +274,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -305,7 +305,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -332,7 +332,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -359,7 +359,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -380,7 +380,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -401,7 +401,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -423,7 +423,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -447,7 +447,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, @@ -470,7 +470,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, @@ -492,7 +492,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), .damagesAirborneDoubleDamage = TRUE, .windMove = TRUE, @@ -515,7 +515,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, @@ -536,7 +536,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = -6, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .windMove = TRUE, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -563,7 +563,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .gravityBanned = TRUE, @@ -589,7 +589,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -614,7 +614,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, @@ -642,7 +642,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .accuracy = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, @@ -663,7 +663,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = TRUE, @@ -691,7 +691,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, @@ -713,7 +713,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, @@ -740,7 +740,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .gravityBanned = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, @@ -762,7 +762,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .sheerForceBoost = TRUE, @@ -789,7 +789,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, @@ -811,7 +811,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -837,7 +837,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, @@ -858,7 +858,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, @@ -879,7 +879,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -906,7 +906,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -927,7 +927,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -955,7 +955,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, @@ -980,7 +980,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -1001,7 +1001,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 20, .target = MOVE_TARGET_RANDOM, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .instructBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -1028,7 +1028,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -1049,7 +1049,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, @@ -1071,7 +1071,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_POISON, @@ -1096,7 +1096,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .strikeCount = 2, @@ -1123,7 +1123,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -1143,7 +1143,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, @@ -1165,7 +1165,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -1192,7 +1192,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .soundMove = TRUE, @@ -1216,7 +1216,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = -6, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -1243,7 +1243,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -1267,7 +1267,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -1291,7 +1291,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = 20, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, @@ -1318,7 +1318,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -1345,7 +1345,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = B_UPDATED_MOVE_DATA >= GEN_4 ? MOVE_EFFECT_SP_DEF_MINUS_1 : MOVE_EFFECT_DEF_MINUS_1, @@ -1370,7 +1370,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BURN, @@ -1395,7 +1395,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BURN, @@ -1420,7 +1420,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1444,7 +1444,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -1464,7 +1464,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -1484,7 +1484,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = B_UPDATED_MOVE_DATA >= GEN_4 ? MOVE_TARGET_FOES_AND_ALLY : MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .damagesUnderwater = TRUE, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, @@ -1510,7 +1510,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ // The following effect is also relevant in battle_pike.c @@ -1541,7 +1541,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -1567,7 +1567,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CONFUSION, @@ -1592,7 +1592,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPD_MINUS_1, @@ -1617,7 +1617,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ATK_MINUS_1, @@ -1640,7 +1640,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, @@ -1665,7 +1665,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, @@ -1686,7 +1686,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, @@ -1708,7 +1708,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .recoil = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, @@ -1729,7 +1729,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -1750,7 +1750,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_DEPENDS, .priority = -5, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .meFirstBanned = TRUE, @@ -1776,7 +1776,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, @@ -1798,7 +1798,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -1819,7 +1819,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_4 ? 25 : 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, @@ -1839,7 +1839,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_4 ? 15 : 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, @@ -1861,7 +1861,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, @@ -1883,7 +1883,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1908,7 +1908,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, @@ -1929,7 +1929,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -1952,7 +1952,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -1975,7 +1975,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -1998,7 +1998,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -2027,7 +2027,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 20, .target = MOVE_TARGET_RANDOM, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = TRUE, .danceMove = TRUE, .instructBanned = TRUE, @@ -2054,7 +2054,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, @@ -2076,7 +2076,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), .argument = 40, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, @@ -2098,7 +2098,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, @@ -2122,7 +2122,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PARALYSIS, @@ -2147,7 +2147,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PARALYSIS, @@ -2172,7 +2172,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, @@ -2194,7 +2194,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .damagesAirborne = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -2220,7 +2220,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_ROCK_THROW, @@ -2240,7 +2240,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, @@ -2263,7 +2263,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, @@ -2285,7 +2285,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -2311,7 +2311,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, @@ -2333,7 +2333,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CONFUSION, @@ -2358,7 +2358,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, @@ -2383,7 +2383,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, @@ -2405,7 +2405,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2429,7 +2429,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2453,7 +2453,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, @@ -2474,7 +2474,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_COOL, @@ -2495,7 +2495,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = -6, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2518,7 +2518,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -2538,7 +2538,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresSubstitute = TRUE, .mimicBanned = TRUE, @@ -2567,7 +2567,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -2591,7 +2591,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2621,7 +2621,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .accuracy = 0, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2646,7 +2646,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2670,7 +2670,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 10 : 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2694,7 +2694,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, @@ -2716,7 +2716,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, @@ -2738,7 +2738,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2762,7 +2762,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2786,7 +2786,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2810,7 +2810,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2834,7 +2834,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -2858,7 +2858,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2882,7 +2882,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2906,7 +2906,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = B_UPDATED_MOVE_DATA >= GEN_4 ? 1 : 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -2930,7 +2930,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .mimicBanned = TRUE, @@ -2959,7 +2959,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_2 }, .mimicBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, @@ -2987,7 +2987,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -3008,7 +3008,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -3029,7 +3029,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -3055,7 +3055,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_POISON, @@ -3080,7 +3080,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_POISON, @@ -3105,7 +3105,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLINCH, @@ -3130,7 +3130,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BURN, @@ -3155,7 +3155,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, #if B_UPDATED_MOVE_DATA >= GEN_4 .sheerForceBoost = TRUE, @@ -3183,7 +3183,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 15 : 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -3208,7 +3208,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -3228,7 +3228,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -3252,7 +3252,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -3272,7 +3272,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -3298,7 +3298,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3322,7 +3322,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, @@ -3344,7 +3344,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .ignoresProtect = TRUE, @@ -3375,7 +3375,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .gravityBanned = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, @@ -3403,7 +3403,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, @@ -3425,7 +3425,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .healingMove = B_HEAL_BLOCKING >= GEN_6, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, @@ -3452,7 +3452,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = B_UPDATED_MOVE_DATA >= GEN_5 ? MOVE_TARGET_BOTH : MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, @@ -3474,7 +3474,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -3495,7 +3495,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_7 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, @@ -3518,7 +3518,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, @@ -3540,7 +3540,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .criticalHitStage = B_UPDATED_MOVE_DATA >= GEN_3 ? 1 : 0, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, @@ -3571,7 +3571,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3600,7 +3600,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPD_MINUS_1, @@ -3625,7 +3625,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -3652,7 +3652,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -3675,7 +3675,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, @@ -3697,7 +3697,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -3717,7 +3717,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_3 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3741,7 +3741,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -3766,7 +3766,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -3787,7 +3787,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -3808,7 +3808,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -3829,7 +3829,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .strikeCount = 2, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -3850,7 +3850,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -3875,7 +3875,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLINCH, @@ -3900,7 +3900,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -3927,7 +3927,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -3951,7 +3951,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -3975,7 +3975,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_TRI_ATTACK, @@ -4000,7 +4000,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, @@ -4023,7 +4023,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, @@ -4045,7 +4045,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4081,7 +4081,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .meFirstBanned = TRUE, .mimicBanned = TRUE, @@ -4107,7 +4107,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -4139,7 +4139,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, @@ -4161,7 +4161,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 25 : 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .meFirstBanned = TRUE, @@ -4190,7 +4190,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, @@ -4213,7 +4213,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, @@ -4234,7 +4234,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS <= GEN_3, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, @@ -4256,7 +4256,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .thawsUser = TRUE, @@ -4283,7 +4283,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .sheerForceBoost = TRUE, .soundMove = TRUE, @@ -4311,7 +4311,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_CURSE }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -4335,7 +4335,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -4356,7 +4356,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, @@ -4381,7 +4381,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .windMove = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, @@ -4402,7 +4402,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = B_UPDATED_MOVE_DATA >= GEN_6 ? MOVE_TARGET_BOTH : MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -4425,7 +4425,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_COOL, @@ -4446,7 +4446,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, @@ -4469,7 +4469,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, @@ -4494,7 +4494,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 4 : 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .protectionMove = TRUE, .metronomeBanned = TRUE, @@ -4519,7 +4519,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, @@ -4541,7 +4541,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, @@ -4561,7 +4561,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, @@ -4582,7 +4582,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -4604,7 +4604,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4628,7 +4628,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -4654,7 +4654,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ACC_MINUS_1, @@ -4679,7 +4679,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -4705,7 +4705,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4731,7 +4731,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -4757,7 +4757,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, @@ -4780,7 +4780,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_FOLLOW_ME }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -4807,7 +4807,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -4832,7 +4832,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -4858,7 +4858,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER, .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 4 : 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4885,7 +4885,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_BONE_RUSH, @@ -4905,7 +4905,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, @@ -4926,7 +4926,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 15, .target = MOVE_TARGET_RANDOM, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .instructBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -4952,7 +4952,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4976,7 +4976,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_4 ? 10 : 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, @@ -4998,7 +4998,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 4 : 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5025,7 +5025,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, @@ -5047,7 +5047,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .instructBanned = TRUE, .parentalBondBanned = TRUE, @@ -5068,7 +5068,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -5089,7 +5089,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, @@ -5111,7 +5111,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -5136,7 +5136,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -5168,7 +5168,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, @@ -5190,7 +5190,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -5217,7 +5217,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, @@ -5240,7 +5240,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .ignoresSubstitute = TRUE, @@ -5263,7 +5263,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5293,7 +5293,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5319,7 +5319,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -5340,7 +5340,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -5361,7 +5361,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -5382,7 +5382,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5406,7 +5406,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, @@ -5427,7 +5427,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -5453,7 +5453,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, @@ -5475,7 +5475,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -5502,7 +5502,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, @@ -5523,7 +5523,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -5549,7 +5549,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5572,7 +5572,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .encoreBanned = TRUE, @@ -5596,7 +5596,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, @@ -5618,7 +5618,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RAPIDSPIN, @@ -5651,7 +5651,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, @@ -5673,7 +5673,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -5699,7 +5699,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -5726,7 +5726,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = -1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_COOL, @@ -5747,7 +5747,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -5772,7 +5772,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -5797,7 +5797,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -5822,7 +5822,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -5843,7 +5843,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, @@ -5864,7 +5864,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .damagesAirborneDoubleDamage = TRUE, .windMove = TRUE, @@ -5891,7 +5891,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5914,7 +5914,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5941,7 +5941,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -5972,7 +5972,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_DEPENDS, .priority = -5, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -5996,7 +5996,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -6021,7 +6021,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 2 : 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, @@ -6042,7 +6042,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = B_UPDATED_MOVE_DATA < GEN_4, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -6069,7 +6069,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -6101,7 +6101,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, @@ -6123,7 +6123,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -6149,7 +6149,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .damagesUnderwater = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, @@ -6173,7 +6173,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -6194,7 +6194,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .accuracy = 100, .pp = 10, .target = MOVE_TARGET_SELECTED, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLINCH, @@ -6223,7 +6223,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_RANDOM, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .sleepTalkBanned = TRUE, @@ -6251,7 +6251,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_4 ? 20 : 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -6275,7 +6275,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -6296,7 +6296,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -6321,7 +6321,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -6347,7 +6347,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6370,7 +6370,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -6392,7 +6392,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -6414,7 +6414,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, @@ -6436,7 +6436,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESTORE_REPLACEMENT_HP }, .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -6457,7 +6457,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -6478,7 +6478,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = -3, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = TRUE, .punchingMove = TRUE, @@ -6507,7 +6507,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = STATUS1_PARALYSIS, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -6532,7 +6532,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = B_UPDATED_MOVE_DATA >= GEN_6 ? 2 : 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6558,7 +6558,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, @@ -6585,7 +6585,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -6609,7 +6609,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -6632,7 +6632,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = B_UPDATED_MOVE_DATA >= GEN_4 ? MOVE_TARGET_ALLY : MOVE_TARGET_USER, .priority = 5, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -6659,7 +6659,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -6683,7 +6683,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -6707,7 +6707,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .healingMove = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -6732,7 +6732,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, @@ -6761,7 +6761,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -6786,7 +6786,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ATK_DEF_DOWN, @@ -6811,7 +6811,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_DEPENDS, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6834,7 +6834,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -6856,7 +6856,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = -4, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -6877,7 +6877,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, @@ -6898,7 +6898,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -6920,7 +6920,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_KNOCK_OFF, @@ -6944,7 +6944,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .parentalBondBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, @@ -6966,7 +6966,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -6986,7 +6986,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, @@ -7008,7 +7008,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -7034,7 +7034,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -7058,7 +7058,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_FOLLOW_ME }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -7082,7 +7082,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_DEPENDS, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresSubstitute = TRUE, .forcePressure = TRUE, @@ -7108,7 +7108,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SECRET_POWER, @@ -7133,7 +7133,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -7159,7 +7159,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -7180,7 +7180,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -7204,7 +7204,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -7228,7 +7228,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, @@ -7253,7 +7253,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -7279,7 +7279,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .danceMove = TRUE, @@ -7302,7 +7302,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .danceMove = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_4, @@ -7326,7 +7326,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -7352,7 +7352,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -7376,7 +7376,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ballisticMove = TRUE, .instructBanned = TRUE, @@ -7400,7 +7400,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, @@ -7427,7 +7427,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -7452,7 +7452,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, @@ -7474,7 +7474,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -7501,7 +7501,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -7527,7 +7527,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, @@ -7551,7 +7551,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, @@ -7575,7 +7575,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -7603,7 +7603,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, @@ -7630,7 +7630,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, @@ -7651,7 +7651,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -7675,7 +7675,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, @@ -7698,7 +7698,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .windMove = TRUE, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, @@ -7720,7 +7720,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = B_UPDATED_MOVE_DATA < GEN_4, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, @@ -7745,7 +7745,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -7768,7 +7768,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 15 : 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPD_MINUS_1, @@ -7793,7 +7793,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = B_EXTRAPOLATED_MOVE_FLAGS, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -7820,7 +7820,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -7844,7 +7844,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -7868,7 +7868,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, @@ -7890,7 +7890,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -7914,7 +7914,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -7934,7 +7934,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CONFUSION, @@ -7959,7 +7959,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, @@ -7981,7 +7981,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -8007,7 +8007,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .damagesAirborne = TRUE, @@ -8030,7 +8030,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), @@ -8053,7 +8053,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8073,7 +8073,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -8099,7 +8099,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -8120,7 +8120,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, @@ -8142,7 +8142,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8162,7 +8162,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8186,7 +8186,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, @@ -8209,7 +8209,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8234,7 +8234,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, @@ -8255,7 +8255,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, @@ -8280,7 +8280,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8304,7 +8304,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .sheerForceBoost = TRUE, @@ -8335,7 +8335,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPD_MINUS_1, @@ -8361,7 +8361,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -8387,7 +8387,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 25 : 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -8416,7 +8416,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, #if B_UPDATED_MOVE_DATA >= GEN_4 .sheerForceBoost = TRUE, @@ -8444,7 +8444,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -8464,7 +8464,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8488,7 +8488,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8513,7 +8513,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, @@ -8535,7 +8535,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, @@ -8560,7 +8560,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ballisticMove = B_UPDATED_MOVE_FLAGS >= GEN_6, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -8581,7 +8581,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8601,7 +8601,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .pulseMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -8627,7 +8627,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, @@ -8649,7 +8649,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, @@ -8673,7 +8673,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -8698,7 +8698,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8722,7 +8722,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -8745,7 +8745,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = STATUS1_SLEEP, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -8770,7 +8770,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -8796,7 +8796,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, @@ -8816,7 +8816,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .healingMove = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -8840,7 +8840,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -8860,7 +8860,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -8880,7 +8880,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 2, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ignoresProtect = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_6, .metronomeBanned = TRUE, @@ -8906,7 +8906,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BUG_BITE, @@ -8930,7 +8930,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 15 : 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .snatchAffected = TRUE, .windMove = TRUE, @@ -8955,7 +8955,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8979,7 +8979,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .meFirstBanned = TRUE, .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -8998,7 +8998,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -9017,7 +9017,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_DEF_SPDEF_DOWN, @@ -9042,7 +9042,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -9063,7 +9063,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -9084,7 +9084,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -9106,7 +9106,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -9127,7 +9127,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -9148,7 +9148,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, @@ -9169,7 +9169,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -9189,7 +9189,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, @@ -9210,7 +9210,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -9234,7 +9234,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, @@ -9256,7 +9256,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -9280,7 +9280,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -9311,7 +9311,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9341,7 +9341,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, @@ -9363,7 +9363,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, @@ -9385,7 +9385,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_SMART, @@ -9406,7 +9406,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -9427,7 +9427,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -9447,7 +9447,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, @@ -9468,7 +9468,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9494,7 +9494,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, @@ -9516,7 +9516,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -9540,7 +9540,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -9566,7 +9566,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = STATUS1_BURN, .makesContact = TRUE, .sheerForceBoost = TRUE, @@ -9594,7 +9594,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -9620,7 +9620,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .pulseMove = TRUE, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, @@ -9642,7 +9642,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -9666,7 +9666,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -9692,7 +9692,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .pulseMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -9719,7 +9719,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, @@ -9741,7 +9741,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -9762,7 +9762,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, @@ -9783,7 +9783,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 15 : 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .slicingMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -9809,7 +9809,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, @@ -9831,7 +9831,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -9858,7 +9858,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .pulseMove = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, @@ -9879,7 +9879,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -9906,7 +9906,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -9924,7 +9924,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, @@ -9947,7 +9947,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -9967,7 +9967,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -9993,7 +9993,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -10020,7 +10020,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -10041,7 +10041,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -10067,7 +10067,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -10089,7 +10089,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, @@ -10114,7 +10114,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -10138,7 +10138,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, @@ -10158,7 +10158,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = -4, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_COOL, @@ -10179,7 +10179,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -10200,7 +10200,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -10221,7 +10221,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = STATUS1_PARALYSIS, .makesContact = TRUE, .sheerForceBoost = TRUE, @@ -10253,7 +10253,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -10284,7 +10284,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = STATUS1_BURN, .makesContact = TRUE, .sheerForceBoost = TRUE, @@ -10316,7 +10316,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, @@ -10337,7 +10337,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -10364,7 +10364,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .slicingMove = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, @@ -10385,7 +10385,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -10411,7 +10411,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ACC_MINUS_1, @@ -10436,7 +10436,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, @@ -10461,7 +10461,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -10487,7 +10487,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, //.ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -10510,7 +10510,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_ALL_BATTLERS, .priority = -7, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, @@ -10532,7 +10532,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, @@ -10556,7 +10556,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PARALYSIS, @@ -10579,7 +10579,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BURN, @@ -10604,7 +10604,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, .self = TRUE, @@ -10628,7 +10628,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -10647,7 +10647,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, @@ -10673,7 +10673,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .slicingMove = TRUE, @@ -10700,7 +10700,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_POISON, @@ -10725,7 +10725,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -10751,7 +10751,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, @@ -10773,7 +10773,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -10793,7 +10793,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, @@ -10815,7 +10815,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -10840,7 +10840,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = TRUE, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, @@ -10862,7 +10862,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -10902,7 +10902,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = HOLD_EFFECT_PLATE, .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, @@ -10921,7 +10921,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BUG_BITE, @@ -10945,7 +10945,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_PLUS_1, @@ -10972,7 +10972,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -10993,7 +10993,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -11015,7 +11015,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_ATTACK_ORDER, @@ -11035,7 +11035,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -11059,7 +11059,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -11085,7 +11085,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -11106,7 +11106,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, @@ -11128,7 +11128,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, @@ -11153,7 +11153,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -11171,7 +11171,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -11194,7 +11194,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -11215,7 +11215,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, }), @@ -11238,7 +11238,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .sketchBanned = (B_SKETCH_BANS >= GEN_9), @@ -11261,7 +11261,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_2, @@ -11286,7 +11286,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = B_EXTRAPOLATED_MOVE_FLAGS, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -11311,7 +11311,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .twoTurnMove = TRUE, .ignoresProtect = TRUE, @@ -11341,7 +11341,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -11365,7 +11365,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .argument = TRUE, // Protects the whole side. .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, @@ -11392,7 +11392,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, @@ -11414,7 +11414,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, @@ -11436,7 +11436,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = B_UPDATED_MOVE_DATA >= GEN_6 ? 0 : -7, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, @@ -11456,7 +11456,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11476,7 +11476,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = STATUS1_PSN_ANY, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -11497,7 +11497,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -11521,7 +11521,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = B_UPDATED_MOVE_DATA >= GEN_6 ? 2 : 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .powderMove = TRUE, .ignoresProtect = TRUE, @@ -11548,7 +11548,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .gravityBanned = TRUE, @@ -11571,7 +11571,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = B_UPDATED_MOVE_DATA >= GEN_6 ? 0 : -7, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -11593,7 +11593,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .damagesAirborne = TRUE, .skyBattleBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -11616,7 +11616,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .alwaysCriticalHit = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, @@ -11638,7 +11638,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLAME_BURST, .self = TRUE, @@ -11662,7 +11662,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_POISON, @@ -11687,7 +11687,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, @@ -11710,7 +11710,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_7, .skyBattleBanned = TRUE, @@ -11733,7 +11733,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 10 : 15, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -11753,7 +11753,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, @@ -11774,7 +11774,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, @@ -11796,7 +11796,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -11823,7 +11823,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -11847,7 +11847,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -11873,7 +11873,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -11899,7 +11899,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, @@ -11920,7 +11920,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, @@ -11942,7 +11942,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, @@ -11964,7 +11964,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -11989,7 +11989,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -12014,7 +12014,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, @@ -12034,7 +12034,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, @@ -12056,7 +12056,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CLEAR_SMOG, }), @@ -12079,7 +12079,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -12099,7 +12099,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_USER, .priority = 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .argument = TRUE, // Protects the whole side. .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, @@ -12126,7 +12126,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_USER, .priority = B_UPDATED_MOVE_DATA >= GEN_7 ? 2 : 1, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -12149,7 +12149,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -12175,7 +12175,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -12199,7 +12199,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .mirrorMoveBanned = TRUE, @@ -12224,7 +12224,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = STATUS1_ANY, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, @@ -12245,7 +12245,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .gravityBanned = TRUE, @@ -12271,7 +12271,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -12293,7 +12293,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = -6, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -12316,7 +12316,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_INCINERATE, }), @@ -12339,7 +12339,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, @@ -12361,7 +12361,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, @@ -12382,7 +12382,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -12405,7 +12405,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -12426,7 +12426,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .parentalBondBanned = TRUE, .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, @@ -12448,7 +12448,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, .ignoresSubstitute = TRUE, @@ -12474,7 +12474,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BURN, @@ -12499,7 +12499,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -12520,7 +12520,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -12541,7 +12541,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, @@ -12560,7 +12560,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -12580,7 +12580,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, @@ -12605,7 +12605,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -12629,7 +12629,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .alwaysCriticalHit = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -12648,7 +12648,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = -6, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -12671,7 +12671,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -12695,7 +12695,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPD_MINUS_1, @@ -12721,7 +12721,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, @@ -12743,7 +12743,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -12764,7 +12764,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, @@ -12786,7 +12786,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -12810,7 +12810,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, @@ -12830,7 +12830,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 15 : 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, .slicingMove = TRUE, @@ -12853,7 +12853,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .slicingMove = TRUE, @@ -12878,7 +12878,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, @@ -12900,7 +12900,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, //.windMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -12926,7 +12926,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = TRUE, @@ -12953,7 +12953,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -12977,7 +12977,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ACC_MINUS_1, @@ -13000,7 +13000,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -13020,7 +13020,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -13041,7 +13041,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .damagesAirborne = TRUE, @@ -13069,7 +13069,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -13090,7 +13090,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, @@ -13110,7 +13110,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -13136,7 +13136,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = HOLD_EFFECT_DRIVE, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, @@ -13158,7 +13158,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = STATUS1_SLEEP, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -13187,7 +13187,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .slicingMove = TRUE, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, @@ -13209,7 +13209,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPD_MINUS_1, @@ -13234,7 +13234,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -13260,7 +13260,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BURN, @@ -13285,7 +13285,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .danceMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -13312,7 +13312,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -13341,7 +13341,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -13370,7 +13370,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -13398,7 +13398,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLINCH, @@ -13423,7 +13423,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -13449,7 +13449,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .thawsUser = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -13470,7 +13470,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -13490,7 +13490,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = TYPE_FLYING, .makesContact = TRUE, .minimizeDoubleDamage = TRUE, @@ -13515,7 +13515,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .argument = TRUE, // Protects the whole side. .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, @@ -13544,7 +13544,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -13572,7 +13572,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13596,7 +13596,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13621,7 +13621,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -13640,7 +13640,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .ignoresProtect = TRUE, .makesContact = TRUE, @@ -13670,7 +13670,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .argument = TYPE_GHOST, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, @@ -13693,7 +13693,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -13717,7 +13717,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 25, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 1, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13740,7 +13740,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .healingMove = B_HEAL_BLOCKING >= GEN_6, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -13761,7 +13761,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .argument = TYPE_GRASS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, @@ -13784,7 +13784,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .windMove = TRUE, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -13805,7 +13805,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, @@ -13830,7 +13830,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, @@ -13852,7 +13852,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESTORE_REPLACEMENT_HP }, .magicCoatAffected = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -13876,7 +13876,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -13896,7 +13896,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP .makesContact = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, @@ -13919,7 +13919,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .argument = TRUE, // Protects the whole side. .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, @@ -13944,7 +13944,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13967,7 +13967,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13991,7 +13991,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -14015,7 +14015,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_COOL, @@ -14036,7 +14036,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -14062,7 +14062,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .windMove = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -14083,7 +14083,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, @@ -14108,7 +14108,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, @@ -14130,7 +14130,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -14153,7 +14153,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .protectionMove = TRUE, .ignoresProtect = TRUE, @@ -14181,7 +14181,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -14205,7 +14205,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, @@ -14229,7 +14229,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -14255,7 +14255,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, .metronomeBanned = TRUE, @@ -14280,7 +14280,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -14306,7 +14306,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = B_UPDATED_MOVE_DATA >= GEN_7 ? BATTLE_CATEGORY_SPECIAL : BATTLE_CATEGORY_PHYSICAL, + .category = B_UPDATED_MOVE_DATA >= GEN_7 ? DAMAGE_CATEGORY_SPECIAL : DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -14326,7 +14326,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, @@ -14351,7 +14351,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .protectionMove = TRUE, .ignoresProtect = TRUE, @@ -14378,7 +14378,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -14402,7 +14402,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, @@ -14424,7 +14424,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, @@ -14446,7 +14446,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .powderMove = TRUE, .magicCoatAffected = TRUE, @@ -14469,7 +14469,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, @@ -14494,7 +14494,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -14519,7 +14519,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -14542,7 +14542,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -14566,7 +14566,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -14586,7 +14586,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -14615,7 +14615,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -14644,7 +14644,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, @@ -14666,7 +14666,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -14690,7 +14690,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -14711,7 +14711,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, @@ -14735,7 +14735,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -14761,7 +14761,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP .healingMove = B_HEAL_BLOCKING >= GEN_6, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, @@ -14783,7 +14783,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .damagesAirborne = TRUE, .ignoreTypeIfFlyingAndUngrounded = TRUE, .metronomeBanned = TRUE, @@ -14810,7 +14810,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .skyBattleBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -14835,7 +14835,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -14857,7 +14857,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -14874,7 +14874,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .pulseMove = TRUE, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, @@ -14896,7 +14896,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -14915,7 +14915,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -14939,7 +14939,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -14969,7 +14969,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healingMove = TRUE, .snatchAffected = TRUE, @@ -14994,7 +14994,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 2, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, @@ -15015,7 +15015,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .protectionMove = TRUE, .ignoresProtect = TRUE, @@ -15042,7 +15042,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PREVENT_ESCAPE, @@ -15067,7 +15067,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, @@ -15089,7 +15089,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = STATUS1_BURN, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -15117,7 +15117,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -15143,7 +15143,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .argument = MOVE_EFFECT_FLORAL_HEALING, .mirrorMoveBanned = TRUE, @@ -15168,7 +15168,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -15189,7 +15189,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, @@ -15212,7 +15212,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .slicingMove = TRUE, @@ -15237,7 +15237,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -15257,7 +15257,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 3, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .mirrorMoveBanned = TRUE, @@ -15283,7 +15283,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, @@ -15305,7 +15305,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 30, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -15329,7 +15329,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -15354,7 +15354,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -15380,7 +15380,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ballisticMove = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -15401,7 +15401,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -15427,7 +15427,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -15450,7 +15450,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -15476,7 +15476,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -15502,7 +15502,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -15523,7 +15523,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .thawsUser = TRUE, .argument = TYPE_FIRE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -15549,7 +15549,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, @@ -15571,7 +15571,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, @@ -15592,7 +15592,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .mirrorMoveBanned = TRUE, .healingMove = TRUE, @@ -15616,7 +15616,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .danceMove = TRUE, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -15637,7 +15637,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .zMove = { .powerOverride = 140 }, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CORE_ENFORCER, @@ -15661,7 +15661,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -15687,7 +15687,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -15712,7 +15712,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = -3, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .mirrorMoveBanned = TRUE, .ballisticMove = TRUE, .meFirstBanned = TRUE, @@ -15740,7 +15740,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -15766,7 +15766,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, @@ -15787,7 +15787,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -15808,7 +15808,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -15832,7 +15832,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = -3, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -15859,7 +15859,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_TWO_DOWN, @@ -15884,7 +15884,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, @@ -15906,7 +15906,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, @@ -15928,7 +15928,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_DEF_MINUS_1, @@ -15953,7 +15953,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -15974,7 +15974,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -16000,7 +16000,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, .self = TRUE, @@ -16024,7 +16024,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .ignoresSubstitute = TRUE, .makesContact = TRUE, .metronomeBanned = TRUE, @@ -16050,7 +16050,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, @@ -16073,7 +16073,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, @@ -16095,7 +16095,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, @@ -16118,7 +16118,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLINCH, @@ -16143,7 +16143,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -16164,7 +16164,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = HOLD_EFFECT_MEMORY, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, @@ -16186,7 +16186,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -16207,7 +16207,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, @@ -16230,7 +16230,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, @@ -16252,7 +16252,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 2, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .sheerForceBoost = B_UPDATED_MOVE_DATA >= GEN_8, @@ -16279,7 +16279,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -16302,7 +16302,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, @@ -16327,7 +16327,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -16349,7 +16349,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 20 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 50, // restores 100% HP instead of 50% HP .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -16369,7 +16369,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 20 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -16391,7 +16391,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 20 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .thawsUser = TRUE, @@ -16415,7 +16415,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -16433,7 +16433,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -16451,7 +16451,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .magicCoatAffected = TRUE, .metronomeBanned = TRUE, @@ -16470,7 +16470,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -16488,7 +16488,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 5 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -16506,7 +16506,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -16525,7 +16525,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -16555,7 +16555,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -16585,7 +16585,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -16605,7 +16605,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -16630,7 +16630,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -16653,7 +16653,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -16676,7 +16676,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -16697,7 +16697,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .argument = TYPE_PSYCHIC, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -16720,7 +16720,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .strikeCount = 2, .parentalBondBanned = TRUE, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, @@ -16742,7 +16742,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -16765,7 +16765,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, @@ -16785,7 +16785,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_TOUGH, @@ -16806,7 +16806,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, @@ -16828,7 +16828,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -16849,7 +16849,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -16875,7 +16875,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -16898,7 +16898,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -16921,7 +16921,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -16947,7 +16947,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -16973,7 +16973,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, .ballisticMove = TRUE, @@ -17001,7 +17001,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .metronomeBanned = TRUE, @@ -17027,7 +17027,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -17052,7 +17052,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17079,7 +17079,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -17106,7 +17106,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, @@ -17128,7 +17128,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .metronomeBanned = TRUE, @@ -17151,7 +17151,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17177,7 +17177,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17203,7 +17203,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -17230,7 +17230,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17256,7 +17256,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -17282,7 +17282,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -17307,7 +17307,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, @@ -17329,7 +17329,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .instructBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17355,7 +17355,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_RECHARGE, @@ -17380,7 +17380,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -17401,7 +17401,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -17421,7 +17421,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_FAIL, // Remove a field terrain if there is one and hit, otherwise fail. .skyBattleBanned = TRUE, @@ -17444,7 +17444,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MOVE_EFFECT_SCALE_SHOT, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, @@ -17465,7 +17465,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .twoTurnMove = TRUE, .instructBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17492,7 +17492,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_POISON, @@ -17517,7 +17517,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, @@ -17537,7 +17537,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, @@ -17559,7 +17559,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, @@ -17579,7 +17579,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .pulseMove = TRUE, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, @@ -17600,7 +17600,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17626,7 +17626,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_BURN, @@ -17652,7 +17652,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_COOL, @@ -17673,7 +17673,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, @@ -17693,7 +17693,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 40, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .magicCoatAffected = TRUE, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -17714,7 +17714,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -17737,7 +17737,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, @@ -17758,7 +17758,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, @@ -17780,7 +17780,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, @@ -17802,7 +17802,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17828,7 +17828,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -17853,7 +17853,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .alwaysCriticalHit = TRUE, .punchingMove = TRUE, @@ -17877,7 +17877,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .alwaysCriticalHit = TRUE, .punchingMove = TRUE, @@ -17902,7 +17902,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_WRAP, @@ -17926,7 +17926,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, @@ -17951,7 +17951,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -17977,7 +17977,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLINCH, @@ -18002,7 +18002,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -18029,7 +18029,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -18050,7 +18050,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, @@ -18071,7 +18071,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -18094,7 +18094,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18116,7 +18116,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18139,7 +18139,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -18159,7 +18159,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .slicingMove = TRUE, @@ -18182,7 +18182,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .metronomeBanned = TRUE, @@ -18205,7 +18205,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_PLUS_1, @@ -18227,7 +18227,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_RANDOM, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_THRASH, @@ -18249,7 +18249,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -18267,7 +18267,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, }, [MOVE_MOUNTAIN_GALE] = @@ -18283,7 +18283,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLINCH, @@ -18304,7 +18304,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .danceMove = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -18324,7 +18324,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18346,7 +18346,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .argument = STATUS1_PSN_ANY, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18369,7 +18369,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SPD_PLUS_1, @@ -18391,7 +18391,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ATK_MINUS_1, @@ -18412,7 +18412,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -18432,7 +18432,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .criticalHitStage = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_DEF_MINUS_1, @@ -18457,7 +18457,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = STATUS1_ANY, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18479,7 +18479,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .slicingMove = TRUE, @@ -18502,7 +18502,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 10 : 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18524,7 +18524,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 10 : 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18546,7 +18546,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 10 : 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18568,7 +18568,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -18588,7 +18588,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -18607,7 +18607,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, // Only since it isn't implemented yet .forcePressure = TRUE, }, @@ -18625,7 +18625,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -18645,7 +18645,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18667,7 +18667,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, // Only since it isn't implemented yet }, @@ -18684,7 +18684,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_2, @@ -18705,7 +18705,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -18724,7 +18724,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -18744,7 +18744,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .magicCoatAffected = TRUE, .metronomeBanned = TRUE, }, @@ -18762,7 +18762,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18784,7 +18784,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .metronomeBanned = TRUE, @@ -18804,7 +18804,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_HIT, // Remove the active field terrain if there is one. .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -18823,7 +18823,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, // Only since it isn't implemented yet }, @@ -18841,7 +18841,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -18862,7 +18862,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -18880,7 +18880,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, }, @@ -18898,7 +18898,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .makesContact = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -18924,7 +18924,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -18943,7 +18943,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -18964,7 +18964,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -18982,7 +18982,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .alwaysCriticalHit = TRUE, }, @@ -18999,7 +18999,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -19023,7 +19023,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .danceMove = TRUE, @@ -19047,7 +19047,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -19065,7 +19065,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PAYDAY, @@ -19089,7 +19089,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -19106,7 +19106,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -19124,7 +19124,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -19142,7 +19142,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -19162,7 +19162,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -19182,7 +19182,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -19201,7 +19201,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -19221,7 +19221,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .makesContact = TRUE, .metronomeBanned = TRUE, @@ -19244,7 +19244,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -19267,7 +19267,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_ATK_MINUS_1, @@ -19288,7 +19288,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresProtect = TRUE, .metronomeBanned = TRUE, @@ -19307,7 +19307,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .strikeCount = 2, .metronomeBanned = TRUE, }, @@ -19325,7 +19325,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, @@ -19344,7 +19344,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_DEF_SPDEF_DOWN, @@ -19365,7 +19365,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .healingMove = TRUE, @@ -19384,7 +19384,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .argument = TYPE_ELECTRIC, @@ -19407,7 +19407,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .cantUseTwice = TRUE, }, @@ -19424,7 +19424,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -19444,7 +19444,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .slicingMove = TRUE, }, @@ -19459,7 +19459,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -19488,7 +19488,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -19517,7 +19517,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -19546,7 +19546,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -19575,7 +19575,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -19606,7 +19606,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -19624,7 +19624,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .thawsUser = TRUE, }, @@ -19641,7 +19641,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .cantUseTwice = TRUE, }, @@ -19658,7 +19658,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .thawsUser = TRUE, .metronomeBanned = TRUE, .healingMove = B_EXTRAPOLATED_MOVE_FLAGS, @@ -19681,7 +19681,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .ballisticMove = TRUE, .metronomeBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -19704,7 +19704,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .criticalHitStage = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, }, @@ -19721,7 +19721,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_ATK_PLUS_1, @@ -19743,7 +19743,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, // MOVE_TARGET_BOTH if used by Terapagos-Stellar .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .assistBanned = TRUE, .copycatBanned = TRUE, .mimicBanned = TRUE, @@ -19763,7 +19763,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, }, [MOVE_BURNING_BULWARK] = @@ -19779,7 +19779,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .protectionMove = TRUE, .ignoresProtect = TRUE, @@ -19800,7 +19800,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 1, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, }, [MOVE_MIGHTY_CLEAVE] = @@ -19814,7 +19814,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresProtect = TRUE, .slicingMove = TRUE, @@ -19833,7 +19833,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .strikeCount = 2, .slicingMove = TRUE, }, @@ -19849,7 +19849,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -19866,7 +19866,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_ALLY, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .ignoresSubstitute = TRUE, }, @@ -19883,7 +19883,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .soundMove = TRUE, .sheerForceBoost = TRUE, .ignoresSubstitute = TRUE, @@ -19907,7 +19907,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -19924,7 +19924,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -19941,7 +19941,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -19963,7 +19963,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 3, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -19980,7 +19980,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_TOXIC, .chance = 50, @@ -19999,7 +19999,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, //determined from move type + .category = DAMAGE_CATEGORY_PHYSICAL, //determined from move type }, [MOVE_ALL_OUT_PUMMELING] = { @@ -20012,7 +20012,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_SUPERSONIC_SKYSTRIKE] = { @@ -20025,7 +20025,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_ACID_DOWNPOUR] = { @@ -20038,7 +20038,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_TECTONIC_RAGE] = { @@ -20051,7 +20051,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_CONTINENTAL_CRUSH] = @@ -20065,7 +20065,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_SAVAGE_SPIN_OUT] = { @@ -20078,7 +20078,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_NEVER_ENDING_NIGHTMARE] = { @@ -20091,7 +20091,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_CORKSCREW_CRASH] = { @@ -20104,7 +20104,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_INFERNO_OVERDRIVE] = { @@ -20117,7 +20117,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_HYDRO_VORTEX] = { @@ -20130,7 +20130,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_BLOOM_DOOM] = { @@ -20143,7 +20143,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_GIGAVOLT_HAVOC] = { @@ -20156,7 +20156,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_SHATTERED_PSYCHE] = { @@ -20169,7 +20169,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_SUBZERO_SLAMMER] = { @@ -20182,7 +20182,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_DEVASTATING_DRAKE] = { @@ -20195,7 +20195,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_BLACK_HOLE_ECLIPSE] = { @@ -20208,7 +20208,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_TWINKLE_TACKLE] = { @@ -20221,7 +20221,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_CATASTROPIKA] = { @@ -20234,7 +20234,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_10000000_VOLT_THUNDERBOLT] = { @@ -20248,7 +20248,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, }, [MOVE_STOKED_SPARKSURFER] = { @@ -20261,7 +20261,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 100, @@ -20278,7 +20278,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_USER, .priority = 0, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, }, [MOVE_PULVERIZING_PANCAKE] = { @@ -20291,7 +20291,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_GENESIS_SUPERNOVA] = { @@ -20304,7 +20304,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .argument = ARG_SET_PSYCHIC_TERRAIN, // Set Psychic Terrain. If there's a different field terrain active, overwrite it. }, [MOVE_SINISTER_ARROW_RAID] = @@ -20318,7 +20318,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_MALICIOUS_MOONSAULT] = { @@ -20331,7 +20331,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_OCEANIC_OPERETTA] = { @@ -20344,7 +20344,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, }, [MOVE_SPLINTERED_STORMSHARDS] = { @@ -20357,7 +20357,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = ARG_TRY_REMOVE_TERRAIN_HIT, // Remove the active field terrain if there is one. }, [MOVE_LETS_SNUGGLE_FOREVER] = @@ -20371,7 +20371,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_CLANGOROUS_SOULBLAZE] = { @@ -20384,7 +20384,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_BOTH, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .additionalEffects = ADDITIONAL_EFFECTS({ @@ -20404,7 +20404,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, }, [MOVE_SEARING_SUNRAZE_SMASH] = { @@ -20417,7 +20417,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { @@ -20430,7 +20430,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { @@ -20443,7 +20443,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_SPECIAL, + .category = DAMAGE_CATEGORY_SPECIAL, }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { @@ -20456,7 +20456,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, }, [MOVE_MAX_GUARD] = @@ -20470,7 +20470,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_USER, .priority = 4, - .category = BATTLE_CATEGORY_STATUS, + .category = DAMAGE_CATEGORY_STATUS, .protectionMove = TRUE, }, @@ -20485,7 +20485,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SUN, }, @@ -20500,7 +20500,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SP_ATK, }, @@ -20515,7 +20515,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_ELECTRIC_TERRAIN, }, @@ -20530,7 +20530,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SPEED, }, @@ -20545,7 +20545,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_ATTACK, }, @@ -20560,7 +20560,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_DEFENSE, }, @@ -20575,7 +20575,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_HAIL, }, @@ -20590,7 +20590,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SP_ATK, }, @@ -20605,7 +20605,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAIN, }, @@ -20620,7 +20620,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SPEED, }, @@ -20635,7 +20635,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_MISTY_TERRAIN, }, @@ -20650,7 +20650,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_ATTACK, }, @@ -20665,7 +20665,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_PSYCHIC_TERRAIN, }, @@ -20680,7 +20680,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SANDSTORM, }, @@ -20695,7 +20695,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SP_DEF, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -20711,7 +20711,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SP_DEF, }, @@ -20726,7 +20726,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_GRASSY_TERRAIN, }, @@ -20741,7 +20741,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_DEFENSE, }, @@ -20756,7 +20756,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_VINE_LASH, }, @@ -20771,7 +20771,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_WILDFIRE, }, @@ -20786,7 +20786,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CANNONADE, }, @@ -20801,7 +20801,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_EFFECT_SPORE_FOES, }, @@ -20816,7 +20816,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_PARALYZE_FOES, }, @@ -20831,7 +20831,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CONFUSE_FOES_PAY_DAY, }, @@ -20846,7 +20846,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CRIT_PLUS, }, @@ -20861,7 +20861,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_MEAN_LOOK, }, @@ -20876,7 +20876,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SPEED_2_FOES, }, @@ -20891,7 +20891,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_AURORA_VEIL, }, @@ -20906,7 +20906,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_INFATUATE_FOES, }, @@ -20921,7 +20921,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RECYCLE_BERRIES, }, @@ -20936,7 +20936,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_POISON_FOES, }, @@ -20951,7 +20951,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, }, @@ -20966,7 +20966,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, }, @@ -20982,7 +20982,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, }, @@ -20998,7 +20998,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, }, @@ -21014,7 +21014,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_DEFOG, }, @@ -21029,7 +21029,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_GRAVITY, }, @@ -21044,7 +21044,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_STEALTH_ROCK, }, @@ -21059,7 +21059,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_VOLCALITH, }, @@ -21074,7 +21074,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_EVASIVENESS_FOES, }, @@ -21089,7 +21089,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_AROMATHERAPY, }, @@ -21104,7 +21104,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SANDBLAST_FOES, }, @@ -21119,7 +21119,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_POISON_PARALYZE_FOES, }, @@ -21134,7 +21134,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIRE_SPIN_FOES, }, @@ -21149,7 +21149,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CONFUSE_FOES, }, @@ -21165,7 +21165,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_YAWN_FOE, }, @@ -21180,7 +21180,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_HEAL_TEAM, }, @@ -21195,7 +21195,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_STEELSURGE, }, @@ -21210,7 +21210,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SPITE, }, @@ -21225,7 +21225,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_BYPASS_PROTECT, //EFFECT TODO }, @@ -21240,7 +21240,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .category = BATTLE_CATEGORY_PHYSICAL, + .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_BYPASS_PROTECT, //EFFECT TODO }, diff --git a/test/battle/ability/beads_of_ruin.c b/test/battle/ability/beads_of_ruin.c index 807808db7ef5..1b2eb2a522c4 100644 --- a/test/battle/ability/beads_of_ruin.c +++ b/test/battle/ability/beads_of_ruin.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == DAMAGE_CATEGORY_SPECIAL); ASSUME(gMovesInfo[MOVE_ROLE_PLAY].effect == EFFECT_ROLE_PLAY); } diff --git a/test/battle/ability/contrary.c b/test/battle/ability/contrary.c index ee9014d38c33..19c52a776d36 100644 --- a/test/battle/ability/contrary.c +++ b/test/battle/ability/contrary.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Contrary raises Attack when Intimidated in a single battle", s16 damage) @@ -83,7 +83,7 @@ SINGLE_BATTLE_TEST("Contrary raises stats after using a move which would normall PARAMETRIZE { ability = ABILITY_TANGLED_FEET; } GIVEN { ASSUME(MoveHasMoveEffectSelf(MOVE_OVERHEAT, MOVE_EFFECT_SP_ATK_TWO_DOWN) == TRUE); - ASSUME(gMovesInfo[MOVE_OVERHEAT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_OVERHEAT].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_SPINDA) { Ability(ability); } } WHEN { diff --git a/test/battle/ability/defeatist.c b/test/battle/ability/defeatist.c index 2fac6ecd2988..d2866d6f300b 100644 --- a/test/battle/ability/defeatist.c +++ b/test/battle/ability/defeatist.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_ECHOED_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ECHOED_VOICE].category == DAMAGE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Defeatist halves Attack when HP <= 50%", s16 damage) diff --git a/test/battle/ability/download.c b/test/battle/ability/download.c index 1b2856ce133f..8c41ea0d0359 100644 --- a/test/battle/ability/download.c +++ b/test/battle/ability/download.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_TRI_ATTACK].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TRI_ATTACK].category == DAMAGE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Download raises Attack if player has lower Def than Sp. Def", s16 damage) diff --git a/test/battle/ability/dragons_maw.c b/test/battle/ability/dragons_maw.c index fe1198e1eccc..401c4244c86a 100644 --- a/test/battle/ability/dragons_maw.c +++ b/test/battle/ability/dragons_maw.c @@ -17,8 +17,8 @@ SINGLE_BATTLE_TEST("Dragon's Maw increases Dragon-type move damage", s16 damage) ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_DRAGON); ASSUME(gMovesInfo[MOVE_DRAGON_CLAW].type == TYPE_DRAGON); ASSUME(gMovesInfo[MOVE_DRAGON_BREATH].type == TYPE_DRAGON); - ASSUME(gMovesInfo[MOVE_DRAGON_CLAW].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_DRAGON_BREATH].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_DRAGON_CLAW].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_DRAGON_BREATH].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_REGIDRAGO) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/earth_eater.c b/test/battle/ability/earth_eater.c index 220a79df7325..2e6ae6dab561 100644 --- a/test/battle/ability/earth_eater.c +++ b/test/battle/ability/earth_eater.c @@ -36,7 +36,7 @@ SINGLE_BATTLE_TEST("Earth Eater activates on status moves") { GIVEN { ASSUME(gMovesInfo[MOVE_SAND_ATTACK].type == TYPE_GROUND); - ASSUME(gMovesInfo[MOVE_SAND_ATTACK].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_SAND_ATTACK].category == DAMAGE_CATEGORY_STATUS); PLAYER(SPECIES_ORTHWORM) { Ability(ABILITY_EARTH_EATER); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/electromorphosis.c b/test/battle/ability/electromorphosis.c index 09a17dd55f44..094b2843bfea 100644 --- a/test/battle/ability/electromorphosis.c +++ b/test/battle/ability/electromorphosis.c @@ -12,8 +12,8 @@ SINGLE_BATTLE_TEST("Electromorphosis sets up Charge when hit by any move") GIVEN { ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); ASSUME(gMovesInfo[MOVE_GUST].power != 0); - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].power != 0); ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); diff --git a/test/battle/ability/flower_gift.c b/test/battle/ability/flower_gift.c index 5dc6865fcde6..2c1006e3f571 100644 --- a/test/battle/ability/flower_gift.c +++ b/test/battle/ability/flower_gift.c @@ -67,7 +67,7 @@ DOUBLE_BATTLE_TEST("Flower Gift increases the attack of Cherrim and its allies b PARAMETRIZE { sunny = FALSE; } PARAMETRIZE { sunny = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -102,7 +102,7 @@ DOUBLE_BATTLE_TEST("Flower Gift increases the Sp. Def of Cherrim and its allies PARAMETRIZE { sunny = FALSE; } PARAMETRIZE { sunny = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_HYPER_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_HYPER_VOICE].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/ice_scales.c b/test/battle/ability/ice_scales.c index 6b950720386d..fd262147a57b 100644 --- a/test/battle/ability/ice_scales.c +++ b/test/battle/ability/ice_scales.c @@ -12,10 +12,10 @@ SINGLE_BATTLE_TEST("Ice Scales halves the damage from special moves", s16 damage PARAMETRIZE { ability = ABILITY_SHIELD_DUST; move = MOVE_TACKLE; } PARAMETRIZE { ability = ABILITY_ICE_SCALES; move = MOVE_TACKLE; } GIVEN { - ASSUME(gMovesInfo[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_PSYSHOCK].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_PSYCHIC].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_PSYSHOCK].category == DAMAGE_CATEGORY_SPECIAL); ASSUME(gMovesInfo[MOVE_PSYSHOCK].effect == EFFECT_PSYSHOCK); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_FROSMOTH) { Ability(ability); } } WHEN { diff --git a/test/battle/ability/innards_out.c b/test/battle/ability/innards_out.c index 1577385cf1ca..a8d5c7ee3f31 100644 --- a/test/battle/ability/innards_out.c +++ b/test/battle/ability/innards_out.c @@ -15,7 +15,7 @@ SINGLE_BATTLE_TEST("Innards Out deal dmg on fainting equal to the amount of dmg OPPONENT(SPECIES_WOBBUFFET) { HP(70); SpAttack(1000); } OPPONENT(SPECIES_WOBBUFFET); ASSUME(gMovesInfo[MOVE_PSYCHIC].power != 0); - ASSUME(gMovesInfo[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_PSYCHIC].category == DAMAGE_CATEGORY_SPECIAL); } WHEN { TURN { MOVE(opponent, MOVE_PSYCHIC); SEND_OUT(player, 1); if (hp == 100) { SEND_OUT(opponent, 1); } } } SCENE { diff --git a/test/battle/ability/intimidate.c b/test/battle/ability/intimidate.c index faea13a2b3f8..32801bcd50c1 100644 --- a/test/battle/ability/intimidate.c +++ b/test/battle/ability/intimidate.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch out", s16 damage) diff --git a/test/battle/ability/opportunist.c b/test/battle/ability/opportunist.c index a63bd80dabc3..84e72d09ca9d 100644 --- a/test/battle/ability/opportunist.c +++ b/test/battle/ability/opportunist.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Opportunist only copies foe's positive stat changes in a turn", s16 damage) diff --git a/test/battle/ability/parental_bond.c b/test/battle/ability/parental_bond.c index b1d630a3133c..5ff56bcef254 100644 --- a/test/battle/ability/parental_bond.c +++ b/test/battle/ability/parental_bond.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Parental Bond converts Tackle into a two-strike move") { GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category != BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_TACKLE].category != DAMAGE_CATEGORY_STATUS); ASSUME(gMovesInfo[MOVE_TACKLE].strikeCount < 2); ASSUME(gMovesInfo[MOVE_TACKLE].effect == EFFECT_HIT); PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } @@ -27,7 +27,7 @@ SINGLE_BATTLE_TEST("Parental Bond converts Tackle into a two-strike move") SINGLE_BATTLE_TEST("Parental Bond does not convert a move with three or more strikes to a two-strike move") { GIVEN { - ASSUME(gMovesInfo[MOVE_TRIPLE_KICK].category != BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_TRIPLE_KICK].category != DAMAGE_CATEGORY_STATUS); ASSUME(gMovesInfo[MOVE_TRIPLE_KICK].strikeCount == 3); PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/prankster.c b/test/battle/ability/prankster.c index be03e8f2e214..d6c5a924629a 100644 --- a/test/battle/ability/prankster.c +++ b/test/battle/ability/prankster.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gSpeciesInfo[SPECIES_UMBREON].types[0] == TYPE_DARK); - ASSUME(gMovesInfo[MOVE_CONFUSE_RAY].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_CONFUSE_RAY].category == DAMAGE_CATEGORY_STATUS); } SINGLE_BATTLE_TEST("Prankster-affected moves don't affect Dark-type Pokémon") diff --git a/test/battle/ability/protosynthesis.c b/test/battle/ability/protosynthesis.c index 761960f88dd6..264548c207f3 100644 --- a/test/battle/ability/protosynthesis.c +++ b/test/battle/ability/protosynthesis.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_ROUND].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ROUND].category == DAMAGE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Protosynthesis boosts the highest stat") diff --git a/test/battle/ability/quark_drive.c b/test/battle/ability/quark_drive.c index 4e58b5e14ccc..4e81b012ae83 100644 --- a/test/battle/ability/quark_drive.c +++ b/test/battle/ability/quark_drive.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_ROUND].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ROUND].category == DAMAGE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Quark Drive boosts the highest stat") diff --git a/test/battle/ability/rocky_payload.c b/test/battle/ability/rocky_payload.c index ff6629e1783b..27cc45fda0f5 100644 --- a/test/battle/ability/rocky_payload.c +++ b/test/battle/ability/rocky_payload.c @@ -17,8 +17,8 @@ SINGLE_BATTLE_TEST("Rocky Payload increases Rock-type move damage", s16 damage) ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_ROCK); ASSUME(gMovesInfo[MOVE_ROCK_THROW].type == TYPE_ROCK); ASSUME(gMovesInfo[MOVE_POWER_GEM].type == TYPE_ROCK); - ASSUME(gMovesInfo[MOVE_ROCK_THROW].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_POWER_GEM].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_ROCK_THROW].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_POWER_GEM].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_BOMBIRDIER) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/stamina.c b/test/battle/ability/stamina.c index b3e974d14076..e6e500cd797c 100644 --- a/test/battle/ability/stamina.c +++ b/test/battle/ability/stamina.c @@ -26,8 +26,8 @@ SINGLE_BATTLE_TEST("Stamina raises Defense by 1 when hit by a move") GIVEN { ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); ASSUME(gMovesInfo[MOVE_GUST].power != 0); - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_STAMINA); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/steelworker.c b/test/battle/ability/steelworker.c index 30bed971c2fe..7e8ecbb56886 100644 --- a/test/battle/ability/steelworker.c +++ b/test/battle/ability/steelworker.c @@ -17,8 +17,8 @@ SINGLE_BATTLE_TEST("Steelworker increases Steel-type move damage", s16 damage) ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_STEEL); ASSUME(gMovesInfo[MOVE_ANCHOR_SHOT].type == TYPE_STEEL); ASSUME(gMovesInfo[MOVE_FLASH_CANNON].type == TYPE_STEEL); - ASSUME(gMovesInfo[MOVE_ANCHOR_SHOT].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_FLASH_CANNON].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_ANCHOR_SHOT].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_FLASH_CANNON].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_DHELMISE) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/swarm.c b/test/battle/ability/swarm.c index 63e9ee23673d..c3da16f6b6a8 100644 --- a/test/battle/ability/swarm.c +++ b/test/battle/ability/swarm.c @@ -9,7 +9,7 @@ SINGLE_BATTLE_TEST("Swarm boosts Bug-type moves in a pinch", s16 damage) GIVEN { ASSUME(gMovesInfo[MOVE_BUG_BITE].type == TYPE_BUG); ASSUME(gMovesInfo[MOVE_BUG_BITE].power == 60); - ASSUME(gMovesInfo[MOVE_BUG_BITE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_BUG_BITE].category == DAMAGE_CATEGORY_PHYSICAL); ASSUME(gSpeciesInfo[SPECIES_LEDYBA].types[0] == TYPE_BUG); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[0] == TYPE_PSYCHIC); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[1] == TYPE_PSYCHIC); diff --git a/test/battle/ability/sword_of_ruin.c b/test/battle/ability/sword_of_ruin.c index 3d95d1e31f64..c6c1ffc4b27c 100644 --- a/test/battle/ability/sword_of_ruin.c +++ b/test/battle/ability/sword_of_ruin.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); ASSUME(gMovesInfo[MOVE_ROLE_PLAY].effect == EFFECT_ROLE_PLAY); } diff --git a/test/battle/ability/tablets_of_ruin.c b/test/battle/ability/tablets_of_ruin.c index f8ef74ece6c1..d1f9cf3d2ede 100644 --- a/test/battle/ability/tablets_of_ruin.c +++ b/test/battle/ability/tablets_of_ruin.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); ASSUME(gMovesInfo[MOVE_ENTRAINMENT].effect == EFFECT_ENTRAINMENT); } diff --git a/test/battle/ability/toxic_debris.c b/test/battle/ability/toxic_debris.c index f21c7c5a7835..ed2c60e59456 100644 --- a/test/battle/ability/toxic_debris.c +++ b/test/battle/ability/toxic_debris.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Toxic Debris sets Toxic Spikes on the opposing side if hit by a physical attack") diff --git a/test/battle/ability/transistor.c b/test/battle/ability/transistor.c index 0f5e3069c491..4588badcc9ad 100644 --- a/test/battle/ability/transistor.c +++ b/test/battle/ability/transistor.c @@ -17,8 +17,8 @@ SINGLE_BATTLE_TEST("Transistor increases Electric-type move damage", s16 damage) ASSUME(gMovesInfo[MOVE_TACKLE].type != TYPE_ELECTRIC); ASSUME(gMovesInfo[MOVE_WILD_CHARGE].type == TYPE_ELECTRIC); ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); - ASSUME(gMovesInfo[MOVE_WILD_CHARGE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_WILD_CHARGE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_THUNDER_SHOCK].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_REGIELEKI) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/vessel_of_ruin.c b/test/battle/ability/vessel_of_ruin.c index 515d0e65b16f..4d369df69174 100644 --- a/test/battle/ability/vessel_of_ruin.c +++ b/test/battle/ability/vessel_of_ruin.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == DAMAGE_CATEGORY_SPECIAL); ASSUME(gMovesInfo[MOVE_ENTRAINMENT].effect == EFFECT_ENTRAINMENT); } diff --git a/test/battle/ability/volt_absorb.c b/test/battle/ability/volt_absorb.c index 0faa255f9cd7..b438e794f0bd 100644 --- a/test/battle/ability/volt_absorb.c +++ b/test/battle/ability/volt_absorb.c @@ -33,7 +33,7 @@ SINGLE_BATTLE_TEST("Volt Absorb activates on status moves") { GIVEN { ASSUME(gMovesInfo[MOVE_THUNDER_WAVE].type == TYPE_ELECTRIC); - ASSUME(gMovesInfo[MOVE_THUNDER_WAVE].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_THUNDER_WAVE].category == DAMAGE_CATEGORY_STATUS); PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/water_absorb.c b/test/battle/ability/water_absorb.c index 11ca6fe6df3c..842a448bab8c 100644 --- a/test/battle/ability/water_absorb.c +++ b/test/battle/ability/water_absorb.c @@ -33,7 +33,7 @@ SINGLE_BATTLE_TEST("Water Absorb activates on status moves") { GIVEN { ASSUME(gMovesInfo[MOVE_SOAK].type == TYPE_WATER); - ASSUME(gMovesInfo[MOVE_SOAK].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_SOAK].category == DAMAGE_CATEGORY_STATUS); PLAYER(SPECIES_POLIWAG) { Ability(ABILITY_WATER_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/weak_armor.c b/test/battle/ability/weak_armor.c index cd324a1e7d99..291b2ac639e9 100644 --- a/test/battle/ability/weak_armor.c +++ b/test/battle/ability/weak_armor.c @@ -5,8 +5,8 @@ ASSUMPTIONS { ASSUME(gMovesInfo[MOVE_TACKLE].power != 0); ASSUME(gMovesInfo[MOVE_GUST].power != 0); - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); ASSUME(B_WEAK_ARMOR_SPEED >= GEN_7); } diff --git a/test/battle/ai.c b/test/battle/ai.c index dff33dd1c1c2..81d5e7959a3f 100644 --- a/test/battle/ai.c +++ b/test/battle/ai.c @@ -110,15 +110,15 @@ AI_SINGLE_BATTLE_TEST("AI prefers moves with better accuracy, but only if they b ASSUME(gMovesInfo[MOVE_SHOCK_WAVE].accuracy == 0); ASSUME(gMovesInfo[MOVE_THUNDERBOLT].accuracy == 100); ASSUME(gMovesInfo[MOVE_ICY_WIND].accuracy != 100); - ASSUME(gMovesInfo[MOVE_SLAM].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_MEGA_KICK].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_SHOCK_WAVE].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_ICY_WIND].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_THUNDERBOLT].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SLAM].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_STRENGTH].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_MEGA_KICK].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SHOCK_WAVE].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_ICY_WIND].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_THUNDERBOLT].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); OPPONENT(SPECIES_EXPLOUD) { Moves(move1, move2, move3, move4); Ability(abilityAtk); SpAttack(50); } // Low Sp.Atk, so Swift deals less damage than Strength. } WHEN { switch (turns) @@ -166,10 +166,10 @@ AI_SINGLE_BATTLE_TEST("AI prefers moves which deal more damage instead of moves PARAMETRIZE { move1 = MOVE_POISON_JAB; move2 = MOVE_WATER_GUN; expectedMove = MOVE_POISON_JAB; abilityDef = ABILITY_IMMUNITY; turns = 3; } GIVEN { - ASSUME(gMovesInfo[MOVE_WATERFALL].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_SCALD].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_POISON_JAB].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_WATERFALL].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SCALD].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_POISON_JAB].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == DAMAGE_CATEGORY_SPECIAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_TYPHLOSION) { Ability(abilityDef); } PLAYER(SPECIES_WOBBUFFET); @@ -196,8 +196,8 @@ AI_SINGLE_BATTLE_TEST("AI prefers Earthquake over Drill Run if both require the { // Drill Run has less accuracy than E-quake, but can score a higher crit. However the chance is too small, so AI should ignore it. GIVEN { - ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); // Added because Geodude has to KO Typhlosion - ASSUME(gMovesInfo[MOVE_DRILL_RUN].category == BATTLE_CATEGORY_PHYSICAL); // Added because Geodude has to KO Typhlosion + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == DAMAGE_CATEGORY_PHYSICAL); // Added because Geodude has to KO Typhlosion + ASSUME(gMovesInfo[MOVE_DRILL_RUN].category == DAMAGE_CATEGORY_PHYSICAL); // Added because Geodude has to KO Typhlosion AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_TYPHLOSION); PLAYER(SPECIES_WOBBUFFET); @@ -222,8 +222,8 @@ AI_SINGLE_BATTLE_TEST("AI prefers a weaker move over a one with a downside effec PARAMETRIZE { move1 = MOVE_OVERHEAT; move2 = MOVE_FLAMETHROWER; hp = 250; expectedMove = MOVE_OVERHEAT; turns = 1; } GIVEN { - ASSUME(gMovesInfo[MOVE_FLAMETHROWER].category == BATTLE_CATEGORY_SPECIAL); // Added because Typhlosion has to KO Wobbuffet - ASSUME(gMovesInfo[MOVE_OVERHEAT].category == BATTLE_CATEGORY_SPECIAL); // Added because Typhlosion has to KO Wobbuffet + ASSUME(gMovesInfo[MOVE_FLAMETHROWER].category == DAMAGE_CATEGORY_SPECIAL); // Added because Typhlosion has to KO Wobbuffet + ASSUME(gMovesInfo[MOVE_OVERHEAT].category == DAMAGE_CATEGORY_SPECIAL); // Added because Typhlosion has to KO Wobbuffet AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(hp); } PLAYER(SPECIES_WOBBUFFET); @@ -262,8 +262,8 @@ AI_SINGLE_BATTLE_TEST("AI prefers moves with the best possible score, chosen ran AI_SINGLE_BATTLE_TEST("AI can choose a status move that boosts the attack by two") { GIVEN { - ASSUME(gMovesInfo[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_HORN_ATTACK].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_STRENGTH].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_HORN_ATTACK].category == DAMAGE_CATEGORY_PHYSICAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(277); }; PLAYER(SPECIES_WOBBUFFET); @@ -327,8 +327,8 @@ AI_SINGLE_BATTLE_TEST("AI won't use Solar Beam if there is no Sun up or the user PARAMETRIZE { } GIVEN { - ASSUME(gMovesInfo[MOVE_SOLAR_BEAM].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_GRASS_PLEDGE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SOLAR_BEAM].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GRASS_PLEDGE].category == DAMAGE_CATEGORY_SPECIAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { HP(211); } PLAYER(SPECIES_WOBBUFFET); @@ -352,7 +352,7 @@ AI_SINGLE_BATTLE_TEST("AI won't use Solar Beam if there is no Sun up or the user AI_SINGLE_BATTLE_TEST("AI won't use ground type attacks against flying type Pokemon unless Gravity is in effect") { GIVEN { - ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); // Otherwise, it doesn't KO Crobat + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == DAMAGE_CATEGORY_PHYSICAL); // Otherwise, it doesn't KO Crobat AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_CROBAT); PLAYER(SPECIES_WOBBUFFET); @@ -427,7 +427,7 @@ AI_DOUBLE_BATTLE_TEST("AI will not use a status move if partner already chose He for (j = MOVE_NONE + 1; j < MOVES_COUNT; j++) { - if (gMovesInfo[j].category == BATTLE_CATEGORY_STATUS) { + if (gMovesInfo[j].category == DAMAGE_CATEGORY_STATUS) { PARAMETRIZE{ statusMove = j; } } } @@ -514,11 +514,11 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: AI will not switch in a Pokemo PARAMETRIZE{ speedAlakazm = 400; alakazamFirst = TRUE; aiSmartSwitchFlags = AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES; } // AI_FLAG_SMART_MON_CHOICES recognizes that Alakazam is faster and can KO, and will switch it in GIVEN { - ASSUME(gMovesInfo[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_FOCUS_BLAST].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_BUBBLE_BEAM].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_PSYCHIC].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_FOCUS_BLAST].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_BUBBLE_BEAM].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_STRENGTH].category == DAMAGE_CATEGORY_PHYSICAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | aiSmartSwitchFlags); PLAYER(SPECIES_WEAVILE) { Speed(300); Ability(ABILITY_SHADOW_TAG); } // Weavile has Shadow Tag, so AI can't switch on the first turn, but has to do it after fainting. OPPONENT(SPECIES_KADABRA) { Speed(200); Moves(MOVE_PSYCHIC, MOVE_DISABLE, MOVE_TAUNT, MOVE_CALM_MIND); } @@ -644,10 +644,10 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will not switch out if Pokemo PARAMETRIZE{move1 = MOVE_RAPID_SPIN; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_RAPID_SPIN].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_HEADBUTT].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_RAPID_SPIN].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_EARTHQUAKE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_HEADBUTT].category == DAMAGE_CATEGORY_PHYSICAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SMART_SWITCHING); PLAYER(SPECIES_HITMONTOP) { Level(30); Moves(MOVE_CHARM, MOVE_TACKLE, MOVE_STEALTH_ROCK, MOVE_EARTHQUAKE); Ability(ABILITY_INTIMIDATE); Speed(5); } OPPONENT(SPECIES_GRIMER) { Level(30); Moves(MOVE_TACKLE); Item(ITEM_FOCUS_SASH); Speed(4); } diff --git a/test/battle/ai_check_viability.c b/test/battle/ai_check_viability.c index 493febbf28f4..69794804c743 100644 --- a/test/battle/ai_check_viability.c +++ b/test/battle/ai_check_viability.c @@ -157,8 +157,8 @@ AI_SINGLE_BATTLE_TEST("AI can choose Counter or Mirror Coat if the predicted mov GIVEN { ASSUME(gMovesInfo[MOVE_COUNTER].effect == EFFECT_COUNTER); ASSUME(gMovesInfo[MOVE_MIRROR_COAT].effect == EFFECT_MIRROR_COAT); - ASSUME(gMovesInfo[MOVE_STRENGTH].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_POWER_GEM].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_STRENGTH].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_POWER_GEM].category == DAMAGE_CATEGORY_SPECIAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_WOBBUFFET) { HP(102); Speed(100); Moves(opponentMove, MOVE_STRENGTH); } diff --git a/test/battle/damage_formula.c b/test/battle/damage_formula.c index 8240926c3b47..2fdb9bed0f8d 100644 --- a/test/battle/damage_formula.c +++ b/test/battle/damage_formula.c @@ -24,7 +24,7 @@ SINGLE_BATTLE_TEST("Damage calculation matches Gen5+") PARAMETRIZE { expectedDamage = 168; } PARAMETRIZE { expectedDamage = 168; } GIVEN { - ASSUME(gMovesInfo[MOVE_ICE_FANG].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ICE_FANG].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_GLACEON) { Level(75); Attack(123); } OPPONENT(SPECIES_GARCHOMP) { Defense(163); } } WHEN { @@ -62,7 +62,7 @@ SINGLE_BATTLE_TEST("Damage calculation matches Gen5+ (Muscle Band, crit)") PARAMETRIZE { expectedDamage = 276; } PARAMETRIZE { expectedDamage = 268; } GIVEN { - ASSUME(gMovesInfo[MOVE_ICE_FANG].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_ICE_FANG].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_GLACEON) { Level(75); Attack(123); Item(ITEM_MUSCLE_BAND); } OPPONENT(SPECIES_GARCHOMP) { Defense(163); } } WHEN { @@ -100,7 +100,7 @@ SINGLE_BATTLE_TEST("Damage calculation matches Gen5+ (Marshadow vs Mawile)") PARAMETRIZE { expectedDamage = 124; } PARAMETRIZE { expectedDamage = 123; } GIVEN { - ASSUME(gMovesInfo[MOVE_SPECTRAL_THIEF].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SPECTRAL_THIEF].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_MARSHADOW) { Level(100); Attack(286); } OPPONENT(SPECIES_MAWILE) { Level(100); Defense(226); HP(241); } } WHEN { diff --git a/test/battle/hold_effect/berserk_gene.c b/test/battle/hold_effect/berserk_gene.c index 0a1067ced3d5..cda82ebb60e7 100644 --- a/test/battle/hold_effect/berserk_gene.c +++ b/test/battle/hold_effect/berserk_gene.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Berserk Gene sharply raises attack at the start of a single PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -37,7 +37,7 @@ DOUBLE_BATTLE_TEST("Berserk Gene sharply raises attack at the start of a double PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WYNAUT); PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); @@ -64,7 +64,7 @@ SINGLE_BATTLE_TEST("Berserk Gene activates on switch in", s16 damage) PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WYNAUT); PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); @@ -91,7 +91,7 @@ SINGLE_BATTLE_TEST("Berserk Gene does not confuse a Pokemon with Own Tempo but s PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_SLOWBRO) { Ability(ABILITY_OWN_TEMPO); Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -122,7 +122,7 @@ DOUBLE_BATTLE_TEST("Berserk Gene does not confuse a Pokemon with Own Tempo but s PARAMETRIZE { item = ITEM_BERSERK_GENE; positionLeft = TRUE; } PARAMETRIZE { item = ITEM_BERSERK_GENE; positionLeft = FALSE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); if (positionLeft) { PLAYER(SPECIES_SLOWBRO) { Ability(ABILITY_OWN_TEMPO); Item(item); } PLAYER(SPECIES_WOBBUFFET); @@ -156,7 +156,7 @@ DOUBLE_BATTLE_TEST("Berserk Gene does not confuse a Pokemon with Own Tempo but s SINGLE_BATTLE_TEST("Berserk Gene does not confuse on Misty Terrain but still raises attack sharply") { GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_TAPU_FINI) { Ability(ABILITY_MISTY_SURGE); Item(ITEM_BERSERK_GENE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/hold_effect/jaboca_berry.c b/test/battle/hold_effect/jaboca_berry.c index 3f0408d89a95..0b9975fc2a17 100644 --- a/test/battle/hold_effect/jaboca_berry.c +++ b/test/battle/hold_effect/jaboca_berry.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gItemsInfo[ITEM_JABOCA_BERRY].holdEffect == HOLD_EFFECT_JABOCA_BERRY); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Jaboca Berry causes the attacker to lose 1/8 of its max HP if a physical move was used") @@ -16,7 +16,7 @@ SINGLE_BATTLE_TEST("Jaboca Berry causes the attacker to lose 1/8 of its max HP i PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_JABOCA_BERRY); } } WHEN { @@ -44,7 +44,7 @@ SINGLE_BATTLE_TEST("Jaboca Berry tirggers before Bug Bite can steal it") { KNOWN_FAILING; GIVEN { - ASSUME(gMovesInfo[MOVE_BUG_BITE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_BUG_BITE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_JABOCA_BERRY); } } WHEN { diff --git a/test/battle/hold_effect/kee_berry.c b/test/battle/hold_effect/kee_berry.c index 4878572de4f7..4181c52605a1 100644 --- a/test/battle/hold_effect/kee_berry.c +++ b/test/battle/hold_effect/kee_berry.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gItemsInfo[ITEM_KEE_BERRY].holdEffect == HOLD_EFFECT_KEE_BERRY); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by one stage when hit by a physical move") @@ -15,7 +15,7 @@ SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by one stage when hit PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_KEE_BERRY); } } WHEN { @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by two stages with Rip SINGLE_BATTLE_TEST("Kee Berry is not triggered by a special move") { GIVEN { - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_KEE_BERRY); } } WHEN { diff --git a/test/battle/hold_effect/maranga_berry.c b/test/battle/hold_effect/maranga_berry.c index 6f3ab798fc02..c14b91d0ed79 100644 --- a/test/battle/hold_effect/maranga_berry.c +++ b/test/battle/hold_effect/maranga_berry.c @@ -12,8 +12,8 @@ SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by one stage when PARAMETRIZE { move = MOVE_TACKLE; } PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_MARANGA_BERRY); } } WHEN { @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by one stage when SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by two stages with Ripen when hit by a special move") { GIVEN { - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_APPLIN) { Item(ITEM_MARANGA_BERRY); Ability(ABILITY_RIPEN); } } WHEN { diff --git a/test/battle/hold_effect/mirror_herb.c b/test/battle/hold_effect/mirror_herb.c index 04648d618efd..da335b7ac559 100644 --- a/test/battle/hold_effect/mirror_herb.c +++ b/test/battle/hold_effect/mirror_herb.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Mirror Herb copies all of foe's positive stat changes in a t PARAMETRIZE { item = ITEM_NONE; } PARAMETRIZE { item = ITEM_MIRROR_HERB; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Speed(4); } OPPONENT(SPECIES_WOBBUFFET) { Speed(5); Item(item); } } WHEN { diff --git a/test/battle/hold_effect/rowap_berry.c b/test/battle/hold_effect/rowap_berry.c index c21aaba01e18..925caf2179a9 100644 --- a/test/battle/hold_effect/rowap_berry.c +++ b/test/battle/hold_effect/rowap_berry.c @@ -15,8 +15,8 @@ SINGLE_BATTLE_TEST("Rowap Berry causes the attacker to lose 1/8 of its max HP if PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ROWAP_BERRY); } } WHEN { @@ -43,7 +43,7 @@ SINGLE_BATTLE_TEST("Rowap Berry causes the attacker to lose 1/8 of its max HP if SINGLE_BATTLE_TEST("Rowap Berry is not triggered by a physical move") { GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ROWAP_BERRY); } } WHEN { diff --git a/test/battle/item_effect/increase_stat.c b/test/battle/item_effect/increase_stat.c index ddd53ea73b65..df36b8ff338c 100644 --- a/test/battle/item_effect/increase_stat.c +++ b/test/battle/item_effect/increase_stat.c @@ -8,7 +8,7 @@ SINGLE_BATTLE_TEST("X Attack sharply raises battler's Attack stat", s16 damage) PARAMETRIZE { useItem = TRUE; } GIVEN { ASSUME(gItemsInfo[ITEM_X_ATTACK].battleUsage == EFFECT_ITEM_INCREASE_STAT); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -32,7 +32,7 @@ SINGLE_BATTLE_TEST("X Defense sharply raises battler's Defense stat", s16 damage PARAMETRIZE { useItem = TRUE; } GIVEN { ASSUME(gItemsInfo[ITEM_X_DEFENSE].battleUsage == EFFECT_ITEM_INCREASE_STAT); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -56,7 +56,7 @@ SINGLE_BATTLE_TEST("X Sp. Atk sharply raises battler's Sp. Attack stat", s16 dam PARAMETRIZE { useItem = TRUE; } GIVEN { ASSUME(gItemsInfo[ITEM_X_SP_ATK].battleUsage == EFFECT_ITEM_INCREASE_STAT); - ASSUME(gMovesInfo[MOVE_DISARMING_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_DISARMING_VOICE].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -80,7 +80,7 @@ SINGLE_BATTLE_TEST("X Sp. Def sharply raises battler's Sp. Defense stat", s16 da PARAMETRIZE { useItem = TRUE; } GIVEN { ASSUME(gItemsInfo[ITEM_X_SP_DEF].battleUsage == EFFECT_ITEM_INCREASE_STAT); - ASSUME(gMovesInfo[MOVE_DISARMING_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_DISARMING_VOICE].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move.c b/test/battle/move.c index f9f363b42b02..4f51395ab18e 100644 --- a/test/battle/move.c +++ b/test/battle/move.c @@ -136,7 +136,7 @@ SINGLE_BATTLE_TEST("Critical hits do not ignore positive stat stages", s16 damag PARAMETRIZE { move = MOVE_HOWL; } PARAMETRIZE { move = MOVE_TAIL_WHIP; } GIVEN { - ASSUME(gMovesInfo[MOVE_SCRATCH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SCRATCH].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -157,7 +157,7 @@ SINGLE_BATTLE_TEST("Critical hits ignore negative stat stages", s16 damage) PARAMETRIZE { move = MOVE_HARDEN; } PARAMETRIZE { move = MOVE_GROWL; } GIVEN { - ASSUME(gMovesInfo[MOVE_SCRATCH].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_SCRATCH].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/attack_down.c b/test/battle/move_effect/attack_down.c index a9861cbcc126..e9b3a7c23e87 100644 --- a/test/battle/move_effect/attack_down.c +++ b/test/battle/move_effect/attack_down.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Growl lowers Attack", s16 damage) PARAMETRIZE { lowerAttack = FALSE; } PARAMETRIZE { lowerAttack = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/attack_up.c b/test/battle/move_effect/attack_up.c index ef6063ce6a00..bf4b830370b3 100644 --- a/test/battle/move_effect/attack_up.c +++ b/test/battle/move_effect/attack_up.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Meditate raises Attack", s16 damage) PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/attack_up_user_ally.c b/test/battle/move_effect/attack_up_user_ally.c index dfcf3fb6436a..706b6311a3e5 100644 --- a/test/battle/move_effect/attack_up_user_ally.c +++ b/test/battle/move_effect/attack_up_user_ally.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Howl raises user's Attack", s16 damage) PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -37,7 +37,7 @@ DOUBLE_BATTLE_TEST("Howl raises user's and partner's Attack", s16 damageLeft, s1 PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Speed(15); } PLAYER(SPECIES_WYNAUT) { Speed(10); } OPPONENT(SPECIES_WOBBUFFET) { Speed(13); } @@ -69,7 +69,7 @@ DOUBLE_BATTLE_TEST("Howl does not work on partner if it has Soundproof") s16 damage[2]; GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Speed(15); } PLAYER(SPECIES_VOLTORB) { Speed(10); Ability(ABILITY_SOUNDPROOF); } OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } diff --git a/test/battle/move_effect/belly_drum.c b/test/battle/move_effect/belly_drum.c index 90f1dac5653f..f45418fe8a99 100644 --- a/test/battle/move_effect/belly_drum.c +++ b/test/battle/move_effect/belly_drum.c @@ -25,7 +25,7 @@ SINGLE_BATTLE_TEST("Belly Drum maximizes the user's Attack stat", s16 damage) PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/defense_down.c b/test/battle/move_effect/defense_down.c index df672469c23f..8eb288a805a6 100644 --- a/test/battle/move_effect/defense_down.c +++ b/test/battle/move_effect/defense_down.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Tail Whip lowers Defense", s16 damage) PARAMETRIZE { lowerDefense = FALSE; } PARAMETRIZE { lowerDefense = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/defense_up.c b/test/battle/move_effect/defense_up.c index 25a98ff086d3..513d6e1c2980 100644 --- a/test/battle/move_effect/defense_up.c +++ b/test/battle/move_effect/defense_up.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Harden raises Defense", s16 damage) PARAMETRIZE { raiseDefense = FALSE; } PARAMETRIZE { raiseDefense = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/defog.c b/test/battle/move_effect/defog.c index 91f0970a3077..2fe20405f645 100644 --- a/test/battle/move_effect/defog.c +++ b/test/battle/move_effect/defog.c @@ -15,8 +15,8 @@ ASSUMPTIONS ASSUME(gMovesInfo[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC); ASSUME(gMovesInfo[MOVE_SCREECH].effect == EFFECT_DEFENSE_DOWN_2); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Defog lowers evasiveness by 1") diff --git a/test/battle/move_effect/fling.c b/test/battle/move_effect/fling.c index 6d0a47cf7bd6..f6b83215a1c5 100644 --- a/test/battle/move_effect/fling.c +++ b/test/battle/move_effect/fling.c @@ -362,7 +362,7 @@ SINGLE_BATTLE_TEST("Fling - thrown berry's effect activates for the target even PARAMETRIZE { item = ITEM_SALAC_BERRY; effect = HOLD_EFFECT_SPEED_UP; statId = STAT_SPEED; } GIVEN { - ASSUME(gMovesInfo[MOVE_FLING].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_FLING].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Item(item); Attack(1); } OPPONENT(SPECIES_WOBBUFFET) { Status1(status1); HP(399); MaxHP(400); MovesWithPP({MOVE_CELEBRATE, 35}); } } WHEN { diff --git a/test/battle/move_effect/haze.c b/test/battle/move_effect/haze.c index 6cdb9c454a5b..0b28268ae929 100644 --- a/test/battle/move_effect/haze.c +++ b/test/battle/move_effect/haze.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Haze resets stat changes", s16 damage) PARAMETRIZE { haze = TRUE; } GIVEN { ASSUME(gMovesInfo[MOVE_MEDITATE].effect == EFFECT_ATTACK_UP); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/hit_escape.c b/test/battle/move_effect/hit_escape.c index 05ec894ae2b6..cc71bae7892d 100644 --- a/test/battle/move_effect/hit_escape.c +++ b/test/battle/move_effect/hit_escape.c @@ -98,7 +98,7 @@ SINGLE_BATTLE_TEST("U-turn switches the user out if Wimp Out fails to activate") SINGLE_BATTLE_TEST("U-turn switches the user out after Ice Face activates") { GIVEN { - ASSUME(gMovesInfo[MOVE_U_TURN].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_U_TURN].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_BEEDRILL); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_EISCUE) { Ability(ABILITY_ICE_FACE); } diff --git a/test/battle/move_effect/make_it_rain.c b/test/battle/move_effect/make_it_rain.c index f6a13ac2b417..93fbeb1119fa 100644 --- a/test/battle/move_effect/make_it_rain.c +++ b/test/battle/move_effect/make_it_rain.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Make It Rain lowers special attack by one stage") s16 damage[2]; GIVEN { - ASSUME(gMovesInfo[MOVE_MAKE_IT_RAIN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_MAKE_IT_RAIN].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/photon_geyser.c b/test/battle/move_effect/photon_geyser.c index 9342bec51518..3f46547ee127 100644 --- a/test/battle/move_effect/photon_geyser.c +++ b/test/battle/move_effect/photon_geyser.c @@ -10,7 +10,7 @@ SINGLE_BATTLE_TEST("Photon Geyser can be mirror coated if it is a special move") { GIVEN { // EFFECT_PHOTON_GEYSER requires the move data to be Special to work - ASSUME(gMovesInfo[MOVE_PHOTON_GEYSER].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_PHOTON_GEYSER].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Attack(100); SpAttack(110); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/pledge.c b/test/battle/move_effect/pledge.c index 4f73ea98fef5..430d2b45e052 100644 --- a/test/battle/move_effect/pledge.c +++ b/test/battle/move_effect/pledge.c @@ -313,7 +313,7 @@ DOUBLE_BATTLE_TEST("Damage calculation: Combined pledge move") PARAMETRIZE { expectedDamage = 136; } PARAMETRIZE { expectedDamage = 135; } GIVEN { - ASSUME(gMovesInfo[MOVE_GRASS_PLEDGE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GRASS_PLEDGE].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Speed(4); } PLAYER(SPECIES_WOBBUFFET) { HP(521); SpDefense(152); Speed(3); } OPPONENT(SPECIES_CHARIZARD) { Speed(8); } diff --git a/test/battle/move_effect/protect.c b/test/battle/move_effect/protect.c index 45baeeab6105..53d4704987b6 100644 --- a/test/battle/move_effect/protect.c +++ b/test/battle/move_effect/protect.c @@ -13,10 +13,10 @@ ASSUMPTIONS ASSUME(gMovesInfo[MOVE_CRAFTY_SHIELD].effect == EFFECT_PROTECT); ASSUME(gMovesInfo[MOVE_BANEFUL_BUNKER].effect == EFFECT_PROTECT); ASSUME(gMovesInfo[MOVE_BURNING_BULWARK].effect == EFFECT_PROTECT); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); ASSUME(gMovesInfo[MOVE_TACKLE].makesContact); - ASSUME(gMovesInfo[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); - ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_LEER].category == DAMAGE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == DAMAGE_CATEGORY_SPECIAL); ASSUME(!(gMovesInfo[MOVE_WATER_GUN].makesContact)); } @@ -455,7 +455,7 @@ DOUBLE_BATTLE_TEST("Crafty Shield protects self and ally from status moves") GIVEN { ASSUME(gMovesInfo[MOVE_LEER].target == MOVE_TARGET_BOTH); ASSUME(gMovesInfo[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); - ASSUME(gMovesInfo[MOVE_HYPER_VOICE].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_HYPER_VOICE].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/rage_fist.c b/test/battle/move_effect/rage_fist.c index 50d4684f6cf3..f96a1253c94d 100644 --- a/test/battle/move_effect/rage_fist.c +++ b/test/battle/move_effect/rage_fist.c @@ -130,7 +130,7 @@ SINGLE_BATTLE_TEST("Rage Fist base power is not increased if a substitute was hi s16 timesGotHit[2]; GIVEN { - ASSUME(gMovesInfo[MOVE_CRUNCH].category == BATTLE_CATEGORY_PHYSICAL); // Substitute doesn't fade otherwise + ASSUME(gMovesInfo[MOVE_CRUNCH].category == DAMAGE_CATEGORY_PHYSICAL); // Substitute doesn't fade otherwise PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_REGIROCK); } WHEN { diff --git a/test/battle/move_effect/reflect.c b/test/battle/move_effect/reflect.c index d32ebcefa28e..429dc6f6969e 100644 --- a/test/battle/move_effect/reflect.c +++ b/test/battle/move_effect/reflect.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Reflect reduces physical damage", s16 damage) PARAMETRIZE { move = MOVE_CELEBRATE; } PARAMETRIZE { move = MOVE_REFLECT; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -30,7 +30,7 @@ SINGLE_BATTLE_TEST("Reflect applies for 5 turns") { s16 damage[6]; GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/shell_trap.c b/test/battle/move_effect/shell_trap.c index d1aa217ecce6..15b3f41e5ec5 100644 --- a/test/battle/move_effect/shell_trap.c +++ b/test/battle/move_effect/shell_trap.c @@ -4,9 +4,9 @@ ASSUMPTIONS { ASSUME(gMovesInfo[MOVE_SHELL_TRAP].effect == EFFECT_SHELL_TRAP); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); - ASSUME(gMovesInfo[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_WATER_GUN].category == DAMAGE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_LEER].category == DAMAGE_CATEGORY_STATUS); } SINGLE_BATTLE_TEST("Shell Trap activates only if hit by a physical move") diff --git a/test/battle/move_effect/special_attack_down.c b/test/battle/move_effect/special_attack_down.c index 8eedb7c18055..bf01aa089697 100644 --- a/test/battle/move_effect/special_attack_down.c +++ b/test/battle/move_effect/special_attack_down.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Confide lowers Special Attack", s16 damage) PARAMETRIZE { lowerSpecialAttack = FALSE; } PARAMETRIZE { lowerSpecialAttack = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/special_attack_up_3.c b/test/battle/move_effect/special_attack_up_3.c index 2bf4074bedf7..a701893f51f6 100644 --- a/test/battle/move_effect/special_attack_up_3.c +++ b/test/battle/move_effect/special_attack_up_3.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Tail Glow drastically raises Special Attack", s16 damage) PARAMETRIZE { raiseSpecialAttack = FALSE; } PARAMETRIZE { raiseSpecialAttack = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/stockpile.c b/test/battle/move_effect/stockpile.c index 419b92bb11b4..f6c3f02a462d 100644 --- a/test/battle/move_effect/stockpile.c +++ b/test/battle/move_effect/stockpile.c @@ -148,8 +148,8 @@ SINGLE_BATTLE_TEST("Stockpile temporarily raises Def and Sp. Def", s16 dmgPyhsic PARAMETRIZE { move = MOVE_CELEBRATE; } GIVEN { ASSUME(B_STOCKPILE_RAISES_DEFS >= GEN_4); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Speed(2); } OPPONENT(SPECIES_WOBBUFFET) { Speed(1); } } WHEN { @@ -184,8 +184,8 @@ DOUBLE_BATTLE_TEST("Stockpile's Def and Sp. Def boost is lost after using Spit U PARAMETRIZE { count = 3; move = MOVE_SPIT_UP; } GIVEN { ASSUME(B_STOCKPILE_RAISES_DEFS >= GEN_4); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_GUST].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Speed(4); HP(399); MaxHP(400); } PLAYER(SPECIES_WOBBUFFET) { Speed(3); } OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } diff --git a/test/battle/status1/burn.c b/test/battle/status1/burn.c index e1cc3750542a..c49bd7a3f250 100644 --- a/test/battle/status1/burn.c +++ b/test/battle/status1/burn.c @@ -24,7 +24,7 @@ SINGLE_BATTLE_TEST("Burn reduces Attack by 50%", s16 damage) PARAMETRIZE { burned = FALSE; } PARAMETRIZE { burned = TRUE; } GIVEN { - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { if (burned) Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/status1/frostbite.c b/test/battle/status1/frostbite.c index eb22d597ea95..bf4b1f7fcdd7 100644 --- a/test/battle/status1/frostbite.c +++ b/test/battle/status1/frostbite.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Frostbite reduces the special attack by 50 percent") s16 normaleDamage; GIVEN { - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_FROSTBITE); } } WHEN { diff --git a/test/battle/weather/sandstorm.c b/test/battle/weather/sandstorm.c index e328b29f8821..5d7a6f1713cf 100644 --- a/test/battle/weather/sandstorm.c +++ b/test/battle/weather/sandstorm.c @@ -23,7 +23,7 @@ SINGLE_BATTLE_TEST("Sandstorm multiplies the special defense of Rock-types by 1. PARAMETRIZE{ move = MOVE_SANDSTORM; } PARAMETRIZE{ move = MOVE_CELEBRATE; } GIVEN { - ASSUME(gMovesInfo[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) ; OPPONENT(SPECIES_NOSEPASS); } WHEN { diff --git a/test/battle/weather/snow.c b/test/battle/weather/snow.c index 4725eba65173..c617f651c495 100644 --- a/test/battle/weather/snow.c +++ b/test/battle/weather/snow.c @@ -7,7 +7,7 @@ ASSUMPTIONS ASSUME(gMovesInfo[MOVE_SNOWSCAPE].effect == EFFECT_SNOWSCAPE); ASSUME(gSpeciesInfo[SPECIES_WOBBUFFET].types[0] != TYPE_ICE && gSpeciesInfo[SPECIES_WOBBUFFET].types[1] != TYPE_ICE); ASSUME(gSpeciesInfo[SPECIES_GLALIE].types[0] == TYPE_ICE || gSpeciesInfo[SPECIES_GLALIE].types[1] == TYPE_ICE); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Snow multiplies the defense of Ice-types by 1.5x", s16 damage) diff --git a/test/dynamax.c b/test/dynamax.c index 64458518abb5..d9110fea1eb9 100644 --- a/test/dynamax.c +++ b/test/dynamax.c @@ -701,8 +701,8 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) Max Knuckle raises both allies' attack") s16 damage[4]; GIVEN { ASSUME(gMovesInfo[MOVE_MAX_KNUCKLE].argument == MAX_EFFECT_RAISE_TEAM_ATTACK); - ASSUME(gMovesInfo[MOVE_CLOSE_COMBAT].category == BATTLE_CATEGORY_PHYSICAL); - ASSUME(gMovesInfo[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_CLOSE_COMBAT].category == DAMAGE_CATEGORY_PHYSICAL); + ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); @@ -1273,7 +1273,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Snooze makes only the target drowsy") PASSES_RANDOMLY(1, 2, RNG_G_MAX_SNOOZE); GIVEN { ASSUME(gMovesInfo[MOVE_G_MAX_SNOOZE].argument == MAX_EFFECT_YAWN_FOE); - ASSUME(gMovesInfo[MOVE_DARK_PULSE].category == BATTLE_CATEGORY_SPECIAL); // Otherwise, Blissey faints. + ASSUME(gMovesInfo[MOVE_DARK_PULSE].category == DAMAGE_CATEGORY_SPECIAL); // Otherwise, Blissey faints. PLAYER(SPECIES_GRIMMSNARL) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_IMPIDIMP); OPPONENT(SPECIES_BLISSEY); @@ -1394,7 +1394,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Chi Strike boosts allies' crit chance") DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Depletion takes away 2 PP from the target's last move") { GIVEN { - ASSUME(gMovesInfo[MOVE_DRAGON_CLAW].category == BATTLE_CATEGORY_PHYSICAL); // Otherwise Sableye faints. + ASSUME(gMovesInfo[MOVE_DRAGON_CLAW].category == DAMAGE_CATEGORY_PHYSICAL); // Otherwise Sableye faints. ASSUME(gMovesInfo[MOVE_G_MAX_DEPLETION].argument == MAX_EFFECT_SPITE); PLAYER(SPECIES_DURALUDON) { GigantamaxFactor(TRUE); } PLAYER(SPECIES_WYNAUT);