ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-20 19:23:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1682 from Syreldar/fix-retaliate-naming

Browse Source 
Fixed Retaliate's naming.
This commit is contained in:
Eduardo Quezada D'Ottone 2021-09-25 11:53:04 -03:00 committed by GitHub
commit 6f9d862fd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_anim_scripts.s
View File

@ -532,7 +532,7 @@ gBattleAnims_Moves::
.4byte Move_QUASH
.4byte Move_ACROBATICS
.4byte Move_REFLECT_TYPE
.4byte Move_RETALITATE
.4byte Move_RETALIATE
.4byte Move_FINAL_GAMBIT
.4byte Move_BESTOW
.4byte Move_INFERNO
@ -5610,7 +5610,7 @@ Move_REFLECT_TYPE:
blendoff
end
Move_RETALITATE:
Move_RETALIATE:
loadspritegfx ANIM_TAG_CUT @Cut
monbg ANIM_DEF_PARTNER
setalpha 9, 8

2
data/battle_scripts_1.s
View File

@ -252,7 +252,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_ROUND
.4byte BattleScript_EffectHit @ EFFECT_BRINE
.4byte BattleScript_EffectHit @ EFFECT_VENOSHOCK
.4byte BattleScript_EffectHit @ EFFECT_RETALITATE
.4byte BattleScript_EffectHit @ EFFECT_RETALIATE
.4byte BattleScript_EffectBulldoze @ EFFECT_BULLDOZE
.4byte BattleScript_EffectHit @ EFFECT_FOUL_PLAY
.4byte BattleScript_EffectHit @ EFFECT_PSYSHOCK

2
include/constants/battle_move_effects.h
View File

@ -236,7 +236,7 @@
#define EFFECT_ROUND 230
#define EFFECT_BRINE 231
#define EFFECT_VENOSHOCK 232
#define EFFECT_RETALITATE 233
#define EFFECT_RETALIATE 233
#define EFFECT_BULLDOZE 234
#define EFFECT_FOUL_PLAY 235
#define EFFECT_PSYSHOCK 236

2
src/battle_util.c
View File

@ -7778,7 +7778,7 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe
if (gBattleMons[battlerDef].status1 & STATUS1_PSN_ANY)
MulModifier(&modifier, UQ_4_12(2.0));
break;
case EFFECT_RETALITATE:
case EFFECT_RETALIATE:
// todo
break;
case EFFECT_SOLARBEAM:

2
src/data/battle_moves.h
View File

@ -8097,7 +8097,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_RETALIATE] =
{
.effect = EFFECT_RETALITATE,
.effect = EFFECT_RETALIATE,
.power = 70,
.type = TYPE_NORMAL,
.accuracy = 100,