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

Fix Clangourous Soul

Browse Source 
I broke this while trying to tidy up the code, it worked perfectly before. Also, make sure the "recoil' doesn't break Disguise.
This commit is contained in:
BuffelSaft 2021-11-04 21:50:42 +13:00
parent ecbe048f96
commit c9ae140bd1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -405,7 +405,7 @@ BattleScript_EffectClangorousSoul:
attackstring attackstring
ppreduce ppreduce
cutonethirdhpraisestats BattleScript_ButItFailed cutonethirdhpraisestats BattleScript_ButItFailed
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
attackanimation attackanimation
waitanimation waitanimation
healthbarupdate BS_ATTACKER healthbarupdate BS_ATTACKER

2
src/battle_script_commands.c
View File

@ -9038,7 +9038,7 @@ static void Cmd_various(void)
{ {
bool8 atLeastOneStatBoosted = FALSE; bool8 atLeastOneStatBoosted = FALSE;
bool8 hasContrary = (GetBattlerAbility(gBattlerAttacker) == ABILITY_CONTRARY); bool8 hasContrary = (GetBattlerAbility(gBattlerAttacker) == ABILITY_CONTRARY);
u16 hpFraction = min(1, gBattleMons[gBattlerAttacker].maxHP / 3); u16 hpFraction = max(1, gBattleMons[gBattlerAttacker].maxHP / 3);
for (i = 1; i < NUM_STATS; i++) for (i = 1; i < NUM_STATS; i++)
{ {