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

Rename an erroneously named battlescript

Browse Source
This commit is contained in:
DizzyEggg 2019-03-05 17:06:29 +01:00
parent cb2922e7d7
commit b150091436
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -3876,7 +3876,7 @@ BattleScript_MoveUsedIsInLove::
status2animation BS_ATTACKER, STATUS2_INFATUATION status2animation BS_ATTACKER, STATUS2_INFATUATION
return return
BattleScript_MoveUsedIsParalyzedCantAttack:: BattleScript_MoveUsedIsInLoveCantAttack::
printstring STRINGID_PKMNIMMOBILIZEDBYLOVE printstring STRINGID_PKMNIMMOBILIZEDBYLOVE
waitmessage 0x40 waitmessage 0x40
goto BattleScript_MoveEnd goto BattleScript_MoveEnd

2
include/battle_scripts.h
View File

@ -115,7 +115,7 @@ extern const u8 BattleScript_PrintPayDayMoneyString[];
extern const u8 BattleScript_WrapTurnDmg[]; extern const u8 BattleScript_WrapTurnDmg[];
extern const u8 BattleScript_WrapEnds[]; extern const u8 BattleScript_WrapEnds[];
extern const u8 BattleScript_MoveUsedIsInLove[]; extern const u8 BattleScript_MoveUsedIsInLove[];
extern const u8 BattleScript_MoveUsedIsParalyzedCantAttack[]; extern const u8 BattleScript_MoveUsedIsInLoveCantAttack[];
extern const u8 BattleScript_NightmareTurnDmg[]; extern const u8 BattleScript_NightmareTurnDmg[];
extern const u8 BattleScript_CurseTurnDmg[]; extern const u8 BattleScript_CurseTurnDmg[];
extern const u8 BattleScript_TargetPRLZHeal[]; extern const u8 BattleScript_TargetPRLZHeal[];

2
src/battle_util.c
View File

@ -1526,7 +1526,7 @@ u8 AtkCanceller_UnableToUseMove(void)
} }
else else
{ {
BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack); BattleScriptPush(BattleScript_MoveUsedIsInLoveCantAttack);
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
gProtectStructs[gBattlerAttacker].loveImmobility = 1; gProtectStructs[gBattlerAttacker].loveImmobility = 1;
CancelMultiTurnMoves(gBattlerAttacker); CancelMultiTurnMoves(gBattlerAttacker);