From 4c05520bf3570997e52a6b2619401ffc154995fd Mon Sep 17 00:00:00 2001 From: Syreldar Date: Fri, 24 Sep 2021 16:02:26 +0200 Subject: [PATCH] Fixed Retaliate's naming. --- data/battle_anim_scripts.s | 4 ++-- data/battle_scripts_1.s | 2 +- include/constants/battle_move_effects.h | 2 +- src/battle_util.c | 2 +- src/data/battle_moves.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d274717dca..32f089102b 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -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 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a272f6753e..c5c013db1c 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -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 diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 760ee66fd2..440e6e76b6 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -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 diff --git a/src/battle_util.c b/src/battle_util.c index e669bfa037..ee1bfe551d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -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: diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 097f9e07db..a7a2752e00 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -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,