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

Fixes

Browse Source 
- Fix Sheer Force interaction (needed after adding | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN)
- Fix "X Transformed!" target
- Allow switching between both forms
- Allow form change if target is KO'ed
This commit is contained in:
BuffelSaft 2021-11-03 17:56:16 +13:00
parent 74c85b5818
commit 18b87416d5
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/battle_scripts_1.s
View File

@ -735,7 +735,7 @@ BattleScript_EffectAttackerDefenseDownHit:
goto BattleScript_EffectHit goto BattleScript_EffectHit
BattleScript_EffectRelicSong: BattleScript_EffectRelicSong:
setmoveeffect MOVE_EFFECT_RELIC_SONG | MOVE_EFFECT_CERTAIN setmoveeffect MOVE_EFFECT_RELIC_SONG | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
attackcanceler attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring attackstring
@ -6966,6 +6966,7 @@ BattleScript_AttackerFormChangeMoveEffect::
handleformchange BS_ATTACKER, 1 handleformchange BS_ATTACKER, 1
playanimation BS_ATTACKER, B_ANIM_FORM_CHANGE, NULL playanimation BS_ATTACKER, B_ANIM_FORM_CHANGE, NULL
waitanimation waitanimation
copybyte sBATTLER, gBattlerAttacker
printstring STRINGID_PKMNTRANSFORMED printstring STRINGID_PKMNTRANSFORMED
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
handleformchange BS_ATTACKER, 2 handleformchange BS_ATTACKER, 2

14
src/battle_script_commands.c
View File

@ -3394,10 +3394,18 @@ void SetMoveEffect(bool32 primary, u32 certain)
} }
break; break;
case MOVE_EFFECT_RELIC_SONG: case MOVE_EFFECT_RELIC_SONG:
if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA) if (GetBattlerAbility(gBattlerAttacker) != ABILITY_SHEER_FORCE)
{ {
gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA_PIROUETTE; if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA)
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeMoveEffect); {
gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA_PIROUETTE;
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeMoveEffect);
}
else if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA_PIROUETTE)
{
gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA;
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeMoveEffect);
}
} }
break; break;
} }