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

Review corrections

Browse Source 
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
This commit is contained in:
LOuroboros 2021-01-07 04:30:34 -03:00
parent 3246c20be5
commit 339aa95c1d
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -7154,7 +7154,7 @@ BattleScript_TargetsStatWasMaxedOut::
BattleScript_BattlerAbilityStatRaiseOnSwitchIn:: BattleScript_BattlerAbilityStatRaiseOnSwitchIn::
copybyte gBattlerAbility, gBattlerAttacker copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
setgraphicalstatchangevalues setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation waitanimation

4
src/battle_script_commands.c
View File

@ -12008,10 +12008,8 @@ static void Cmd_handleballthrow(void)
else // not caught else // not caught
{ {
if (!gHasFetchedBall) if (!gHasFetchedBall)
{
gLastUsedBall = gLastUsedItem; gLastUsedBall = gLastUsedItem;
gBattleResults.catchAttempts[gLastUsedBall]++;
}
if (IsCriticalCapture()) if (IsCriticalCapture())
gBattleCommunication[MULTISTRING_CHOOSER] = shakes + 3; gBattleCommunication[MULTISTRING_CHOOSER] = shakes + 3;
else else

2
src/battle_util.c
View File

@ -4131,7 +4131,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
break; break;
case ABILITY_BALL_FETCH: case ABILITY_BALL_FETCH:
if (gBattleMons[battler].item == ITEM_NONE if (gBattleMons[battler].item == ITEM_NONE
&& gBattleResults.catchAttempts[gLastUsedBall] >= 1 && gBattleResults.catchAttempts[gLastUsedBall - ITEM_ULTRA_BALL] >= 1
&& !gHasFetchedBall) && !gHasFetchedBall)
{ {
gBattleScripting.battler = battler; gBattleScripting.battler = battler;