ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented missing Neuroforce. (#242)

Browse Source 
* Added ID, name and description.

* Added damage multiplier.
This commit is contained in:
Eduardo Alvaro Quezada D'Ottone 2020-01-18 14:34:04 -03:00 committed by DizzyEggg
parent 000a709363
commit b87dac459b
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/constants/abilities.h
View File

@ -251,8 +251,9 @@
#define ABILITY_FULL_METAL_BODY 231 #define ABILITY_FULL_METAL_BODY 231
#define ABILITY_SHADOW_SHIELD 232 #define ABILITY_SHADOW_SHIELD 232
#define ABILITY_PRISM_ARMOR 233 #define ABILITY_PRISM_ARMOR 233
#define ABILITY_NEUROFORCE 234
#define ABILITIES_COUNT_GEN7 234 #define ABILITIES_COUNT_GEN7 235
#define ABILITIES_COUNT ABILITIES_COUNT_GEN6 #define ABILITIES_COUNT ABILITIES_COUNT_GEN6

4
src/battle_util.c
View File

@ -5913,6 +5913,10 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move
if (isCrit) if (isCrit)
MulModifier(&finalModifier, UQ_4_12(1.5)); MulModifier(&finalModifier, UQ_4_12(1.5));
break; break;
case ABILITY_NEUROFORCE:
if (typeEffectivenessModifier >= UQ_4_12(2.0))
MulModifier(&finalModifier, UQ_4_12(1.25));
break;
} }
// target's abilities // target's abilities

3
src/data/text/abilities.h
View File

@ -220,6 +220,7 @@ static const u8 sPsychicSurgeDescription[] = _("Field becomes weird.");
static const u8 sMistySurgeDescription[] = _("Field becomes misty."); static const u8 sMistySurgeDescription[] = _("Field becomes misty.");
static const u8 sGrassySurgeDescription[] = _("Field becomes grassy."); static const u8 sGrassySurgeDescription[] = _("Field becomes grassy.");
static const u8 sFullMetalBodyDescription[] = _("Prevents stat reduction."); static const u8 sFullMetalBodyDescription[] = _("Prevents stat reduction.");
static const u8 sNeuroforceDescription[] = _("Ups “super effective.“.");
const u8 gAbilityNames[ABILITIES_COUNT_GEN7][ABILITY_NAME_LENGTH + 1] = const u8 gAbilityNames[ABILITIES_COUNT_GEN7][ABILITY_NAME_LENGTH + 1] =
{ {
@ -457,6 +458,7 @@ const u8 gAbilityNames[ABILITIES_COUNT_GEN7][ABILITY_NAME_LENGTH + 1] =
[ABILITY_FULL_METAL_BODY] = _("FullMetalBod"), [ABILITY_FULL_METAL_BODY] = _("FullMetalBod"),
[ABILITY_SHADOW_SHIELD] = _("ShadowShield"), [ABILITY_SHADOW_SHIELD] = _("ShadowShield"),
[ABILITY_PRISM_ARMOR] = _("Prism Armor"), [ABILITY_PRISM_ARMOR] = _("Prism Armor"),
[ABILITY_NEUROFORCE] = _("Neuroforce"),
}; };
const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT_GEN7] = const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT_GEN7] =
@ -695,4 +697,5 @@ const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT_GEN7] =
[ABILITY_FULL_METAL_BODY] = sFullMetalBodyDescription, [ABILITY_FULL_METAL_BODY] = sFullMetalBodyDescription,
[ABILITY_SHADOW_SHIELD] = sMultiscaleDescription, [ABILITY_SHADOW_SHIELD] = sMultiscaleDescription,
[ABILITY_PRISM_ARMOR] = sFilterDescription, [ABILITY_PRISM_ARMOR] = sFilterDescription,
[ABILITY_NEUROFORCE] = sNeuroforceDescription,
}; };