ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 13:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Pika Papow's name.

Browse Source
This commit is contained in:
Eduardo Quezada 2020-10-19 11:45:54 -03:00
parent 47259092e3
commit 8f9659f846
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_anim_scripts.s
View File

@ -695,7 +695,7 @@ gBattleAnims_Moves::
.4byte Move_ZIPPY_ZAP .4byte Move_ZIPPY_ZAP
.4byte Move_SPLISHY_SPLASH .4byte Move_SPLISHY_SPLASH
.4byte Move_FLOATY_FALL .4byte Move_FLOATY_FALL
.4byte Move_PIKA_POW .4byte Move_PIKA_PAPOW
.4byte Move_BOUNCY_BUBBLE .4byte Move_BOUNCY_BUBBLE
.4byte Move_BUZZY_BUZZ .4byte Move_BUZZY_BUZZ
.4byte Move_SIZZLY_SLIDE .4byte Move_SIZZLY_SLIDE
@ -13218,7 +13218,7 @@ Move_SPLISHY_SPLASH::
Move_FLOATY_FALL:: Move_FLOATY_FALL::
end @to do: end @to do:
Move_PIKA_POW:: Move_PIKA_PAPOW::
end @to do: end @to do:
Move_BOUNCY_BUBBLE:: Move_BOUNCY_BUBBLE::

2
include/constants/moves.h
View File

@ -696,7 +696,7 @@
#define MOVE_ZIPPY_ZAP 676 #define MOVE_ZIPPY_ZAP 676
#define MOVE_SPLISHY_SPLASH 677 #define MOVE_SPLISHY_SPLASH 677
#define MOVE_FLOATY_FALL 678 #define MOVE_FLOATY_FALL 678
#define MOVE_PIKA_POW 679 #define MOVE_PIKA_PAPOW 679
#define MOVE_BOUNCY_BUBBLE 680 #define MOVE_BOUNCY_BUBBLE 680
#define MOVE_BUZZY_BUZZ 681 #define MOVE_BUZZY_BUZZ 681
#define MOVE_SIZZLY_SLIDE 682 #define MOVE_SIZZLY_SLIDE 682

4
src/data/battle_moves.h
View File

@ -9528,11 +9528,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
}, },
[MOVE_PIKA_POW] = [MOVE_PIKA_PAPOW] =
{ {
.effect = EFFECT_RETURN, .effect = EFFECT_RETURN,
.power = 1, .power = 1,
.type = TYPE_FLYING, .type = TYPE_ELECTRIC,
.accuracy = 0, .accuracy = 0,
.pp = 20, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,

4
src/data/text/move_descriptions.h
View File

@ -2633,7 +2633,7 @@ static const u8 sFLOATY_FALLDescription[] = _(
"Floats in the air to fall as\n" "Floats in the air to fall as\n"
"an attack. May cause flinch."); "an attack. May cause flinch.");
static const u8 sPIKA_POWDescription[] = _( static const u8 sPIKA_PAPOWDescription[] = _(
"Pikachu's love increases its\n" "Pikachu's love increases its\n"
"power. It never misses."); "power. It never misses.");
@ -3590,7 +3590,7 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] =
[MOVE_ZIPPY_ZAP - 1] = sZIPPY_ZAPDescription, [MOVE_ZIPPY_ZAP - 1] = sZIPPY_ZAPDescription,
[MOVE_SPLISHY_SPLASH - 1] = sSPLISHY_SPLASHDescription, [MOVE_SPLISHY_SPLASH - 1] = sSPLISHY_SPLASHDescription,
[MOVE_FLOATY_FALL - 1] = sFLOATY_FALLDescription, [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_BOUNCY_BUBBLE - 1] = sBOUNCY_BUBBLEDescription,
[MOVE_BUZZY_BUZZ - 1] = sBUZZY_BUZZDescription, [MOVE_BUZZY_BUZZ - 1] = sBUZZY_BUZZDescription,
[MOVE_SIZZLY_SLIDE - 1] = sSIZZLY_SLIDEDescription, [MOVE_SIZZLY_SLIDE - 1] = sSIZZLY_SLIDEDescription,

2
src/data/text/move_names.h
View File

@ -679,7 +679,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_ZIPPY_ZAP] = _("Zippy Zap"), [MOVE_ZIPPY_ZAP] = _("Zippy Zap"),
[MOVE_SPLISHY_SPLASH] = _("SplishSplash"), [MOVE_SPLISHY_SPLASH] = _("SplishSplash"),
[MOVE_FLOATY_FALL] = _("Floaty Fall"), [MOVE_FLOATY_FALL] = _("Floaty Fall"),
[MOVE_PIKA_POW] = _("Pika Pow"), [MOVE_PIKA_PAPOW] = _("Pika Papow"),
[MOVE_BOUNCY_BUBBLE] = _("BouncyBubble"), [MOVE_BOUNCY_BUBBLE] = _("BouncyBubble"),
[MOVE_BUZZY_BUZZ] = _("Buzzy Buzz"), [MOVE_BUZZY_BUZZ] = _("Buzzy Buzz"),
[MOVE_SIZZLY_SLIDE] = _("Sizzly Slide"), [MOVE_SIZZLY_SLIDE] = _("Sizzly Slide"),