ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 08:32:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Review changes 2

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2020-11-14 09:01:43 -03:00
parent e87f0f1ddb
commit f0154028ff
4 changed files with 274 additions and 456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

14
src/data/battle_moves.h
View File

@ -10321,11 +10321,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
#if B_UPDATED_MOVE_DATA >= GEN_8 #if B_UPDATED_MOVE_DATA >= GEN_8
.power = 80, .power = 80,
.pp = 10, .pp = 10,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else #else
.power = 50, .power = 50,
.pp = 15, .pp = 15,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif #endif
.effect = EFFECT_ALWAYS_CRIT, .effect = EFFECT_ALWAYS_CRIT,
.type = TYPE_ELECTRIC, .type = TYPE_ELECTRIC,
@ -10339,9 +10339,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SPLISHY_SPLASH] = [MOVE_SPLISHY_SPLASH] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_8 #if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else #else
.flags = FLAG_PROTECT_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif #endif
.effect = EFFECT_PARALYZE_HIT, .effect = EFFECT_PARALYZE_HIT,
.power = 90, .power = 90,
@ -10396,6 +10396,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 60, .power = 60,
.pp = 20, .pp = 20,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.argument = 100, // restores 100% HP instead of 50% HP
#else #else
.power = 90, .power = 90,
.pp = 15, .pp = 15,
@ -10408,7 +10409,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.split = SPLIT_SPECIAL, .split = SPLIT_SPECIAL,
.argument = 100, // restores 100% HP instead of 50% HP
}, },
[MOVE_BUZZY_BUZZ] = [MOVE_BUZZY_BUZZ] =
@ -10497,12 +10497,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 100, .power = 100,
.accuracy = 90, .accuracy = 90,
.pp = 10, .pp = 10,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else #else
.power = 90, .power = 90,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 15,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif #endif
.effect = EFFECT_PLACEHOLDER, //TODO (Leech Seed + Hit) .effect = EFFECT_PLACEHOLDER, //TODO (Leech Seed + Hit)
.type = TYPE_GRASS, .type = TYPE_GRASS,

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

@ -2639,7 +2639,11 @@ static const u8 sPIKA_PAPOWDescription[] = _(
static const u8 sBOUNCY_BUBBLEDescription[] = _( static const u8 sBOUNCY_BUBBLEDescription[] = _(
"An attack that absorbs\n" "An attack that absorbs\n"
#if B_UPDATED_MOVE_DATA >= GEN_8
"all the damage inflicted."); "all the damage inflicted.");
#else
"half the damage inflicted.");
#endif
static const u8 sBUZZY_BUZZDescription[] = _( static const u8 sBUZZY_BUZZDescription[] = _(
"Shoots a jolt of electricity\n" "Shoots a jolt of electricity\n"
@ -2835,7 +2839,7 @@ static const u8 sMETEOR_BEAMDescription[] = _(
"Sp. Attack before attacking."); "Sp. Attack before attacking.");
static const u8 sSHELL_SIDE_ARMDescription[] = _( static const u8 sSHELL_SIDE_ARMDescription[] = _(
"Uses higher of physical and \n" "Uses higher of physical and\n"
"special damage. May poison."); "special damage. May poison.");
static const u8 sMISTY_EXPLOSIONDescription[] = _( static const u8 sMISTY_EXPLOSIONDescription[] = _(
@ -2856,7 +2860,7 @@ static const u8 sTERRAIN_PULSEDescription[] = _(
static const u8 sSKITTER_SMACKDescription[] = _( static const u8 sSKITTER_SMACKDescription[] = _(
"User skitters behind foe to\n" "User skitters behind foe to\n"
"attack. Lowers foe’s Sp. Atk."); "attack. Lowers foe's Sp. Atk.");
static const u8 sBURNING_JEALOUSYDescription[] = _( static const u8 sBURNING_JEALOUSYDescription[] = _(
"Foes that have stats upped\n" "Foes that have stats upped\n"
@ -2867,7 +2871,7 @@ static const u8 sLASH_OUTDescription[] = _(
"turn, power is doubled."); "turn, power is doubled.");
static const u8 sPOLTERGEISTDescription[] = _( static const u8 sPOLTERGEISTDescription[] = _(
"Control foe’s item to attack.\n" "Control foe's item to attack.\n"
"Fails if foe has no item."); "Fails if foe has no item.");
static const u8 sCORROSIVE_GASDescription[] = _( static const u8 sCORROSIVE_GASDescription[] = _(