ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wicked Torque effect

Browse Source
This commit is contained in:
Bassoonian 2022-11-18 22:00:21 +01:00
parent d4c92a0a19
commit 3ac3cb249e
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/battle_scripts_1.s
View File

@ -412,6 +412,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectExtremeEvoboost @ EFFECT_EXTREME_EVOBOOST .4byte BattleScript_EffectExtremeEvoboost @ EFFECT_EXTREME_EVOBOOST
.4byte BattleScript_EffectTerrainHit @ EFFECT_DAMAGE_SET_TERRAIN .4byte BattleScript_EffectTerrainHit @ EFFECT_DAMAGE_SET_TERRAIN
.4byte BattleScript_EffectDarkVoid @ EFFECT_DARK_VOID .4byte BattleScript_EffectDarkVoid @ EFFECT_DARK_VOID
.4byte BattleScript_EffectSleepHit @ EFFECT_SLEEP_HIT
BattleScript_AffectionBasedEndurance:: BattleScript_AffectionBasedEndurance::
playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON
@ -3201,6 +3202,10 @@ BattleScript_EffectBurnHit::
setmoveeffect MOVE_EFFECT_BURN setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectHit goto BattleScript_EffectHit
BattleScript_EffectSleepHit::
setmoveeffect MOVE_EFFECT_SLEEP
goto BattleScript_EffectHit
BattleScript_EffectFreezeHit:: BattleScript_EffectFreezeHit::
setmoveeffect MOVE_EFFECT_FREEZE setmoveeffect MOVE_EFFECT_FREEZE
goto BattleScript_EffectHit goto BattleScript_EffectHit

3
include/constants/battle_move_effects.h
View File

@ -393,7 +393,8 @@
#define EFFECT_EXTREME_EVOBOOST 387 #define EFFECT_EXTREME_EVOBOOST 387
#define EFFECT_DAMAGE_SET_TERRAIN 388 // genesis supernova #define EFFECT_DAMAGE_SET_TERRAIN 388 // genesis supernova
#define EFFECT_DARK_VOID 389 #define EFFECT_DARK_VOID 389
#define EFFECT_SLEEP_HIT 390
#define NUM_BATTLE_MOVE_EFFECTS 389 #define NUM_BATTLE_MOVE_EFFECTS 391
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

3
src/battle_tv.c
View File

@ -299,7 +299,8 @@ static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] =
[EFFECT_WATER_SPORT] = 4, [EFFECT_WATER_SPORT] = 4,
[EFFECT_CALM_MIND] = 1, [EFFECT_CALM_MIND] = 1,
[EFFECT_DRAGON_DANCE] = 1, [EFFECT_DRAGON_DANCE] = 1,
[EFFECT_CAMOUFLAGE] = 3 [EFFECT_CAMOUFLAGE] = 3,
[EFFECT_SLEEP_HIT] = 1,
}; };
static const u16 sPoints_Effectiveness[] = static const u16 sPoints_Effectiveness[] =

4
src/data/battle_moves.h
View File

@ -14435,12 +14435,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_WICKED_TORQUE] = [MOVE_WICKED_TORQUE] =
{ {
.effect = EFFECT_PLACEHOLDER, // EFFECT_SLEEP_HIT .effect = EFFECT_SLEEP_HIT,
.power = 80, .power = 80,
.type = TYPE_DARK, .type = TYPE_DARK,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 10,
.secondaryEffectChance = 10, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED, .flags = FLAG_PROTECT_AFFECTED,