diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 370fa78db..11bff94e5 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -695,7 +695,7 @@ gBattleAnims_Moves:: .4byte Move_ZIPPY_ZAP .4byte Move_SPLISHY_SPLASH .4byte Move_FLOATY_FALL - .4byte Move_PIKA_POW + .4byte Move_PIKA_PAPOW .4byte Move_BOUNCY_BUBBLE .4byte Move_BUZZY_BUZZ .4byte Move_SIZZLY_SLIDE @@ -13218,7 +13218,7 @@ Move_SPLISHY_SPLASH:: Move_FLOATY_FALL:: end @to do: -Move_PIKA_POW:: +Move_PIKA_PAPOW:: end @to do: Move_BOUNCY_BUBBLE:: diff --git a/include/constants/moves.h b/include/constants/moves.h index a45392851..b40abf5c3 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -696,7 +696,7 @@ #define MOVE_ZIPPY_ZAP 676 #define MOVE_SPLISHY_SPLASH 677 #define MOVE_FLOATY_FALL 678 -#define MOVE_PIKA_POW 679 +#define MOVE_PIKA_PAPOW 679 #define MOVE_BOUNCY_BUBBLE 680 #define MOVE_BUZZY_BUZZ 681 #define MOVE_SIZZLY_SLIDE 682 diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 12abc0881..5f71bb317 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -9528,11 +9528,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .split = SPLIT_PHYSICAL, }, - [MOVE_PIKA_POW] = + [MOVE_PIKA_PAPOW] = { .effect = EFFECT_RETURN, .power = 1, - .type = TYPE_FLYING, + .type = TYPE_ELECTRIC, .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 8fa84f95d..b1925294c 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -2633,7 +2633,7 @@ static const u8 sFLOATY_FALLDescription[] = _( "Floats in the air to fall as\n" "an attack. May cause flinch."); -static const u8 sPIKA_POWDescription[] = _( +static const u8 sPIKA_PAPOWDescription[] = _( "Pikachu's love increases its\n" "power. It never misses."); @@ -3590,7 +3590,7 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = [MOVE_ZIPPY_ZAP - 1] = sZIPPY_ZAPDescription, [MOVE_SPLISHY_SPLASH - 1] = sSPLISHY_SPLASHDescription, [MOVE_FLOATY_FALL - 1] = sFLOATY_FALLDescription, - [MOVE_PIKA_POW - 1] = sPIKA_POWDescription, + [MOVE_PIKA_PAPOW - 1] = sPIKA_PAPOWDescription, [MOVE_BOUNCY_BUBBLE - 1] = sBOUNCY_BUBBLEDescription, [MOVE_BUZZY_BUZZ - 1] = sBUZZY_BUZZDescription, [MOVE_SIZZLY_SLIDE - 1] = sSIZZLY_SLIDEDescription, diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 26be0f8e4..3de2e6041 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -679,7 +679,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ZIPPY_ZAP] = _("Zippy Zap"), [MOVE_SPLISHY_SPLASH] = _("SplishSplash"), [MOVE_FLOATY_FALL] = _("Floaty Fall"), - [MOVE_PIKA_POW] = _("Pika Pow"), + [MOVE_PIKA_PAPOW] = _("Pika Papow"), [MOVE_BOUNCY_BUBBLE] = _("BouncyBubble"), [MOVE_BUZZY_BUZZ] = _("Buzzy Buzz"), [MOVE_SIZZLY_SLIDE] = _("Sizzly Slide"),