diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-03-05 10:41:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 10:41:30 -0600 |
| commit | 842e3c8b424054319cce899f07352bd5f521c156 (patch) | |
| tree | d09bad90104905f20b3adfe797d8cd09c024265e | |
| parent | fd4a0c499d7884bbde09664e947f7f5772867cf2 (diff) | |
| parent | b150091436a97178675f40bfccf737a08f215ad8 (diff) | |
Merge pull request #605 from DizzyEggg/rename
Rename an erroneously named battlescript
| -rw-r--r-- | data/battle_scripts_1.s | 2 | ||||
| -rw-r--r-- | include/battle_scripts.h | 2 | ||||
| -rw-r--r-- | src/battle_util.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0159a3f73..b0c753752 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3876,7 +3876,7 @@ BattleScript_MoveUsedIsInLove:: status2animation BS_ATTACKER, STATUS2_INFATUATION return -BattleScript_MoveUsedIsParalyzedCantAttack:: +BattleScript_MoveUsedIsInLoveCantAttack:: printstring STRINGID_PKMNIMMOBILIZEDBYLOVE waitmessage 0x40 goto BattleScript_MoveEnd diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 5f314401a..cac3a7652 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -115,7 +115,7 @@ extern const u8 BattleScript_PrintPayDayMoneyString[]; extern const u8 BattleScript_WrapTurnDmg[]; extern const u8 BattleScript_WrapEnds[]; extern const u8 BattleScript_MoveUsedIsInLove[]; -extern const u8 BattleScript_MoveUsedIsParalyzedCantAttack[]; +extern const u8 BattleScript_MoveUsedIsInLoveCantAttack[]; extern const u8 BattleScript_NightmareTurnDmg[]; extern const u8 BattleScript_CurseTurnDmg[]; extern const u8 BattleScript_TargetPRLZHeal[]; diff --git a/src/battle_util.c b/src/battle_util.c index fc6042b65..aa88cf952 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1526,7 +1526,7 @@ u8 AtkCanceller_UnableToUseMove(void) } else { - BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack); + BattleScriptPush(BattleScript_MoveUsedIsInLoveCantAttack); gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; gProtectStructs[gBattlerAttacker].loveImmobility = 1; CancelMultiTurnMoves(gBattlerAttacker); |