ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 21:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
cca7ec8c58
pokeemerald/src/battle_util.c

9876 lines
385 KiB
C
Raw Normal View History

start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
#include "global.h"
#include "battle.h"
Give battle_anim files appropriate names
2019-03-31 19:15:39 +02:00
#include "battle_anim.h"
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
#include "battle_arena.h"
#include "battle_pyramid.h"
#include "battle_util.h"
Merge with master
2018-11-15 21:53:32 +01:00
#include "battle_controllers.h"
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
#include "battle_interface.h"
New feature - battle 2 vs 1 opponent
2019-01-27 20:54:34 +01:00
#include "battle_setup.h"
Illusion
2019-08-08 13:06:55 +02:00
#include "party_menu.h"
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
#include "pokemon.h"
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
#include "international_string_util.h"
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
#include "item.h"
#include "util.h"
dump battlescripts, rename battlescripts
2017-11-25 18:42:31 +01:00
#include "battle_scripts.h"
rename rng.c to random.c and rom4.c to overworld.c
2017-12-05 19:27:33 +01:00
#include "random.h"
Undo PokeCodec's PRs This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.
2020-09-13 09:22:50 +02:00
#include "text.h"
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
#include "safari_zone.h"
#include "sound.h"
#include "sprite.h"
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
#include "string_util.h"
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
#include "task.h"
#include "trig.h"
#include "window.h"
Undo PokeCodec's PRs This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.
2020-09-13 09:22:50 +02:00
#include "battle_message.h"
Ai_TryOnAlly and reorganize files
2020-12-20 22:47:20 +01:00
#include "battle_ai_main.h"
outline AI_CheckGoodMove
2020-12-16 05:57:33 +01:00
#include "battle_ai_util.h"
decompile battle 3
2017-09-17 17:14:32 +02:00
#include "event_data.h"
battle 2 is done
2017-10-06 17:06:45 +02:00
#include "link.h"
Forewarn
2020-04-28 15:36:13 +02:00
#include "malloc.h"
fix flavour flavor not building, fuccing americans
2017-11-27 21:24:34 +01:00
#include "berry.h"
Important battle util functions
2018-07-14 16:41:14 +02:00
#include "pokedex.h"
Bestow
2018-09-30 12:27:51 +02:00
#include "mail.h"
Clean up field weather
2018-12-08 19:43:21 +01:00
#include "field_weather.h"
Use misc ScrCmd constants
2019-09-16 05:47:07 +02:00
#include "constants/abilities.h"
#include "constants/battle_anim.h"
Fix AI trying to switch when it can't, also ghosts can escape
2020-02-08 14:20:02 +01:00
#include "constants/battle_config.h"
Use misc ScrCmd constants
2019-09-16 05:47:07 +02:00
#include "constants/battle_move_effects.h"
#include "constants/battle_script_commands.h"
#include "constants/battle_string_ids.h"
#include "constants/hold_effects.h"
#include "constants/items.h"
#include "constants/moves.h"
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
#include "constants/songs.h"
Use misc ScrCmd constants
2019-09-16 05:47:07 +02:00
#include "constants/species.h"
Reincorporated badge based stat boosts
2020-10-21 16:44:03 +02:00
#include "constants/trainers.h"
Use misc ScrCmd constants
2019-09-16 05:47:07 +02:00
#include "constants/weather.h"
battle 2 is done
2017-10-06 17:06:45 +02:00
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 21:00:23 +02:00
extern struct Evolution gEvolutionTable[][EVOS_PER_MON];
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
/*
NOTE: The data and functions in this file up until (but not including) sSoundMovesTable
are actually part of battle_main.c. They needed to be moved to this file in order to
match the ROM; this is also why sSoundMovesTable's declaration is in the middle of
functions instead of at the top of the file with the other declarations.
*/
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
static bool32 TryRemoveScreens(u8 battler);
add neigh and as one abilities
2021-01-06 03:37:23 +01:00
static bool32 IsUnnerveAbilityOnOpposingSide(u8 battlerId);
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
extern const u8 *const gBattleScriptsForMoveEffects[];
extern const u8 *const gBattlescriptsForBallThrow[];
extern const u8 *const gBattlescriptsForRunningByItem[];
extern const u8 *const gBattlescriptsForUsingItem[];
extern const u8 *const gBattlescriptsForSafariActions[];
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
static const u8 sPkblToEscapeFactor[][3] = {
{
[B_MSG_MON_CURIOUS] = 0,
[B_MSG_MON_ENTHRALLED] = 0,
[B_MSG_MON_IGNORED] = 0
},{
[B_MSG_MON_CURIOUS] = 3,
[B_MSG_MON_ENTHRALLED] = 5,
[B_MSG_MON_IGNORED] = 0
},{
[B_MSG_MON_CURIOUS] = 2,
[B_MSG_MON_ENTHRALLED] = 3,
[B_MSG_MON_IGNORED] = 0
},{
[B_MSG_MON_CURIOUS] = 1,
[B_MSG_MON_ENTHRALLED] = 2,
[B_MSG_MON_IGNORED] = 0
},{
[B_MSG_MON_CURIOUS] = 1,
[B_MSG_MON_ENTHRALLED] = 1,
[B_MSG_MON_IGNORED] = 0
}
};
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
static const u8 sGoNearCounterToCatchFactor[] = {4, 3, 2, 1};
static const u8 sGoNearCounterToEscapeFactor[] = {4, 4, 4, 4};
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
static const u16 sSkillSwapBannedAbilities[] =
check bad move
2020-12-13 23:02:21 +01:00
{
ABILITY_WONDER_GUARD,
ABILITY_MULTITYPE,
ABILITY_ILLUSION,
ABILITY_STANCE_CHANGE,
ABILITY_SCHOOLING,
ABILITY_COMATOSE,
ABILITY_SHIELDS_DOWN,
ABILITY_DISGUISE,
ABILITY_RKS_SYSTEM,
ABILITY_BATTLE_BOND,
ABILITY_POWER_CONSTRUCT,
ABILITY_NEUTRALIZING_GAS,
ABILITY_ICE_FACE,
ABILITY_HUNGER_SWITCH,
ABILITY_GULP_MISSILE,
};
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
static const u16 sRolePlayBannedAbilities[] =
check bad move
2020-12-13 23:02:21 +01:00
{
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
ABILITY_TRACE,
check bad move
2020-12-13 23:02:21 +01:00
ABILITY_WONDER_GUARD,
ABILITY_FORECAST,
ABILITY_FLOWER_GIFT,
ABILITY_MULTITYPE,
ABILITY_ILLUSION,
ABILITY_ZEN_MODE,
ABILITY_IMPOSTER,
ABILITY_STANCE_CHANGE,
ABILITY_POWER_OF_ALCHEMY,
ABILITY_RECEIVER,
ABILITY_SCHOOLING,
ABILITY_COMATOSE,
ABILITY_SHIELDS_DOWN,
ABILITY_DISGUISE,
ABILITY_RKS_SYSTEM,
ABILITY_BATTLE_BOND,
ABILITY_POWER_CONSTRUCT,
ABILITY_ICE_FACE,
ABILITY_HUNGER_SWITCH,
ABILITY_GULP_MISSILE,
};
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
static const u16 sRolePlayBannedAttackerAbilities[] =
check bad move
2020-12-13 23:02:21 +01:00
{
ABILITY_MULTITYPE,
ABILITY_ZEN_MODE,
ABILITY_STANCE_CHANGE,
ABILITY_SCHOOLING,
ABILITY_COMATOSE,
ABILITY_SHIELDS_DOWN,
ABILITY_DISGUISE,
ABILITY_RKS_SYSTEM,
ABILITY_BATTLE_BOND,
ABILITY_POWER_CONSTRUCT,
ABILITY_ICE_FACE,
ABILITY_GULP_MISSILE,
};
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
static const u16 sWorrySeedBannedAbilities[] =
check bad move
2020-12-13 23:02:21 +01:00
{
ABILITY_MULTITYPE,
ABILITY_STANCE_CHANGE,
ABILITY_SCHOOLING,
ABILITY_COMATOSE,
ABILITY_SHIELDS_DOWN,
ABILITY_DISGUISE,
ABILITY_RKS_SYSTEM,
ABILITY_BATTLE_BOND,
ABILITY_POWER_CONSTRUCT,
ABILITY_TRUANT,
ABILITY_ICE_FACE,
ABILITY_GULP_MISSILE,
};
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
static const u16 sGastroAcidBannedAbilities[] =
check bad move
2020-12-13 23:02:21 +01:00
{
merge with be
2021-02-12 16:59:55 +01:00
ABILITY_AS_ONE_ICE_RIDER,
ABILITY_AS_ONE_SHADOW_RIDER,
ABILITY_BATTLE_BOND,
check bad move
2020-12-13 23:02:21 +01:00
ABILITY_COMATOSE,
ABILITY_DISGUISE,
ABILITY_GULP_MISSILE,
merge with be
2021-02-12 16:59:55 +01:00
ABILITY_ICE_FACE,
ABILITY_MULTITYPE,
ABILITY_POWER_CONSTRUCT,
ABILITY_RKS_SYSTEM,
ABILITY_SCHOOLING,
ABILITY_SHIELDS_DOWN,
ABILITY_STANCE_CHANGE,
ABILITY_ZEN_MODE,
check bad move
2020-12-13 23:02:21 +01:00
};
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
static const u16 sEntrainmentBannedAttackerAbilities[] =
check bad move
2020-12-13 23:02:21 +01:00
{
ABILITY_TRACE,
ABILITY_FORECAST,
ABILITY_FLOWER_GIFT,
ABILITY_ZEN_MODE,
ABILITY_ILLUSION,
ABILITY_IMPOSTER,
ABILITY_POWER_OF_ALCHEMY,
ABILITY_RECEIVER,
ABILITY_DISGUISE,
ABILITY_POWER_CONSTRUCT,
ABILITY_NEUTRALIZING_GAS,
ABILITY_ICE_FACE,
ABILITY_HUNGER_SWITCH,
ABILITY_GULP_MISSILE,
};
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
static const u16 sEntrainmentTargetSimpleBeamBannedAbilities[] =
check bad move
2020-12-13 23:02:21 +01:00
{
ABILITY_TRUANT,
ABILITY_MULTITYPE,
ABILITY_STANCE_CHANGE,
ABILITY_SCHOOLING,
ABILITY_COMATOSE,
ABILITY_SHIELDS_DOWN,
ABILITY_DISGUISE,
ABILITY_RKS_SYSTEM,
ABILITY_BATTLE_BOND,
ABILITY_ICE_FACE,
ABILITY_GULP_MISSILE,
};
merge with be, give life dew jungle healing effect
2021-07-25 16:22:05 +02:00
bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide, u32 move)
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
{
u32 ability = GetBattlerAbility(battlerAtk);
if (gSideTimers[defSide].followmeTimer == 0
|| gBattleMons[gSideTimers[defSide].followmeTarget].hp == 0
merge with be, give life dew jungle healing effect
2021-07-25 16:22:05 +02:00
|| gBattleMoves[move].effect == EFFECT_SNIPE_SHOT
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
|| ability == ABILITY_PROPELLER_TAIL || ability == ABILITY_STALWART)
return FALSE;
if (gSideTimers[defSide].followmePowder && !IsAffectedByPowder(battlerAtk, ability, GetBattlerHoldEffect(battlerAtk, TRUE)))
return FALSE;
return TRUE;
}
check bad move
2020-12-13 23:02:21 +01:00
// Functions
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
void HandleAction_UseMove(void)
{
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
u32 i, side, moveType, var = 4;
Fix and rename GetMoveTargetType Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 00:09:54 +01:00
u16 moveTarget = GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove);
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
if (gBattleStruct->field_91 & gBitTable[gBattlerAttacker] || !IsBattlerAlive(gBattlerAttacker))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
gCurrentActionFuncId = B_ACTION_FINISHED;
return;
}
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
gIsCriticalHit = FALSE;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattleStruct->atkCancellerTracker = 0;
gMoveResultFlags = 0;
gMultiHitCounter = 0;
gBattleCommunication[6] = 0;
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
gBattleScripting.savedMoveEffect = 0;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerAttacker);
// choose move
if (gProtectStructs[gBattlerAttacker].noValidMoves)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].noValidMoves = FALSE;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gCurrentMove = gChosenMove = MOVE_STRUGGLE;
gHitMarker |= HITMARKER_NO_PPDEDUCT;
*(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
}
else if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBattlerAttacker].status2 & STATUS2_RECHARGE)
{
gCurrentMove = gChosenMove = gLockedMoves[gBattlerAttacker];
}
// encore forces you to use the same move
else if (gDisableStructs[gBattlerAttacker].encoredMove != MOVE_NONE
Minor syntax tweaks to HandleAction_UseMove
2021-04-04 13:44:32 +02:00
&& gDisableStructs[gBattlerAttacker].encoredMove == gBattleMons[gBattlerAttacker].moves[gDisableStructs[gBattlerAttacker].encoredMovePos])
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
gCurrentMove = gChosenMove = gDisableStructs[gBattlerAttacker].encoredMove;
gCurrMovePos = gChosenMovePos = gDisableStructs[gBattlerAttacker].encoredMovePos;
*(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(gCurrentMove, 0);
}
// check if the encored move wasn't overwritten
else if (gDisableStructs[gBattlerAttacker].encoredMove != MOVE_NONE
Minor syntax tweaks to HandleAction_UseMove
2021-04-04 13:44:32 +02:00
&& gDisableStructs[gBattlerAttacker].encoredMove != gBattleMons[gBattlerAttacker].moves[gDisableStructs[gBattlerAttacker].encoredMovePos])
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
gCurrMovePos = gChosenMovePos = gDisableStructs[gBattlerAttacker].encoredMovePos;
gCurrentMove = gChosenMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
gDisableStructs[gBattlerAttacker].encoredMove = MOVE_NONE;
gDisableStructs[gBattlerAttacker].encoredMovePos = 0;
gDisableStructs[gBattlerAttacker].encoreTimer = 0;
*(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(gCurrentMove, 0);
}
else if (gBattleMons[gBattlerAttacker].moves[gCurrMovePos] != gChosenMoveByBattler[gBattlerAttacker])
{
gCurrentMove = gChosenMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
*(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(gCurrentMove, 0);
}
else
{
gCurrentMove = gChosenMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
}
if (gBattleMons[gBattlerAttacker].hp != 0)
{
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
gBattleResults.lastUsedMovePlayer = gCurrentMove;
else
gBattleResults.lastUsedMoveOpponent = gCurrentMove;
}
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
// Set dynamic move type.
SetTypeBeforeUsingMove(gChosenMove, gBattlerAttacker);
GET_MOVE_TYPE(gChosenMove, moveType);
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
// choose target
side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
merge with be, give life dew jungle healing effect
2021-07-25 16:22:05 +02:00
if (IsAffectedByFollowMe(gBattlerAttacker, side, gCurrentMove)
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
&& moveTarget == MOVE_TARGET_SELECTED
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
gBattlerTarget = gSideTimers[side].followmeTarget;
}
else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
Minor syntax tweaks to HandleAction_UseMove
2021-04-04 13:44:32 +02:00
&& gSideTimers[side].followmeTimer == 0
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
&& (gBattleMoves[gCurrentMove].power != 0 || moveTarget != MOVE_TARGET_USER)
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
&& ((GetBattlerAbility(*(gBattleStruct->moveTarget + gBattlerAttacker)) != ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC)
|| (GetBattlerAbility(*(gBattleStruct->moveTarget + gBattlerAttacker)) != ABILITY_STORM_DRAIN && moveType == TYPE_WATER)))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
side = GetBattlerSide(gBattlerAttacker);
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (side != GetBattlerSide(gActiveBattler)
&& *(gBattleStruct->moveTarget + gBattlerAttacker) != gActiveBattler
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
&& ((GetBattlerAbility(gActiveBattler) == ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC)
Minor syntax tweaks to HandleAction_UseMove
2021-04-04 13:44:32 +02:00
|| (GetBattlerAbility(gActiveBattler) == ABILITY_STORM_DRAIN && moveType == TYPE_WATER))
Implemented Propeller Tail
2020-12-03 03:23:34 +01:00
&& GetBattlerTurnOrderNum(gActiveBattler) < var
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
&& gBattleMoves[gCurrentMove].effect != EFFECT_SNIPE_SHOT
Implemented Stalwart
2020-12-05 18:14:26 +01:00
&& (GetBattlerAbility(gBattlerAttacker) != ABILITY_PROPELLER_TAIL
Minor syntax tweaks to HandleAction_UseMove
2021-04-04 13:44:32 +02:00
|| GetBattlerAbility(gBattlerAttacker) != ABILITY_STALWART))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
var = GetBattlerTurnOrderNum(gActiveBattler);
}
}
if (var == 4)
{
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
if (moveTarget & MOVE_TARGET_RANDOM)
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
{
if (Random() & 1)
gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
else
gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
}
else
{
if (Random() & 1)
gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
else
gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
}
}
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
else if (moveTarget & MOVE_TARGET_FOES_AND_ALLY)
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
{
for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
{
if (gBattlerTarget == gBattlerAttacker)
continue;
if (IsBattlerAlive(gBattlerTarget))
break;
}
}
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
else
{
gBattlerTarget = *(gBattleStruct->moveTarget + gBattlerAttacker);
}
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
if (!IsBattlerAlive(gBattlerTarget))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
if (GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
{
gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
}
else
{
gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_SIDE);
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
if (!IsBattlerAlive(gBattlerTarget))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
}
}
}
else
{
gActiveBattler = gBattlerByTurnOrder[var];
RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability);
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
if (GetBattlerAbility(gActiveBattler) == ABILITY_LIGHTNING_ROD)
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[gActiveBattler].lightningRodRedirected = TRUE;
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
else if (GetBattlerAbility(gActiveBattler) == ABILITY_STORM_DRAIN)
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[gActiveBattler].stormDrainRedirected = TRUE;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattlerTarget = gActiveBattler;
}
}
else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
&& moveTarget & MOVE_TARGET_RANDOM)
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
{
if (Random() & 1)
gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
else
gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
}
else
{
if (Random() & 1)
gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
else
gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
}
if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
{
gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
}
}
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
else if (moveTarget == MOVE_TARGET_ALLY)
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
{
if (IsBattlerAlive(BATTLE_PARTNER(gBattlerAttacker)))
gBattlerTarget = BATTLE_PARTNER(gBattlerAttacker);
else
gBattlerTarget = gBattlerAttacker;
}
else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
&& moveTarget == MOVE_TARGET_FOES_AND_ALLY)
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
{
for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
{
if (gBattlerTarget == gBattlerAttacker)
continue;
if (IsBattlerAlive(gBattlerTarget))
break;
}
}
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
else
{
gBattlerTarget = *(gBattleStruct->moveTarget + gBattlerAttacker);
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
if (!IsBattlerAlive(gBattlerTarget))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
if (GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
{
gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
}
else
{
gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_SIDE);
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
if (!IsBattlerAlive(gBattlerTarget))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
}
}
}
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
if (gBattleTypeFlags & BATTLE_TYPE_PALACE && gProtectStructs[gBattlerAttacker].palaceUnableToUseMove)
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
// Battle Palace, select battle script for failure to use move
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
if (gBattleMons[gBattlerAttacker].hp == 0)
{
gCurrentActionFuncId = B_ACTION_FINISHED;
return;
}
else if (gPalaceSelectionBattleScripts[gBattlerAttacker] != NULL)
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_INCAPABLE_OF_POWER;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBattlerAttacker];
gPalaceSelectionBattleScripts[gBattlerAttacker] = NULL;
}
else
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_INCAPABLE_OF_POWER;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
}
}
else
{
gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
}
if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
BattleArena_AddMindPoints(gBattlerAttacker);
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
// Record HP of each battler
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
gBattleStruct->hpBefore[i] = gBattleMons[i].hp;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
void HandleAction_Switch(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
gActionSelectionCursor[gBattlerAttacker] = 0;
gMoveSelectionCursor[gBattlerAttacker] = 0;
PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, *(gBattleStruct->field_58 + gBattlerAttacker))
gBattleScripting.battler = gBattlerAttacker;
gBattlescriptCurrInstr = BattleScript_ActionSwitch;
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
if (gBattleResults.playerSwitchesCounter < 255)
gBattleResults.playerSwitchesCounter++;
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
Remove UndoFormChangeOnSwitch Handle switching out Mimikyu Busted in UndoFormChange.
2021-07-16 07:56:53 +02:00
UndoFormChange(gBattlerPartyIndexes[gBattlerAttacker], GetBattlerSide(gBattlerAttacker), TRUE);
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
}
void HandleAction_UseItem(void)
{
gBattlerAttacker = gBattlerTarget = gBattlerByTurnOrder[gCurrentTurnActionNumber];
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
ClearFuryCutterDestinyBondGrudge(gBattlerAttacker);
Fix style, sync moved functions properly
2020-10-13 16:40:01 +02:00
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
gLastUsedItem = gBattleResources->bufferB[gBattlerAttacker][1] | (gBattleResources->bufferB[gBattlerAttacker][2] << 8);
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
if (gLastUsedItem <= LAST_BALL) // is ball
{
gBattlescriptCurrInstr = gBattlescriptsForBallThrow[gLastUsedItem];
}
else if (gLastUsedItem == ITEM_POKE_DOLL || gLastUsedItem == ITEM_FLUFFY_TAIL)
{
gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0];
}
else if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
{
gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
}
else
{
gBattleScripting.battler = gBattlerAttacker;
switch (*(gBattleStruct->AI_itemType + (gBattlerAttacker >> 1)))
{
case AI_ITEM_FULL_RESTORE:
case AI_ITEM_HEAL_HP:
break;
case AI_ITEM_CURE_CONDITION:
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = AI_HEAL_CONFUSION;
if (*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) & (1 << AI_HEAL_CONFUSION))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
if (*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) & 0x3E)
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = AI_HEAL_SLEEP;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
}
else
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
// Check for other statuses, stopping at first (shouldn't be more than one)
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
while (!(*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) & 1))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) >>= 1;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattleCommunication[MULTISTRING_CHOOSER]++;
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
// MULTISTRING_CHOOSER will be either AI_HEAL_PARALYSIS, AI_HEAL_FREEZE,
// AI_HEAL_BURN, AI_HEAL_POISON, or AI_HEAL_SLEEP
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
}
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
}
break;
case AI_ITEM_X_STAT:
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STAT_ROSE_ITEM;
if (*(gBattleStruct->AI_itemFlags + (gBattlerAttacker >> 1)) & (1 << AI_DIRE_HIT))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_USED_DIRE_HIT;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
}
else
{
PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
PREPARE_STRING_BUFFER(gBattleTextBuff2, CHAR_X)
while (!((*(gBattleStruct->AI_itemFlags + (gBattlerAttacker >> 1))) & 1))
{
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) >>= 1;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattleTextBuff1[2]++;
}
gBattleScripting.animArg1 = gBattleTextBuff1[2] + 14;
gBattleScripting.animArg2 = 0;
}
break;
Fix AI Guard Spec use, and Specs->Spec
2021-04-03 21:18:17 +02:00
case AI_ITEM_GUARD_SPEC:
// It seems probable that at some point there was a special message for
// an AI trainer using Guard Spec in a double battle.
// There isn't now however, and the assignment to 2 below goes out of
// bounds for gMistUsedStringIds and instead prints "{mon} is getting pumped"
// from the next table, gFocusEnergyUsedStringIds.
// In any case this isn't an issue in the retail version, as no trainers
// are ever given any Guard Spec to use.
#ifndef UBFIX
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
gBattleCommunication[MULTISTRING_CHOOSER] = 2;
else
Fix AI Guard Spec use, and Specs->Spec
2021-04-03 21:18:17 +02:00
#endif
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_MIST;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
break;
}
re-match BattleIntroOpponent1SendsOutMonAnimation a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-26 10:52:00 +01:00
gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBattlerAttacker / 2)];
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
}
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
bool8 TryRunFromBattle(u8 battler)
{
bool8 effect = FALSE;
u8 holdEffect;
u8 pyramidMultiplier;
u8 speedVar;
if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY)
holdEffect = gEnigmaBerries[battler].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[battler].item);
gPotentialItemEffectBattler = battler;
if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
{
gLastUsedItem = gBattleMons[battler].item;
gProtectStructs[battler].fleeFlag = 1;
effect++;
}
Ghosts can now escape any wild battle
2021-10-23 16:41:31 +02:00
#if B_GHOSTS_ESCAPE >= GEN_6
else if (IS_BATTLER_OF_TYPE(battler, TYPE_GHOST))
{
effect++;
}
#endif
fix run away check in TryRunFromBattle
2021-10-30 18:06:02 +02:00
else if (GetBattlerAbility(battler) == ABILITY_RUN_AWAY)
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
if (InBattlePyramid())
{
gBattleStruct->runTries++;
pyramidMultiplier = GetPyramidRunMultiplier();
speedVar = (gBattleMons[battler].speed * pyramidMultiplier) / (gBattleMons[BATTLE_OPPOSITE(battler)].speed) + (gBattleStruct->runTries * 30);
if (speedVar > (Random() & 0xFF))
{
gLastUsedAbility = ABILITY_RUN_AWAY;
gProtectStructs[battler].fleeFlag = 2;
effect++;
}
}
else
{
gLastUsedAbility = ABILITY_RUN_AWAY;
gProtectStructs[battler].fleeFlag = 2;
effect++;
}
}
else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_HILL) && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{
effect++;
}
else
{
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
u8 runningFromBattler = BATTLE_OPPOSITE(battler);
if (!IsBattlerAlive(runningFromBattler))
runningFromBattler |= BIT_FLANK;
if (InBattlePyramid())
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
pyramidMultiplier = GetPyramidRunMultiplier();
speedVar = (gBattleMons[battler].speed * pyramidMultiplier) / (gBattleMons[runningFromBattler].speed) + (gBattleStruct->runTries * 30);
if (speedVar > (Random() & 0xFF))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
effect++;
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
}
else if (gBattleMons[battler].speed < gBattleMons[runningFromBattler].speed)
{
speedVar = (gBattleMons[battler].speed * 128) / (gBattleMons[runningFromBattler].speed) + (gBattleStruct->runTries * 30);
if (speedVar > (Random() & 0xFF))
effect++;
}
else // same speed or faster
{
effect++;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
}
gBattleStruct->runTries++;
}
if (effect)
{
gCurrentTurnActionNumber = gBattlersCount;
gBattleOutcome = B_OUTCOME_RAN;
}
return effect;
}
void HandleAction_Run(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
Label remaining battle types
2021-01-13 21:17:32 +01:00
if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
gCurrentTurnActionNumber = gBattlersCount;
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
if (gChosenActionByBattler[gActiveBattler] == B_ACTION_RUN)
gBattleOutcome |= B_OUTCOME_LOST;
}
else
{
if (gChosenActionByBattler[gActiveBattler] == B_ACTION_RUN)
gBattleOutcome |= B_OUTCOME_WON;
}
}
gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN;
gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE;
}
else
{
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
{
if (!TryRunFromBattle(gBattlerAttacker)) // failed to run away
{
ClearFuryCutterDestinyBondGrudge(gBattlerAttacker);
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CANT_ESCAPE_2;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
}
else
{
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
if (!CanBattlerEscape(gBattlerAttacker))
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ATTACKER_CANT_ESCAPE;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
else
{
gCurrentTurnActionNumber = gBattlersCount;
gBattleOutcome = B_OUTCOME_MON_FLED;
}
}
}
}
void HandleAction_WatchesCarefully(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0];
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
void HandleAction_SafariZoneBallThrow(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
gNumSafariBalls--;
gLastUsedItem = ITEM_SAFARI_BALL;
gBattlescriptCurrInstr = gBattlescriptsForBallThrow[ITEM_SAFARI_BALL];
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
add last used ball
2021-06-25 21:37:59 +02:00
void HandleAction_ThrowBall(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
change last ball graphic based on config. replace saveblock field with ewram field
2021-09-23 18:03:01 +02:00
gLastUsedItem = gLastThrownBall;
add last used ball
2021-06-25 21:37:59 +02:00
RemoveBagItem(gLastUsedItem, 1);
gBattlescriptCurrInstr = BattleScript_BallThrow;
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
void HandleAction_ThrowPokeblock(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = gBattleResources->bufferB[gBattlerAttacker][1] - 1;
gLastUsedItem = gBattleResources->bufferB[gBattlerAttacker][2];
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
if (gBattleResults.pokeblockThrows < 0xFF)
gBattleResults.pokeblockThrows++;
if (gBattleStruct->safariPkblThrowCounter < 3)
gBattleStruct->safariPkblThrowCounter++;
if (gBattleStruct->safariEscapeFactor > 1)
{
Use BUGFIX for some inline fixes
2020-12-13 05:28:01 +01:00
// BUG: safariEscapeFactor can become 0 below. This causes the pokeblock throw glitch.
#ifdef BUGFIX
if (gBattleStruct->safariEscapeFactor <= sPkblToEscapeFactor[gBattleStruct->safariPkblThrowCounter][gBattleCommunication[MULTISTRING_CHOOSER]])
#else
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
if (gBattleStruct->safariEscapeFactor < sPkblToEscapeFactor[gBattleStruct->safariPkblThrowCounter][gBattleCommunication[MULTISTRING_CHOOSER]])
Use BUGFIX for some inline fixes
2020-12-13 05:28:01 +01:00
#endif
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattleStruct->safariEscapeFactor = 1;
else
gBattleStruct->safariEscapeFactor -= sPkblToEscapeFactor[gBattleStruct->safariPkblThrowCounter][gBattleCommunication[MULTISTRING_CHOOSER]];
}
gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2];
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
void HandleAction_GoNear(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
gBattleStruct->safariCatchFactor += sGoNearCounterToCatchFactor[gBattleStruct->safariGoNearCounter];
if (gBattleStruct->safariCatchFactor > 20)
gBattleStruct->safariCatchFactor = 20;
gBattleStruct->safariEscapeFactor += sGoNearCounterToEscapeFactor[gBattleStruct->safariGoNearCounter];
if (gBattleStruct->safariEscapeFactor > 20)
gBattleStruct->safariEscapeFactor = 20;
if (gBattleStruct->safariGoNearCounter < 3)
{
gBattleStruct->safariGoNearCounter++;
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CREPT_CLOSER;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
}
else
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CANT_GET_CLOSER;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
}
gBattlescriptCurrInstr = gBattlescriptsForSafariActions[1];
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
}
void HandleAction_SafariZoneRun(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
PlaySE(SE_FLEE);
gCurrentTurnActionNumber = gBattlersCount;
gBattleOutcome = B_OUTCOME_RAN;
}
void HandleAction_WallyBallThrow(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker])
gBattlescriptCurrInstr = gBattlescriptsForSafariActions[3];
gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
gActionsByTurnOrder[1] = B_ACTION_FINISHED;
}
void HandleAction_TryFinish(void)
{
if (!HandleFaintedMonActions())
{
gBattleStruct->faintedActionsState = 0;
gCurrentActionFuncId = B_ACTION_FINISHED;
}
}
void HandleAction_NothingIsFainted(void)
{
gCurrentTurnActionNumber++;
gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 15:03:14 +02:00
| HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_PASSIVE_DAMAGE
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
| HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
| HITMARKER_CHARGING | HITMARKER_x4000000);
}
void HandleAction_ActionFinished(void)
{
*(gBattleStruct->monToSwitchIntoId + gBattlerByTurnOrder[gCurrentTurnActionNumber]) = 6;
gCurrentTurnActionNumber++;
gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
SpecialStatusesClear();
gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 15:03:14 +02:00
| HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_PASSIVE_DAMAGE
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
| HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
Fix many Disguise bugs Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 08:27:42 +02:00
| HITMARKER_CHARGING | HITMARKER_x4000000 | HITMARKER_IGNORE_DISGUISE);
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gCurrentMove = 0;
gBattleMoveDamage = 0;
gMoveResultFlags = 0;
gBattleScripting.animTurn = 0;
gBattleScripting.animTargetsHit = 0;
gLastLandedMoves[gBattlerAttacker] = 0;
gLastHitByType[gBattlerAttacker] = 0;
gBattleStruct->dynamicMoveType = 0;
Sync bev2 with pret
2020-10-11 06:57:16 +02:00
gBattleScripting.moveendState = 0;
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 22:44:04 +02:00
gBattleScripting.moveendState = 0;
gBattleCommunication[3] = 0;
gBattleCommunication[4] = 0;
gBattleScripting.multihitMoveEffect = 0;
gBattleResources->battleScriptsStack->size = 0;
}
battle 2 is done
2017-10-06 17:06:45 +02:00
move const data to battle files
2017-10-06 19:09:37 +02:00
// rom const data
Implemented Stench's battle effect And updated its description.
2021-04-04 02:55:49 +02:00
static const u8 sMovesNotAffectedByStench[] =
{
[MOVE_AIR_SLASH] = 1,
[MOVE_ASTONISH] = 1,
[MOVE_BITE] = 1,
[MOVE_BONE_CLUB] = 1,
[MOVE_DARK_PULSE] = 1,
[MOVE_DOUBLE_IRON_BASH] = 1,
[MOVE_DRAGON_RUSH] = 1,
[MOVE_EXTRASENSORY] = 1,
[MOVE_FAKE_OUT] = 1,
[MOVE_FIERY_WRATH] = 1,
[MOVE_FIRE_FANG] = 1,
[MOVE_FLING] = 1,
[MOVE_FLOATY_FALL] = 1,
[MOVE_HEADBUTT] = 1,
[MOVE_HEART_STAMP] = 1,
[MOVE_HYPER_FANG] = 1,
[MOVE_ICE_FANG] = 1,
[MOVE_ICICLE_CRASH] = 1,
[MOVE_IRON_HEAD] = 1,
[MOVE_NEEDLE_ARM] = 1,
[MOVE_NONE] = 1,
[MOVE_ROCK_SLIDE] = 1,
[MOVE_ROLLING_KICK] = 1,
[MOVE_SECRET_POWER] = 1,
[MOVE_SKY_ATTACK] = 1,
[MOVE_SNORE] = 1,
[MOVE_STEAMROLLER] = 1,
[MOVE_STOMP] = 1,
[MOVE_THUNDER_FANG] = 1,
[MOVE_TWISTER] = 1,
[MOVE_WATERFALL] = 1,
[MOVE_ZEN_HEADBUTT] = 1,
[MOVE_ZING_ZAP] = 1,
};
Get rid of scripting dmg multiplier
2018-07-14 18:58:45 +02:00
static const u8 sAbilitiesAffectedByMoldBreaker[] =
{
[ABILITY_BATTLE_ARMOR] = 1,
[ABILITY_CLEAR_BODY] = 1,
[ABILITY_DAMP] = 1,
[ABILITY_DRY_SKIN] = 1,
[ABILITY_FILTER] = 1,
[ABILITY_FLASH_FIRE] = 1,
[ABILITY_FLOWER_GIFT] = 1,
[ABILITY_HEATPROOF] = 1,
[ABILITY_HYPER_CUTTER] = 1,
[ABILITY_IMMUNITY] = 1,
[ABILITY_INNER_FOCUS] = 1,
[ABILITY_INSOMNIA] = 1,
[ABILITY_KEEN_EYE] = 1,
[ABILITY_LEAF_GUARD] = 1,
[ABILITY_LEVITATE] = 1,
[ABILITY_LIGHTNING_ROD] = 1,
[ABILITY_LIMBER] = 1,
[ABILITY_MAGMA_ARMOR] = 1,
[ABILITY_MARVEL_SCALE] = 1,
[ABILITY_MOTOR_DRIVE] = 1,
[ABILITY_OBLIVIOUS] = 1,
[ABILITY_OWN_TEMPO] = 1,
[ABILITY_SAND_VEIL] = 1,
[ABILITY_SHELL_ARMOR] = 1,
[ABILITY_SHIELD_DUST] = 1,
[ABILITY_SIMPLE] = 1,
[ABILITY_SNOW_CLOAK] = 1,
[ABILITY_SOLID_ROCK] = 1,
[ABILITY_SOUNDPROOF] = 1,
[ABILITY_STICKY_HOLD] = 1,
[ABILITY_STORM_DRAIN] = 1,
[ABILITY_STURDY] = 1,
[ABILITY_SUCTION_CUPS] = 1,
[ABILITY_TANGLED_FEET] = 1,
[ABILITY_THICK_FAT] = 1,
[ABILITY_UNAWARE] = 1,
[ABILITY_VITAL_SPIRIT] = 1,
[ABILITY_VOLT_ABSORB] = 1,
[ABILITY_WATER_ABSORB] = 1,
[ABILITY_WATER_VEIL] = 1,
[ABILITY_WHITE_SMOKE] = 1,
[ABILITY_WONDER_GUARD] = 1,
[ABILITY_BIG_PECKS] = 1,
[ABILITY_CONTRARY] = 1,
[ABILITY_FRIEND_GUARD] = 1,
[ABILITY_HEAVY_METAL] = 1,
[ABILITY_LIGHT_METAL] = 1,
[ABILITY_MAGIC_BOUNCE] = 1,
[ABILITY_MULTISCALE] = 1,
[ABILITY_SAP_SIPPER] = 1,
[ABILITY_TELEPATHY] = 1,
[ABILITY_WONDER_SKIN] = 1,
[ABILITY_AROMA_VEIL] = 1,
[ABILITY_BULLETPROOF] = 1,
[ABILITY_FLOWER_VEIL] = 1,
[ABILITY_FUR_COAT] = 1,
[ABILITY_OVERCOAT] = 1,
[ABILITY_SWEET_VEIL] = 1,
[ABILITY_DAZZLING] = 1,
[ABILITY_DISGUISE] = 1,
[ABILITY_FLUFFY] = 1,
[ABILITY_QUEENLY_MAJESTY] = 1,
[ABILITY_WATER_BUBBLE] = 1,
Added Gen 8 abilities affected by Mold Breaker
2021-10-02 22:07:29 +02:00
[ABILITY_MIRROR_ARMOR] = 1,
[ABILITY_PUNK_ROCK] = 1,
[ABILITY_ICE_SCALES] = 1,
[ABILITY_ICE_FACE] = 1,
[ABILITY_PASTEL_VEIL] = 1,
Get rid of scripting dmg multiplier
2018-07-14 18:58:45 +02:00
};
Added non-traceable abilities. (#275) * Added non-traceable abilities. * Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
static const u8 sAbilitiesNotTraced[ABILITIES_COUNT] =
{
Added As One to the untraceable abilities list
2021-01-25 19:37:11 +01:00
[ABILITY_AS_ONE_ICE_RIDER] = 1,
[ABILITY_AS_ONE_SHADOW_RIDER] = 1,
Added non-traceable abilities. (#275) * Added non-traceable abilities. * Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
[ABILITY_BATTLE_BOND] = 1,
[ABILITY_COMATOSE] = 1,
[ABILITY_DISGUISE] = 1,
[ABILITY_FLOWER_GIFT] = 1,
[ABILITY_FORECAST] = 1,
Updated the list of untraceable abilities
2021-01-25 18:55:51 +01:00
[ABILITY_GULP_MISSILE] = 1,
[ABILITY_HUNGER_SWITCH] = 1,
[ABILITY_ICE_FACE] = 1,
Added non-traceable abilities. (#275) * Added non-traceable abilities. * Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
[ABILITY_ILLUSION] = 1,
[ABILITY_IMPOSTER] = 1,
[ABILITY_MULTITYPE] = 1,
Updated the list of untraceable abilities
2021-01-25 18:55:51 +01:00
[ABILITY_NEUTRALIZING_GAS] = 1,
Added non-traceable abilities. (#275) * Added non-traceable abilities. * Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
[ABILITY_NONE] = 1,
[ABILITY_POWER_CONSTRUCT] = 1,
[ABILITY_POWER_OF_ALCHEMY] = 1,
[ABILITY_RECEIVER] = 1,
[ABILITY_RKS_SYSTEM] = 1,
[ABILITY_SCHOOLING] = 1,
[ABILITY_SHIELDS_DOWN] = 1,
[ABILITY_STANCE_CHANGE] = 1,
[ABILITY_TRACE] = 1,
[ABILITY_ZEN_MODE] = 1,
};
Get rid of scripting dmg multiplier
2018-07-14 18:58:45 +02:00
static const u8 sHoldEffectToType[][2] =
{
{HOLD_EFFECT_BUG_POWER, TYPE_BUG},
{HOLD_EFFECT_STEEL_POWER, TYPE_STEEL},
{HOLD_EFFECT_GROUND_POWER, TYPE_GROUND},
{HOLD_EFFECT_ROCK_POWER, TYPE_ROCK},
{HOLD_EFFECT_GRASS_POWER, TYPE_GRASS},
{HOLD_EFFECT_DARK_POWER, TYPE_DARK},
{HOLD_EFFECT_FIGHTING_POWER, TYPE_FIGHTING},
{HOLD_EFFECT_ELECTRIC_POWER, TYPE_ELECTRIC},
{HOLD_EFFECT_WATER_POWER, TYPE_WATER},
{HOLD_EFFECT_FLYING_POWER, TYPE_FLYING},
{HOLD_EFFECT_POISON_POWER, TYPE_POISON},
{HOLD_EFFECT_ICE_POWER, TYPE_ICE},
{HOLD_EFFECT_GHOST_POWER, TYPE_GHOST},
{HOLD_EFFECT_PSYCHIC_POWER, TYPE_PSYCHIC},
{HOLD_EFFECT_FIRE_POWER, TYPE_FIRE},
{HOLD_EFFECT_DRAGON_POWER, TYPE_DRAGON},
{HOLD_EFFECT_NORMAL_POWER, TYPE_NORMAL},
{HOLD_EFFECT_FAIRY_POWER, TYPE_FAIRY},
};
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// percent in UQ_4_12 format
static const u16 sPercentToModifier[] =
{
UQ_4_12(0.00), // 0
UQ_4_12(0.01), // 1
UQ_4_12(0.02), // 2
UQ_4_12(0.03), // 3
UQ_4_12(0.04), // 4
UQ_4_12(0.05), // 5
UQ_4_12(0.06), // 6
UQ_4_12(0.07), // 7
UQ_4_12(0.08), // 8
UQ_4_12(0.09), // 9
UQ_4_12(0.10), // 10
UQ_4_12(0.11), // 11
UQ_4_12(0.12), // 12
UQ_4_12(0.13), // 13
UQ_4_12(0.14), // 14
UQ_4_12(0.15), // 15
UQ_4_12(0.16), // 16
UQ_4_12(0.17), // 17
UQ_4_12(0.18), // 18
UQ_4_12(0.19), // 19
UQ_4_12(0.20), // 20
UQ_4_12(0.21), // 21
UQ_4_12(0.22), // 22
UQ_4_12(0.23), // 23
UQ_4_12(0.24), // 24
UQ_4_12(0.25), // 25
UQ_4_12(0.26), // 26
UQ_4_12(0.27), // 27
UQ_4_12(0.28), // 28
UQ_4_12(0.29), // 29
UQ_4_12(0.30), // 30
UQ_4_12(0.31), // 31
UQ_4_12(0.32), // 32
UQ_4_12(0.33), // 33
UQ_4_12(0.34), // 34
UQ_4_12(0.35), // 35
UQ_4_12(0.36), // 36
UQ_4_12(0.37), // 37
UQ_4_12(0.38), // 38
UQ_4_12(0.39), // 39
UQ_4_12(0.40), // 40
UQ_4_12(0.41), // 41
UQ_4_12(0.42), // 42
UQ_4_12(0.43), // 43
UQ_4_12(0.44), // 44
UQ_4_12(0.45), // 45
UQ_4_12(0.46), // 46
UQ_4_12(0.47), // 47
UQ_4_12(0.48), // 48
UQ_4_12(0.49), // 49
UQ_4_12(0.50), // 50
UQ_4_12(0.51), // 51
UQ_4_12(0.52), // 52
UQ_4_12(0.53), // 53
UQ_4_12(0.54), // 54
UQ_4_12(0.55), // 55
UQ_4_12(0.56), // 56
UQ_4_12(0.57), // 57
UQ_4_12(0.58), // 58
UQ_4_12(0.59), // 59
UQ_4_12(0.60), // 60
UQ_4_12(0.61), // 61
UQ_4_12(0.62), // 62
UQ_4_12(0.63), // 63
UQ_4_12(0.64), // 64
UQ_4_12(0.65), // 65
UQ_4_12(0.66), // 66
UQ_4_12(0.67), // 67
UQ_4_12(0.68), // 68
UQ_4_12(0.69), // 69
UQ_4_12(0.70), // 70
UQ_4_12(0.71), // 71
UQ_4_12(0.72), // 72
UQ_4_12(0.73), // 73
UQ_4_12(0.74), // 74
UQ_4_12(0.75), // 75
UQ_4_12(0.76), // 76
UQ_4_12(0.77), // 77
UQ_4_12(0.78), // 78
UQ_4_12(0.79), // 79
UQ_4_12(0.80), // 80
UQ_4_12(0.81), // 81
UQ_4_12(0.82), // 82
UQ_4_12(0.83), // 83
UQ_4_12(0.84), // 84
UQ_4_12(0.85), // 85
UQ_4_12(0.86), // 86
UQ_4_12(0.87), // 87
UQ_4_12(0.88), // 88
UQ_4_12(0.89), // 89
UQ_4_12(0.90), // 90
UQ_4_12(0.91), // 91
UQ_4_12(0.92), // 92
UQ_4_12(0.93), // 93
UQ_4_12(0.94), // 94
UQ_4_12(0.95), // 95
UQ_4_12(0.96), // 96
UQ_4_12(0.97), // 97
UQ_4_12(0.98), // 98
UQ_4_12(0.99), // 99
UQ_4_12(1.00), // 100
};
#define X UQ_4_12
static const u16 sTypeEffectivenessTable[NUMBER_OF_MON_TYPES][NUMBER_OF_MON_TYPES] =
{
// normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // normal
{X(2.0), X(1.0), X(0.5), X(0.5), X(1.0), X(2.0), X(0.5), X(0.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(2.0), X(0.5)}, // fight
{X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // flying
{X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(0.5), X(1.0), X(0.5), X(0.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0)}, // poison
{X(1.0), X(1.0), X(0.0), X(2.0), X(1.0), X(2.0), X(0.5), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // ground
{X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0)}, // rock
{X(1.0), X(0.5), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0), X(0.5)}, // bug
Added config option for Steel type resistances.
2020-11-11 21:48:02 +01:00
#if B_STEEL_RESISTANCES >= GEN_6
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
{X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0)}, // ghost
Added config option for Steel type resistances.
2020-11-11 21:48:02 +01:00
#else
{X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0)}, // ghost
#endif
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0)}, // steel
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // mystery
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(0.5), X(2.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0)}, // fire
{X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // water
{X(1.0), X(1.0), X(0.5), X(0.5), X(2.0), X(2.0), X(0.5), X(1.0), X(0.5), X(1.0), X(0.5), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // grass
{X(1.0), X(1.0), X(2.0), X(1.0), X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(0.5), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // electric
{X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(0.0), X(1.0)}, // psychic
{X(1.0), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(0.5), X(2.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0)}, // ice
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(0.0)}, // dragon
Added config option for Steel type resistances.
2020-11-11 21:48:02 +01:00
#if B_STEEL_RESISTANCES >= GEN_6
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
{X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(0.5)}, // dark
Added config option for Steel type resistances.
2020-11-11 21:48:02 +01:00
#else
{X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(0.5)}, // dark
#endif
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
{X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0)}, // fairy
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
};
Inverse battles
2020-07-17 20:53:22 +02:00
static const u16 sInverseTypeEffectivenessTable[NUMBER_OF_MON_TYPES][NUMBER_OF_MON_TYPES] =
move const data to battle files
2017-10-06 19:09:37 +02:00
{
Inverse battles
2020-07-17 20:53:22 +02:00
// normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(2.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // normal
{X(0.5), X(1.0), X(2.0), X(2.0), X(1.0), X(0.5), X(2.0), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(0.5), X(2.0)}, // fight
{X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // flying
{X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(2.0), X(1.0), X(2.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5)}, // poison
{X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // ground
{X(1.0), X(2.0), X(0.5), X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0)}, // rock
{X(1.0), X(2.0), X(2.0), X(2.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(0.5), X(1.0), X(1.0), X(0.5), X(2.0)}, // bug
Added config option for Steel type resistances.
2020-11-11 21:48:02 +01:00
#if B_STEEL_RESISTANCES >= GEN_6
Inverse battles
2020-07-17 20:53:22 +02:00
{X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(2.0), X(1.0)}, // ghost
Added config option for Steel type resistances.
2020-11-11 21:48:02 +01:00
#else
{X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(2.0), X(1.0)}, // ghost
#endif
Inverse battles
2020-07-17 20:53:22 +02:00
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(2.0), X(1.0), X(2.0), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(0.5)}, // steel
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // mystery
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(2.0), X(0.5), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0)}, // fire
{X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(2.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0)}, // water
{X(1.0), X(1.0), X(2.0), X(2.0), X(0.5), X(0.5), X(2.0), X(1.0), X(2.0), X(1.0), X(2.0), X(0.5), X(2.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0)}, // grass
{X(1.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(2.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0)}, // electric
{X(1.0), X(0.5), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0), X(1.0)}, // psychic
{X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(2.0), X(2.0), X(0.5), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0)}, // ice
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(2.0)}, // dragon
Added config option for Steel type resistances.
2020-11-11 21:48:02 +01:00
#if B_STEEL_RESISTANCES >= GEN_6
Inverse battles
2020-07-17 20:53:22 +02:00
{X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(2.0), X(2.0)}, // dark
Added config option for Steel type resistances.
2020-11-11 21:48:02 +01:00
#else
{X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(2.0), X(2.0)}, // dark
#endif
Inverse battles
2020-07-17 20:53:22 +02:00
{X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(1.0)}, // fairy
move const data to battle files
2017-10-06 19:09:37 +02:00
};
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
#undef X
Get rid of scripting dmg multiplier
2018-07-14 18:58:45 +02:00
// code
pokemon and battle constants
2018-02-08 11:17:41 +01:00
u8 GetBattlerForBattleScript(u8 caseId)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
u8 ret = 0;
switch (caseId)
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_TARGET:
more renaming
2018-02-06 23:09:39 +01:00
ret = gBattlerTarget;
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_ATTACKER:
more renaming
2018-02-06 23:09:39 +01:00
ret = gBattlerAttacker;
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_EFFECT_BATTLER:
ret = gEffectBattler;
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
document frontier related
2018-07-01 11:15:42 +02:00
case BS_BATTLER_0:
battle 2 is done
2017-10-06 17:06:45 +02:00
ret = 0;
break;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_SCRIPTING:
rename bank to battler
2018-02-06 02:46:59 +01:00
ret = gBattleScripting.battler;
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_FAINTED:
ret = gBattlerFainted;
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
case 5:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
ret = gBattlerFainted;
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
case 4:
case 6:
case 8:
case 9:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_PLAYER1:
rename bank to battler
2018-02-06 02:46:59 +01:00
ret = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_OPPONENT1:
rename bank to battler
2018-02-06 02:46:59 +01:00
ret = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_PLAYER2:
rename bank to battler
2018-02-06 02:46:59 +01:00
ret = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
case BS_OPPONENT2:
rename bank to battler
2018-02-06 02:46:59 +01:00
ret = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
case BS_ABILITY_BATTLER:
ret = gBattlerAbility;
Destiny Knot
2020-04-22 14:40:44 +02:00
break;
battle 2 is done
2017-10-06 17:06:45 +02:00
}
return ret;
}
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
void PressurePPLose(u8 target, u8 attacker, u16 move)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
int moveIndex;
battle 2 is done
2017-10-06 17:06:45 +02:00
Fix preasure + Gastro Acid
2021-10-02 23:31:09 +02:00
if (GetBattlerAbility(target) != ABILITY_PRESSURE)
battle 2 is done
2017-10-06 17:06:45 +02:00
return;
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
for (moveIndex = 0; moveIndex < MAX_MON_MOVES; moveIndex++)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
if (gBattleMons[attacker].moves[moveIndex] == move)
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
}
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
if (moveIndex == MAX_MON_MOVES)
battle 2 is done
2017-10-06 17:06:45 +02:00
return;
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
if (gBattleMons[attacker].pp[moveIndex] != 0)
gBattleMons[attacker].pp[moveIndex]--;
battle 2 is done
2017-10-06 17:06:45 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
if (!(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
&& !(gDisableStructs[attacker].mimickedMoves & gBitTable[moveIndex]))
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gActiveBattler = attacker;
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + moveIndex, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]);
more renaming
2018-02-06 20:48:02 +01:00
MarkBattlerForControllerExec(gActiveBattler);
battle 2 is done
2017-10-06 17:06:45 +02:00
}
}
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
void PressurePPLoseOnUsingImprison(u8 attacker)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
int i, j;
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
int imprisonPos = 4;
rename bank to battler
2018-02-06 02:46:59 +01:00
u8 atkSide = GetBattlerSide(attacker);
battle 2 is done
2017-10-06 17:06:45 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Fix preasure + Gastro Acid
2021-10-02 23:31:09 +02:00
if (atkSide != GetBattlerSide(i) && GetBattlerAbility(i) == ABILITY_PRESSURE)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
for (j = 0; j < MAX_MON_MOVES; j++)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gBattleMons[attacker].moves[j] == MOVE_IMPRISON)
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
}
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
if (j != MAX_MON_MOVES)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
imprisonPos = j;
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gBattleMons[attacker].pp[j] != 0)
gBattleMons[attacker].pp[j]--;
battle 2 is done
2017-10-06 17:06:45 +02:00
}
}
}
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
if (imprisonPos != 4
rename bank to battler
2018-02-06 02:46:59 +01:00
&& !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
&& !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisonPos]))
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gActiveBattler = attacker;
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisonPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisonPos]);
more renaming
2018-02-06 20:48:02 +01:00
MarkBattlerForControllerExec(gActiveBattler);
battle 2 is done
2017-10-06 17:06:45 +02:00
}
}
rename bank to battler
2018-02-06 02:46:59 +01:00
void PressurePPLoseOnUsingPerishSong(u8 attacker)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
int i, j;
int perishSongPos = 4;
battle 2 is done
2017-10-06 17:06:45 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Fix preasure + Gastro Acid
2021-10-02 23:31:09 +02:00
if (GetBattlerAbility(i) == ABILITY_PRESSURE && i != attacker)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
for (j = 0; j < MAX_MON_MOVES; j++)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gBattleMons[attacker].moves[j] == MOVE_PERISH_SONG)
battle 2 is done
2017-10-06 17:06:45 +02:00
break;
}
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
if (j != MAX_MON_MOVES)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
perishSongPos = j;
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gBattleMons[attacker].pp[j] != 0)
gBattleMons[attacker].pp[j]--;
battle 2 is done
2017-10-06 17:06:45 +02:00
}
}
}
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
if (perishSongPos != MAX_MON_MOVES
rename bank to battler
2018-02-06 02:46:59 +01:00
&& !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
&& !(gDisableStructs[attacker].mimickedMoves & gBitTable[perishSongPos]))
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gActiveBattler = attacker;
more renaming
2018-02-06 20:48:02 +01:00
BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBattler].pp[perishSongPos]);
MarkBattlerForControllerExec(gActiveBattler);
battle 2 is done
2017-10-06 17:06:45 +02:00
}
}
more renaming
2018-02-06 20:48:02 +01:00
void MarkAllBattlersForControllerExec(void) // unused
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
int i;
battle 2 is done
2017-10-06 17:06:45 +02:00
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
Bit shifts from hex to decimal
2021-03-30 23:38:09 +02:00
gBattleControllerExecFlags |= gBitTable[i] << (32 - MAX_BATTLERS_COUNT);
battle 2 is done
2017-10-06 17:06:45 +02:00
}
else
{
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
more renaming
2018-02-06 20:48:02 +01:00
gBattleControllerExecFlags |= gBitTable[i];
battle 2 is done
2017-10-06 17:06:45 +02:00
}
}
Refactor battle intro, allow to speed it up
2018-12-23 18:47:00 +01:00
bool32 IsBattlerMarkedForControllerExec(u8 battlerId)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
return (gBattleControllerExecFlags & (gBitTable[battlerId] << 0x1C)) != 0;
else
return (gBattleControllerExecFlags & (gBitTable[battlerId])) != 0;
}
more renaming
2018-02-06 20:48:02 +01:00
void MarkBattlerForControllerExec(u8 battlerId)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
Bit shifts from hex to decimal
2021-03-30 23:38:09 +02:00
gBattleControllerExecFlags |= gBitTable[battlerId] << (32 - MAX_BATTLERS_COUNT);
battle 2 is done
2017-10-06 17:06:45 +02:00
else
more renaming
2018-02-06 20:48:02 +01:00
gBattleControllerExecFlags |= gBitTable[battlerId];
battle 2 is done
2017-10-06 17:06:45 +02:00
}
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
void MarkBattlerReceivedLinkData(u8 battlerId)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
s32 i;
Decompile TV (#80) * ClearTVShowData * special_0x44 * DoTVShow (nonmatching because align) * DoTVShowBravoTrainerPokemonProfile * Update field names * DoTVShowBravoTrainerBattleTower * Renaming of struct fields * sub_80EBFF4 and UpdateTVScreensOnMap * SetTVMetatilesOnMap * Power buttons for the TV screens on the map * special_0x45 * sub_80EC18C * special_0x4a * ResetGabbyAndTy * GabbyAndTyBeforeInterview * GabbyAndTyAfterInterview * Through IsTVShowInSearchOfTrainersAiring * GabbyAndTyGetLastQuote * GabbyAndTyGetLastBattleTrivia * GabbyAndTySetScriptVarsToFieldObjectLocalIds * InterviewAfter; use TVShow as a precursor for making the individual show structs anonymous * Make TV structs anonymous within the union * Move the TV union to its own subheader * Move TV show enums to the global.tv.h subheader * Funcion renaming * Apply static attributes where able * PutPokemonTodayCaughtOnAir * sub_80EC8A4 * PutPokemonTodayFailedOnTheAir * sub_80EC9E8, sub_80ECA10 * sub_80ECA38 * sub_80ECB00 * Put3CheersForPokeblocksOnTheAir * PutFanClubSpecialOnTheAir * ContestLiveUpdates_BeforeInterview * Other before-interview Contest Live Updates functions * ContestLiveUpdates_BeforeInterview_5 * InterviewAfter_BravoTrainerPokemonProfile * BravoTrainerPokemonProfile_BeforeInterview1 * BravoTrainerPokemonProfile_BeforeInterview2 * Disassemble TV data * Decompile TV data * InterviewAfter_BravoTrainerBattleTowerProfile * SaveRecordedItemPurchasesForTVShow * PutNameRaterShowOnTheAir * StartMassOutbreak * PutLilycoveContestLadyShowOnTheAir * InterviewAfter_FanClubLetter * Rip TV strings * InterviewAfter_RecentHappenings * InterviewAfter_PkmnFanClubOpinions * sub_80ED718 * EndMassOutbreak * sub_80ED888 * sub_80ED8B4 * UpdateMassOutbreakTimeLeft * sub_80ED950 * PutFishingAdviceShowOnTheAir * through sub_80EDA80 * ewram and common syms are now fetched from the object files * BSS symbols are taken from the tv.o file * through sub_80EDC60 * sub_80EDCE8 * sub_80EDD78 * through sub_80EDE84 * nomatching sub_80EDE98 * sub_80EDFB4 * sub_80EE104 * sub_80EE104 * sub_80EE184 * sub_80EE2CC * sub_80EE35C * sub_80EE44C * sub_80EE4DC * sub_80EE5A4 * sub_80EE69C * sub_80EE72C * sub_80EE7C0 * sub_80EE818 * sub_80EE8C8 * sub_80EEA70 * sub_80EEB98 * sub_80EEBF4 * through sub_80EED60 * Functions relating to Pokemon News * sub_80EEF6C * GetPriceReduction * IsPriceDiscounted * sub_80EF120 * through sub_80EF370 * sub_80EF40C * HasMixableShowAlreadyBeenSpawnedWithPlayerID * TV_SortPurchasesByQuantity * FindActiveBroadcastByShowType_SetScriptResult * InterviewBefore * through sub_80EF88C * through sub_80EF93C * through sub_80EFA24 * through TV_BernoulliTrial * sub_80EFB58 * sub_80EFBA4 * sub_80EFBDC * through sub_80EFD98 * ChangePokemonNickname * ChangeBoxPokemonNickname * sub_80EFF9C * through player_id_to_dword * CheckForBigMovieOrEmergencyNewsOnTV * GetMomOrDadStringForTVMessage * sub_80F01E8 * sub_80F0358 * sub_80F049C * TV record mixing functions * sub_80F06D0 * sub_80F0708 nonmatching * through sub_80F0B24 * sub_80F0B64 * through sub_80F0C04 * sub_80F0C7C * sub_80F0D60 * sub_80F0E58 * sub_80F0E84 * through sub_80F0F24 * sub_80F0F64 * sub_80F1208 * sub_80F1254 * sub_80F1290 * sub_80F12A4 * sub_80F14F8 * DoTVShowTodaysSmartShopper * DoTVShowTheNameRaterShow * DoTVShowPokemonTodaySuccessfulCapture * DoTVShowPokemonTodayFailedCapture * DoTVShowPokemonFanClubLetter * DoTVShowRecentHappenings * DoTVShowPokemonFanClubOpinions * DoTVShowPokemonNewsMassOutbreak * DoTVShowPokemonContestLiveUpdates * DoTVShowPokemonBattleUpdate * DoTVShow3CheersForPokeblocks * DoTVShowInSearchOfTrainers * Label GabbyAndTyData fields; remove ddump comments from data/text/tv.inc * DoTVShowPokemonAngler * DoTVShowTheWorldOfMasters; update RAM symbols and field names * Decorate static functions * DoTVShowTodaysRivalTrainer; region map enums * TVDewfordTrendWatcherNetworkTextGroup * DoTVShowHoennTreasureInvestigators * DoTVShowFindThatGamer * DoTVShowBreakingNewsTV * DoTVShowSecretBaseVisit * DoTVShowPokemonLotterWinnerFlashReport * DoTVShowThePokemonBattleSeminar * DoTVShowTrainerFanClubSpecial, DoTVShowTrainerFanClub * DoTVShowSpotTheCuties * DoTVShowPokemonNewsBattleFrontier * DoTVShowWhatsNo1InHoennToday * Helpers for DoTVShowSecretBaseSecrets * DoTVShowSecretBaseSecrets * DoTVShowSafariFanClub * Finish decompilation of tv.s * Some renaming * Rename text group pointers * revoke statis; pokenews enums * Labels are number one * Label all TV struct fields * Make data/text/tv.inc more readable * Split data/text/tv.inc * Rename pokenews text pointers * Frontier Symbol constants; indicate static rodata objects with 's' prefix * Fix leading spaces/tabs F*** CLion sometimes * Fix inconsequential warning
2017-10-13 17:09:36 +02:00
for (i = 0; i < GetLinkPlayerCount(); i++)
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
gBattleControllerExecFlags |= gBitTable[battlerId] << (i << 2);
battle 2 is done
2017-10-06 17:06:45 +02:00
Document remainder of battle_controllers.c
2021-01-22 08:48:22 +01:00
gBattleControllerExecFlags &= ~(0x10000000 << battlerId);
battle 2 is done
2017-10-06 17:06:45 +02:00
}
rename bank to battler
2018-02-06 02:46:59 +01:00
void CancelMultiTurnMoves(u8 battler)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gBattleMons[battler].status2 &= ~(STATUS2_MULTIPLETURNS);
gBattleMons[battler].status2 &= ~(STATUS2_LOCK_CONFUSE);
gBattleMons[battler].status2 &= ~(STATUS2_UPROAR);
gBattleMons[battler].status2 &= ~(STATUS2_BIDE);
battle 2 is done
2017-10-06 17:06:45 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
gStatuses3[battler] &= ~(STATUS3_SEMI_INVULNERABLE);
battle 2 is done
2017-10-06 17:06:45 +02:00
clean battle structs
2018-10-14 18:10:54 +02:00
gDisableStructs[battler].rolloutTimer = 0;
rename bank to battler
2018-02-06 02:46:59 +01:00
gDisableStructs[battler].furyCutterCounter = 0;
battle 2 is done
2017-10-06 17:06:45 +02:00
}
rename bank to battler
2018-02-06 02:46:59 +01:00
bool8 WasUnableToUseMove(u8 battler)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gProtectStructs[battler].prlzImmobility
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
|| gProtectStructs[battler].usedImprisonedMove
rename bank to battler
2018-02-06 02:46:59 +01:00
|| gProtectStructs[battler].loveImmobility
|| gProtectStructs[battler].usedDisabledMove
|| gProtectStructs[battler].usedTauntedMove
Gravity and Heal Block preventing after choosing a move
2018-08-02 21:27:28 +02:00
|| gProtectStructs[battler].usedGravityPreventedMove
|| gProtectStructs[battler].usedHealBlockedMove
rename bank to battler
2018-02-06 02:46:59 +01:00
|| gProtectStructs[battler].flag2Unknown
|| gProtectStructs[battler].flinchImmobility
Add Powder
2018-12-03 12:50:32 +01:00
|| gProtectStructs[battler].confusionSelfDmg
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
|| gProtectStructs[battler].powderSelfDmg
|| gProtectStructs[battler].usedThroatChopPreventedMove)
battle 2 is done
2017-10-06 17:06:45 +02:00
return TRUE;
else
return FALSE;
}
rename bank to battler
2018-02-06 02:46:59 +01:00
void PrepareStringBattle(u16 stringId, u8 battler)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Swapped webs don't trigger Defiant Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect? Also, fix Sticky Web not activating Defiant.
2021-11-23 10:54:30 +01:00
u32 targetSide = GetBattlerSide(gBattlerTarget);
Add Contrary
2018-12-26 19:12:07 +01:00
// Support for Contrary ability.
// If a move attempted to raise stat - print "won't increase".
// If a move attempted to lower stat - print "won't decrease".
if (stringId == STRINGID_STATSWONTDECREASE && !(gBattleScripting.statChanger & STAT_BUFF_NEGATIVE))
stringId = STRINGID_STATSWONTINCREASE;
else if (stringId == STRINGID_STATSWONTINCREASE && gBattleScripting.statChanger & STAT_BUFF_NEGATIVE)
stringId = STRINGID_STATSWONTDECREASE;
Defiant and Competitive
2019-02-16 12:54:11 +01:00
else if (stringId == STRINGID_STATSWONTDECREASE2 && GetBattlerAbility(battler) == ABILITY_CONTRARY)
Add Contrary
2018-12-26 19:12:07 +01:00
stringId = STRINGID_STATSWONTINCREASE2;
else if (stringId == STRINGID_STATSWONTINCREASE2 && GetBattlerAbility(battler) == ABILITY_CONTRARY)
stringId = STRINGID_STATSWONTDECREASE2;
Defiant and Competitive
2019-02-16 12:54:11 +01:00
// Check Defiant and Competitive stat raise whenever a stat is lowered.
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
else if ((stringId == STRINGID_DEFENDERSSTATFELL || stringId == STRINGID_PKMNCUTSATTACKWITH)
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& ((GetBattlerAbility(gBattlerTarget) == ABILITY_DEFIANT && CompareStat(gBattlerTarget, STAT_ATK, MAX_STAT_STAGE, CMP_LESS_THAN))
|| (GetBattlerAbility(gBattlerTarget) == ABILITY_COMPETITIVE && CompareStat(gBattlerTarget, STAT_SPATK, MAX_STAT_STAGE, CMP_LESS_THAN)))
Curse defiant
2020-07-11 12:28:42 +02:00
&& gSpecialStatuses[gBattlerTarget].changedStatsBattlerId != BATTLE_PARTNER(gBattlerTarget)
Swapped webs don't trigger Defiant Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect? Also, fix Sticky Web not activating Defiant.
2021-11-23 10:54:30 +01:00
// && gSpecialStatuses[gBattlerTarget].changedStatsBattlerId != gBattlerTarget) // Why was this here? Needs investigating
&& !(gBattleScripting.stickyWebStatDrop == 1 && gSideTimers[targetSide].stickyWebBattlerSide == targetSide)) // Sticky Web must have been set by the foe
Defiant and Competitive
2019-02-16 12:54:11 +01:00
{
Swapped webs don't trigger Defiant Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect? Also, fix Sticky Web not activating Defiant.
2021-11-23 10:54:30 +01:00
gBattleScripting.stickyWebStatDrop = 0;
Defiant and Competitive
2019-02-16 12:54:11 +01:00
gBattlerAbility = gBattlerTarget;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_DefiantActivates;
if (GetBattlerAbility(gBattlerTarget) == ABILITY_DEFIANT)
SET_STATCHANGER(STAT_ATK, 2, FALSE);
else
SET_STATCHANGER(STAT_SPATK, 2, FALSE);
}
rename bank to battler
2018-02-06 02:46:59 +01:00
gActiveBattler = battler;
more renaming
2018-02-06 20:48:02 +01:00
BtlController_EmitPrintString(0, stringId);
MarkBattlerForControllerExec(gActiveBattler);
battle 2 is done
2017-10-06 17:06:45 +02:00
}
void ResetSentPokesToOpponentValue(void)
{
s32 i;
u32 bits = 0;
gSentPokesToOpponent[0] = 0;
gSentPokesToOpponent[1] = 0;
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i += 2)
more renaming
2018-02-06 20:48:02 +01:00
bits |= gBitTable[gBattlerPartyIndexes[i]];
battle 2 is done
2017-10-06 17:06:45 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 1; i < gBattlersCount; i += 2)
gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits;
battle 2 is done
2017-10-06 17:06:45 +02:00
}
Fix naming style of function
2020-07-28 04:22:16 +02:00
void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
s32 i = 0;
u32 bits = 0;
rename bank to battler
2018-02-06 02:46:59 +01:00
if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
u8 flank = ((battler & BIT_FLANK) >> 1);
gSentPokesToOpponent[flank] = 0;
battle 2 is done
2017-10-06 17:06:45 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i += 2)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (!(gAbsentBattlerFlags & gBitTable[i]))
more renaming
2018-02-06 20:48:02 +01:00
bits |= gBitTable[gBattlerPartyIndexes[i]];
battle 2 is done
2017-10-06 17:06:45 +02:00
}
rename bank to battler
2018-02-06 02:46:59 +01:00
gSentPokesToOpponent[flank] = bits;
battle 2 is done
2017-10-06 17:06:45 +02:00
}
}
Document some battle_util.c
2020-07-28 00:10:42 +02:00
void UpdateSentPokesToOpponentValue(u8 battler)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
battle 2 is done
2017-10-06 17:06:45 +02:00
{
Fix naming style of function
2020-07-28 04:22:16 +02:00
OpponentSwitchInResetSentPokesToOpponentValue(battler);
battle 2 is done
2017-10-06 17:06:45 +02:00
}
else
{
s32 i;
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 1; i < gBattlersCount; i++)
more renaming
2018-02-06 20:48:02 +01:00
gSentPokesToOpponent[(i & BIT_FLANK) >> 1] |= gBitTable[gBattlerPartyIndexes[battler]];
battle 2 is done
2017-10-06 17:06:45 +02:00
}
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
document frontier related
2018-07-01 11:15:42 +02:00
void BattleScriptPush(const u8 *bsPtr)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gBattleResources->battleScriptsStack->ptr[gBattleResources->battleScriptsStack->size++] = bsPtr;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
up to x48 and troubles
2017-09-22 21:33:49 +02:00
void BattleScriptPushCursor(void)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gBattleResources->battleScriptsStack->ptr[gBattleResources->battleScriptsStack->size++] = gBattlescriptCurrInstr;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
up to x48 and troubles
2017-09-22 21:33:49 +02:00
void BattleScriptPop(void)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gBattlescriptCurrInstr = gBattleResources->battleScriptsStack->ptr[--gBattleResources->battleScriptsStack->size];
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Update Unusable Moves
2018-07-31 23:09:47 +02:00
static bool32 IsGravityPreventingMove(u32 move)
{
if (!(gFieldStatuses & STATUS_FIELD_GRAVITY))
return FALSE;
switch (move)
{
case MOVE_BOUNCE:
case MOVE_FLY:
case MOVE_FLYING_PRESS:
Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.
2021-01-01 00:57:36 +01:00
case MOVE_HIGH_JUMP_KICK:
Update Unusable Moves
2018-07-31 23:09:47 +02:00
case MOVE_JUMP_KICK:
case MOVE_MAGNET_RISE:
case MOVE_SKY_DROP:
case MOVE_SPLASH:
case MOVE_TELEKINESIS:
Review changes
2020-11-13 18:51:50 +01:00
case MOVE_FLOATY_FALL:
Update Unusable Moves
2018-07-31 23:09:47 +02:00
return TRUE;
default:
return FALSE;
}
}
check bad move
2020-12-13 23:02:21 +01:00
bool32 IsHealBlockPreventingMove(u32 battler, u32 move)
Update Unusable Moves
2018-07-31 23:09:47 +02:00
{
if (!(gStatuses3[battler] & STATUS3_HEAL_BLOCK))
return FALSE;
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
Update Unusable Moves
2018-07-31 23:09:47 +02:00
switch (gBattleMoves[move].effect)
{
case EFFECT_ABSORB:
case EFFECT_MORNING_SUN:
case EFFECT_MOONLIGHT:
case EFFECT_RESTORE_HP:
case EFFECT_REST:
case EFFECT_ROOST:
case EFFECT_HEALING_WISH:
case EFFECT_WISH:
Add Dream Eater blocked by heal block
2018-11-30 20:48:43 +01:00
case EFFECT_DREAM_EATER:
Update Unusable Moves
2018-07-31 23:09:47 +02:00
return TRUE;
default:
return FALSE;
}
}
Code Belch effect
2019-02-01 14:17:24 +01:00
static bool32 IsBelchPreventingMove(u32 battler, u32 move)
{
if (gBattleMoves[move].effect != EFFECT_BELCH)
return FALSE;
return !(gBattleStruct->ateBerry[battler & BIT_SIDE] & gBitTable[gBattlerPartyIndexes[battler]]);
}
giant battle handler is done wohohohhohoho
2017-10-03 21:35:27 +02:00
u8 TrySetCantSelectMoveBattleScript(void)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Merge with master
2019-01-29 22:12:53 +01:00
u32 limitations = 0;
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
u8 moveId = gBattleResources->bufferB[gActiveBattler][2] & ~(RET_MEGA_EVOLUTION);
Tweak mega evo to hopefully be compatibile with recorded battles.
2018-09-17 20:37:33 +02:00
u32 move = gBattleMons[gActiveBattler].moves[moveId];
Update Unusable Moves
2018-07-31 23:09:47 +02:00
u32 holdEffect = GetBattlerHoldEffect(gActiveBattler, TRUE);
Refactor GF's idiotic coding
2019-01-27 13:52:02 +01:00
u16 *choicedMove = &gBattleStruct->choicedMove[gActiveBattler];
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
if (gDisableStructs[gActiveBattler].disabledMove == move && move != MOVE_NONE)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gBattleScripting.battler = gActiveBattler;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMoveInPalace;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMove;
Update Unusable Moves
2018-07-31 23:09:47 +02:00
limitations++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
}
rename bank to battler
2018-02-06 02:46:59 +01:00
if (move == gLastMoves[gActiveBattler] && move != MOVE_STRUGGLE && (gBattleMons[gActiveBattler].status2 & STATUS2_TORMENT))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
CancelMultiTurnMoves(gActiveBattler);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMoveInPalace;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMove;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
limitations++;
}
}
clean battle structs
2018-10-14 18:10:54 +02:00
if (gDisableStructs[gActiveBattler].tauntTimer != 0 && gBattleMoves[move].power == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTauntInPalace;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTaunt;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
limitations++;
}
}
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
if (gDisableStructs[gActiveBattler].throatChopTimer != 0 && gBattleMoves[move].flags & FLAG_SOUND)
{
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveThroatChopInPalace;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveThroatChop;
limitations++;
}
}
rename bank to battler
2018-02-06 02:46:59 +01:00
if (GetImprisonedMovesCount(gActiveBattler, move))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisonedMoveInPalace;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
{
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisonedMove;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
limitations++;
}
}
Update Unusable Moves
2018-07-31 23:09:47 +02:00
if (IsGravityPreventingMove(move))
{
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveGravityInPalace;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
Update Unusable Moves
2018-07-31 23:09:47 +02:00
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveGravity;
limitations++;
}
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
Update Unusable Moves
2018-07-31 23:09:47 +02:00
if (IsHealBlockPreventingMove(gActiveBattler, move))
{
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveHealBlockInPalace;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
Update Unusable Moves
2018-07-31 23:09:47 +02:00
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveHealBlock;
limitations++;
}
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
Code Belch effect
2019-02-01 14:17:24 +01:00
if (IsBelchPreventingMove(gActiveBattler, move))
{
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedBelchInPalace;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
Code Belch effect
2019-02-01 14:17:24 +01:00
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedBelch;
limitations++;
}
}
add stuff cheeks
2021-07-27 18:31:48 +02:00
if (move == MOVE_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[gActiveBattler].item) != POCKET_BERRIES)
{
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedBelchInPalace;
gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedStuffCheeks;
limitations++;
}
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
Update Unusable Moves
2018-07-31 23:09:47 +02:00
gPotentialItemEffectBattler = gActiveBattler;
if (HOLD_EFFECT_CHOICE(holdEffect) && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
gCurrentMove = *choicedMove;
rename bank to battler
2018-02-06 02:46:59 +01:00
gLastUsedItem = gBattleMons[gActiveBattler].item;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveChoiceItem;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
limitations++;
}
}
Fixed assault Vest restricting Me First
2021-11-12 23:24:50 +01:00
else if (holdEffect == HOLD_EFFECT_ASSAULT_VEST && gBattleMoves[move].power == 0 && move != MOVE_ME_FIRST)
Update Unusable Moves
2018-07-31 23:09:47 +02:00
{
gCurrentMove = move;
gLastUsedItem = gBattleMons[gActiveBattler].item;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
Update Unusable Moves
2018-07-31 23:09:47 +02:00
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveAssaultVest;
limitations++;
}
}
Implement Gorilla Tactics It's Choice Band but as an ability.
2021-10-30 07:31:44 +02:00
if ((GetBattlerAbility(gActiveBattler) == ABILITY_GORILLA_TACTICS) && *choicedMove != 0
&& *choicedMove != 0xFFFF && *choicedMove != move)
{
gCurrentMove = *choicedMove;
gLastUsedItem = gBattleMons[gActiveBattler].item;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveGorillaTactics;
limitations++;
}
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
Tweak mega evo to hopefully be compatibile with recorded battles.
2018-09-17 20:37:33 +02:00
if (gBattleMons[gActiveBattler].pp[moveId] == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingMoveWithNoPP;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
limitations++;
}
}
return limitations;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Update Unusable Moves
2018-07-31 23:09:47 +02:00
u8 holdEffect = GetBattlerHoldEffect(battlerId, TRUE);
pokemon and battle constants
2018-02-08 11:17:41 +01:00
u16 *choicedMove = &gBattleStruct->choicedMove[battlerId];
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
s32 i;
more battle labels
2018-02-08 12:13:29 +01:00
gPotentialItemEffectBattler = battlerId;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
for (i = 0; i < MAX_MON_MOVES; i++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].moves[i] == 0 && check & MOVE_LIMITATION_ZEROMOVE)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
Update Unusable Moves
2018-07-31 23:09:47 +02:00
else if (gBattleMons[battlerId].pp[i] == 0 && check & MOVE_LIMITATION_PP)
unusableMoves |= gBitTable[i];
else if (gBattleMons[battlerId].moves[i] == gDisableStructs[battlerId].disabledMove && check & MOVE_LIMITATION_DISABLED)
unusableMoves |= gBitTable[i];
else if (gBattleMons[battlerId].moves[i] == gLastMoves[battlerId] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[battlerId].status2 & STATUS2_TORMENT)
unusableMoves |= gBitTable[i];
Merge with master
2018-10-14 20:51:34 +02:00
else if (gDisableStructs[battlerId].tauntTimer && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[battlerId].moves[i]].power == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
Merge with master
2019-03-05 21:46:45 +01:00
else if (GetImprisonedMovesCount(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISON)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
Merge with master
2018-10-14 20:51:34 +02:00
else if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i])
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
Update Unusable Moves
2018-07-31 23:09:47 +02:00
else if (HOLD_EFFECT_CHOICE(holdEffect) && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i])
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
Oops
2021-11-13 14:58:18 +01:00
else if (holdEffect == HOLD_EFFECT_ASSAULT_VEST && gBattleMoves[gBattleMons[battlerId].moves[i]].power == 0 && gBattleMons[battlerId].moves[i] != MOVE_ME_FIRST)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
Update Unusable Moves
2018-07-31 23:09:47 +02:00
else if (IsGravityPreventingMove(gBattleMons[battlerId].moves[i]))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
Update Unusable Moves
2018-07-31 23:09:47 +02:00
else if (IsHealBlockPreventingMove(battlerId, gBattleMons[battlerId].moves[i]))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
Code Belch effect
2019-02-01 14:17:24 +01:00
else if (IsBelchPreventingMove(battlerId, gBattleMons[battlerId].moves[i]))
unusableMoves |= gBitTable[i];
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
else if (gDisableStructs[battlerId].throatChopTimer && gBattleMoves[gBattleMons[battlerId].moves[i]].flags & FLAG_SOUND)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
unusableMoves |= gBitTable[i];
add stuff cheeks
2021-07-27 18:31:48 +02:00
else if (gBattleMons[battlerId].moves[i] == MOVE_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[gActiveBattler].item) != POCKET_BERRIES)
unusableMoves |= gBitTable[i];
Implement Gorilla Tactics It's Choice Band but as an ability.
2021-10-30 07:31:44 +02:00
else if (GetBattlerAbility(battlerId) == ABILITY_GORILLA_TACTICS && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i])
unusableMoves |= gBitTable[i];
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
return unusableMoves;
}
bool8 AreAllMovesUnusable(void)
{
u8 unusable;
rename bank to battler
2018-02-06 02:46:59 +01:00
unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
document frontier related
2018-07-01 11:15:42 +02:00
if (unusable == 0xF) // All moves are unusable.
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].noValidMoves = TRUE;
rename bank to battler
2018-02-06 02:46:59 +01:00
gSelectionBattleScripts[gActiveBattler] = BattleScript_NoMovesLeft;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gActiveBattler].noValidMoves = FALSE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
return (unusable == 0xF);
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
s32 i;
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
u8 imprisonedMoves = 0;
Battle files - review changes
2018-07-16 20:47:30 +02:00
u8 battlerSide = GetBattlerSide(battlerId);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Battle files - review changes
2018-07-16 20:47:30 +02:00
if (battlerSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
s32 j;
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
for (j = 0; j < MAX_MON_MOVES; j++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
if (move == gBattleMons[i].moves[j])
break;
}
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
if (j < MAX_MON_MOVES)
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
imprisonedMoves++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
}
Fix typos This is an updated version of #554, since it hasn't been updated in two weeks.
2019-03-02 23:40:38 +01:00
return imprisonedMoves;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Implemented Mimicry Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-10-31 01:40:05 +02:00
void RestoreBattlerOriginalTypes(u8 battlerId)
{
gBattleMons[battlerId].type1 = gBaseStats[gBattleMons[battlerId].species].type1;
gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2;
}
void TryToApplyMimicry(u8 battlerId, bool8 various)
{
u32 moveType, move;
GET_MOVE_TYPE(move, moveType);
switch (gFieldStatuses)
{
case STATUS_FIELD_ELECTRIC_TERRAIN:
moveType = TYPE_ELECTRIC;
break;
case STATUS_FIELD_MISTY_TERRAIN:
moveType = TYPE_FAIRY;
break;
case STATUS_FIELD_GRASSY_TERRAIN:
moveType = TYPE_GRASS;
break;
case STATUS_FIELD_PSYCHIC_TERRAIN:
moveType = TYPE_PSYCHIC;
break;
default:
moveType = 0;
break;
}
if (moveType != 0 && !IS_BATTLER_OF_TYPE(battlerId, moveType))
{
SET_BATTLER_TYPE(battlerId, moveType);
PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, battlerId, gBattlerPartyIndexes[battlerId])
PREPARE_TYPE_BUFFER(gBattleTextBuff2, moveType);
if (!various)
BattleScriptPushCursorAndCallback(BattleScript_MimicryActivatesEnd3);
}
}
Made a function to lift Mimicry's effect
2021-11-04 16:20:31 +01:00
void TryToRevertMimicry(void)
{
s32 i;
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{
if (GetBattlerAbility(i) == ABILITY_MIMICRY)
RestoreBattlerOriginalTypes(i);
}
}
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
enum
{
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
ENDTURN_ORDER,
ENDTURN_REFLECT,
ENDTURN_LIGHT_SCREEN,
ENDTURN_AURORA_VEIL,
ENDTURN_MIST,
ENDTURN_LUCKY_CHANT,
ENDTURN_SAFEGUARD,
ENDTURN_TAILWIND,
ENDTURN_WISH,
ENDTURN_RAIN,
ENDTURN_SANDSTORM,
ENDTURN_SUN,
ENDTURN_HAIL,
ENDTURN_GRAVITY,
ENDTURN_WATER_SPORT,
ENDTURN_MUD_SPORT,
ENDTURN_TRICK_ROOM,
ENDTURN_WONDER_ROOM,
ENDTURN_MAGIC_ROOM,
ENDTURN_ELECTRIC_TERRAIN,
ENDTURN_MISTY_TERRAIN,
ENDTURN_GRASSY_TERRAIN,
ENDTURN_PSYCHIC_TERRAIN,
ENDTURN_ION_DELUGE,
ENDTURN_FAIRY_LOCK,
Turned Retaliate into a side timer
2021-10-16 10:41:50 +02:00
ENDTURN_RETALIATE,
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
ENDTURN_FIELD_COUNT,
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
};
u8 DoFieldEndTurnEffects(void)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
u8 effect = 0;
more renaming
2018-02-06 23:09:39 +01:00
for (gBattlerAttacker = 0; gBattlerAttacker < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattlerAttacker]; gBattlerAttacker++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
}
more renaming
2018-02-06 23:09:39 +01:00
for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattlerTarget]; gBattlerTarget++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
}
do
{
Add new field end turn effects
2018-07-21 13:24:20 +02:00
s32 i;
document frontier related
2018-07-01 11:15:42 +02:00
u8 side;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
move battle vars to c file
2018-02-07 22:53:40 +01:00
switch (gBattleStruct->turnCountersTracker)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_ORDER:
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document party status summary
2018-06-28 21:06:32 +02:00
gBattlerByTurnOrder[i] = i;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount - 1; i++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
s32 j;
rename bank to battler
2018-02-06 02:46:59 +01:00
for (j = i + 1; j < gBattlersCount; j++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document party status summary
2018-06-28 21:06:32 +02:00
if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], 0))
more battle2 done
2017-10-04 19:25:14 +02:00
SwapTurnOrder(i, j);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
}
Start Side/Field end turn
2018-07-21 12:10:08 +02:00
gBattleStruct->turnCountersTracker++;
Fix conflicts
2018-12-09 13:12:02 +01:00
gBattleStruct->turnSideTracker = 0;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
// fall through
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_REFLECT:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
while (gBattleStruct->turnSideTracker < 2)
{
document frontier related
2018-07-01 11:15:42 +02:00
side = gBattleStruct->turnSideTracker;
gActiveBattler = gBattlerAttacker = gSideTimers[side].reflectBattlerId;
if (gSideStatuses[side] & SIDE_STATUS_REFLECT)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
if (--gSideTimers[side].reflectTimer == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
gSideStatuses[side] &= ~SIDE_STATUS_REFLECT;
more battle labels
2017-11-26 17:15:28 +01:00
BattleScriptExecute(BattleScript_SideStatusWoreOff);
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_REFLECT);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
}
gBattleStruct->turnSideTracker++;
if (effect)
break;
}
if (!effect)
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattleStruct->turnSideTracker = 0;
}
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_LIGHT_SCREEN:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
while (gBattleStruct->turnSideTracker < 2)
{
document frontier related
2018-07-01 11:15:42 +02:00
side = gBattleStruct->turnSideTracker;
gActiveBattler = gBattlerAttacker = gSideTimers[side].lightscreenBattlerId;
if (gSideStatuses[side] & SIDE_STATUS_LIGHTSCREEN)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
if (--gSideTimers[side].lightscreenTimer == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
gSideStatuses[side] &= ~SIDE_STATUS_LIGHTSCREEN;
more battle labels
2017-11-26 17:15:28 +01:00
BattleScriptExecute(BattleScript_SideStatusWoreOff);
document frontier related
2018-07-01 11:15:42 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = side;
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_LIGHT_SCREEN);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
}
gBattleStruct->turnSideTracker++;
if (effect)
break;
}
if (!effect)
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattleStruct->turnSideTracker = 0;
}
break;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
case ENDTURN_AURORA_VEIL:
Fix conflicts
2018-12-09 13:12:02 +01:00
while (gBattleStruct->turnSideTracker < 2)
Add new Side turn effects
2018-07-21 12:56:07 +02:00
{
Fix conflicts
2018-12-09 13:12:02 +01:00
side = gBattleStruct->turnSideTracker;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
gActiveBattler = gBattlerAttacker = gSideTimers[side].auroraVeilBattlerId;
if (gSideStatuses[side] & SIDE_STATUS_AURORA_VEIL)
{
if (--gSideTimers[side].auroraVeilTimer == 0)
{
gSideStatuses[side] &= ~SIDE_STATUS_AURORA_VEIL;
Defog
2018-09-23 19:03:53 +02:00
BattleScriptExecute(BattleScript_SideStatusWoreOff);
gBattleCommunication[MULTISTRING_CHOOSER] = side;
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_AURORA_VEIL);
Add new Side turn effects
2018-07-21 12:56:07 +02:00
effect++;
}
}
Fix conflicts
2018-12-09 13:12:02 +01:00
gBattleStruct->turnSideTracker++;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
if (effect)
break;
}
if (!effect)
{
gBattleStruct->turnCountersTracker++;
Fix conflicts
2018-12-09 13:12:02 +01:00
gBattleStruct->turnSideTracker = 0;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
}
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_MIST:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
while (gBattleStruct->turnSideTracker < 2)
{
document frontier related
2018-07-01 11:15:42 +02:00
side = gBattleStruct->turnSideTracker;
gActiveBattler = gBattlerAttacker = gSideTimers[side].mistBattlerId;
if (gSideTimers[side].mistTimer != 0
&& --gSideTimers[side].mistTimer == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
gSideStatuses[side] &= ~SIDE_STATUS_MIST;
more battle labels
2017-11-26 17:15:28 +01:00
BattleScriptExecute(BattleScript_SideStatusWoreOff);
document frontier related
2018-07-01 11:15:42 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = side;
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_MIST);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
gBattleStruct->turnSideTracker++;
if (effect)
break;
}
if (!effect)
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattleStruct->turnSideTracker = 0;
}
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_SAFEGUARD:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
while (gBattleStruct->turnSideTracker < 2)
{
document frontier related
2018-07-01 11:15:42 +02:00
side = gBattleStruct->turnSideTracker;
gActiveBattler = gBattlerAttacker = gSideTimers[side].safeguardBattlerId;
if (gSideStatuses[side] & SIDE_STATUS_SAFEGUARD)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
if (--gSideTimers[side].safeguardTimer == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
gSideStatuses[side] &= ~SIDE_STATUS_SAFEGUARD;
more battle labels
2017-11-26 17:15:28 +01:00
BattleScriptExecute(BattleScript_SafeguardEnds);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
}
gBattleStruct->turnSideTracker++;
if (effect)
break;
}
if (!effect)
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattleStruct->turnSideTracker = 0;
}
break;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
case ENDTURN_LUCKY_CHANT:
Fix conflicts
2018-12-09 13:12:02 +01:00
while (gBattleStruct->turnSideTracker < 2)
Add new Side turn effects
2018-07-21 12:56:07 +02:00
{
Fix conflicts
2018-12-09 13:12:02 +01:00
side = gBattleStruct->turnSideTracker;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
gActiveBattler = gBattlerAttacker = gSideTimers[side].luckyChantBattlerId;
if (gSideStatuses[side] & SIDE_STATUS_LUCKY_CHANT)
{
if (--gSideTimers[side].luckyChantTimer == 0)
{
gSideStatuses[side] &= ~SIDE_STATUS_LUCKY_CHANT;
BattleScriptExecute(BattleScript_LuckyChantEnds);
effect++;
}
}
Fix conflicts
2018-12-09 13:12:02 +01:00
gBattleStruct->turnSideTracker++;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
if (effect)
break;
}
if (!effect)
{
gBattleStruct->turnCountersTracker++;
Fix conflicts
2018-12-09 13:12:02 +01:00
gBattleStruct->turnSideTracker = 0;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
}
break;
case ENDTURN_TAILWIND:
Fix conflicts
2018-12-09 13:12:02 +01:00
while (gBattleStruct->turnSideTracker < 2)
Add new Side turn effects
2018-07-21 12:56:07 +02:00
{
Fix conflicts
2018-12-09 13:12:02 +01:00
side = gBattleStruct->turnSideTracker;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
gActiveBattler = gBattlerAttacker = gSideTimers[side].tailwindBattlerId;
if (gSideStatuses[side] & SIDE_STATUS_TAILWIND)
{
if (--gSideTimers[side].tailwindTimer == 0)
{
gSideStatuses[side] &= ~SIDE_STATUS_TAILWIND;
BattleScriptExecute(BattleScript_TailwindEnds);
effect++;
}
}
Fix conflicts
2018-12-09 13:12:02 +01:00
gBattleStruct->turnSideTracker++;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
if (effect)
break;
}
if (!effect)
{
gBattleStruct->turnCountersTracker++;
Fix conflicts
2018-12-09 13:12:02 +01:00
gBattleStruct->turnSideTracker = 0;
Add new Side turn effects
2018-07-21 12:56:07 +02:00
}
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_WISH:
rename bank to battler
2018-02-06 02:46:59 +01:00
while (gBattleStruct->turnSideTracker < gBattlersCount)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document party status summary
2018-06-28 21:06:32 +02:00
gActiveBattler = gBattlerByTurnOrder[gBattleStruct->turnSideTracker];
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gWishFutureKnock.wishCounter[gActiveBattler] != 0
&& --gWishFutureKnock.wishCounter[gActiveBattler] == 0
&& gBattleMons[gActiveBattler].hp != 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gBattlerTarget = gActiveBattler;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_WishComesTrue);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
gBattleStruct->turnSideTracker++;
if (effect)
break;
}
if (!effect)
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_RAIN:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleWeather & WEATHER_RAIN_ANY)
{
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-26 21:14:05 +02:00
if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)
&& !(gBattleWeather & WEATHER_RAIN_PRIMAL))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
if (--gWishFutureKnock.weatherDuration == 0)
{
gBattleWeather &= ~WEATHER_RAIN_TEMPORARY;
gBattleWeather &= ~WEATHER_RAIN_DOWNPOUR;
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_RAIN_STOPPED;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR)
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DOWNPOUR_CONTINUES;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
else
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_RAIN_CONTINUES;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR)
more battle labels
2017-11-26 17:15:28 +01:00
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DOWNPOUR_CONTINUES;
more battle labels
2017-11-26 17:15:28 +01:00
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
else
more battle labels
2017-11-26 17:15:28 +01:00
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_RAIN_CONTINUES;
more battle labels
2017-11-26 17:15:28 +01:00
}
BattleScriptExecute(BattleScript_RainContinuesOrEnds);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_SANDSTORM:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleWeather & WEATHER_SANDSTORM_ANY)
{
if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
{
gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY;
more battle labels
2017-11-26 17:15:28 +01:00
gBattlescriptCurrInstr = BattleScript_SandStormHailEnds;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
more battle labels
2017-11-26 17:15:28 +01:00
{
gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues;
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
more battle labels
2017-11-26 17:15:28 +01:00
gBattleScripting.animArg1 = B_ANIM_SANDSTORM_CONTINUES;
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SANDSTORM;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(gBattlescriptCurrInstr);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_SUN:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleWeather & WEATHER_SUN_ANY)
{
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-26 21:14:05 +02:00
if (!(gBattleWeather & WEATHER_SUN_PERMANENT)
&& !(gBattleWeather & WEATHER_SUN_PRIMAL)
&& --gWishFutureKnock.weatherDuration == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
gBattleWeather &= ~WEATHER_SUN_TEMPORARY;
more battle labels
2017-11-26 17:15:28 +01:00
gBattlescriptCurrInstr = BattleScript_SunlightFaded;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
more battle labels
2017-11-26 17:15:28 +01:00
{
gBattlescriptCurrInstr = BattleScript_SunlightContinues;
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(gBattlescriptCurrInstr);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case ENDTURN_HAIL:
if (gBattleWeather & WEATHER_HAIL_ANY)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
if (!(gBattleWeather & WEATHER_HAIL_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
gBattleWeather &= ~WEATHER_HAIL_TEMPORARY;
more battle labels
2017-11-26 17:15:28 +01:00
gBattlescriptCurrInstr = BattleScript_SandStormHailEnds;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
{
more battle labels
2017-11-26 17:15:28 +01:00
gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues;
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
gBattleScripting.animArg1 = B_ANIM_HAIL_CONTINUES;
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_HAIL;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(gBattlescriptCurrInstr);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
Add new field end turn effects
2018-07-21 13:24:20 +02:00
case ENDTURN_TRICK_ROOM:
if (gFieldStatuses & STATUS_FIELD_TRICK_ROOM && --gFieldTimers.trickRoomTimer == 0)
{
gFieldStatuses &= ~(STATUS_FIELD_TRICK_ROOM);
BattleScriptExecute(BattleScript_TrickRoomEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
Add new field end turn effects
2018-07-21 13:24:20 +02:00
case ENDTURN_WONDER_ROOM:
if (gFieldStatuses & STATUS_FIELD_WONDER_ROOM && --gFieldTimers.wonderRoomTimer == 0)
{
gFieldStatuses &= ~(STATUS_FIELD_WONDER_ROOM);
BattleScriptExecute(BattleScript_WonderRoomEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_MAGIC_ROOM:
if (gFieldStatuses & STATUS_FIELD_MAGIC_ROOM && --gFieldTimers.magicRoomTimer == 0)
{
gFieldStatuses &= ~(STATUS_FIELD_MAGIC_ROOM);
BattleScriptExecute(BattleScript_MagicRoomEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_ELECTRIC_TERRAIN:
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN
Optimized terrain timers
2021-11-06 23:46:52 +01:00
&& (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.terrainTimer == 0))
Add new field end turn effects
2018-07-21 13:24:20 +02:00
{
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
gFieldStatuses &= ~(STATUS_FIELD_ELECTRIC_TERRAIN | STATUS_FIELD_TERRAIN_PERMANENT);
Made a function to lift Mimicry's effect
2021-11-04 16:20:31 +01:00
TryToRevertMimicry();
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScriptExecute(BattleScript_ElectricTerrainEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_MISTY_TERRAIN:
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
if (gFieldStatuses & STATUS_FIELD_MISTY_TERRAIN
Optimized terrain timers
2021-11-06 23:46:52 +01:00
&& (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.terrainTimer == 0))
Add new field end turn effects
2018-07-21 13:24:20 +02:00
{
gFieldStatuses &= ~(STATUS_FIELD_MISTY_TERRAIN);
Made a function to lift Mimicry's effect
2021-11-04 16:20:31 +01:00
TryToRevertMimicry();
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScriptExecute(BattleScript_MistyTerrainEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_GRASSY_TERRAIN:
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
if (gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN)
{
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
if (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT)
Optimized terrain timers
2021-11-06 23:46:52 +01:00
&& (gFieldTimers.terrainTimer == 0 || --gFieldTimers.terrainTimer == 0))
Implemented Mimicry Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-10-31 01:40:05 +02:00
{
Grassy Terrain v2 All corrected, simplest version Also includes proper ending strings for all terrains
2019-03-02 23:54:08 +01:00
gFieldStatuses &= ~(STATUS_FIELD_GRASSY_TERRAIN);
Made a function to lift Mimicry's effect
2021-11-04 16:20:31 +01:00
TryToRevertMimicry();
Implemented Mimicry Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-10-31 01:40:05 +02:00
}
Fix Grassy Terrain bad loop
2020-06-29 18:26:53 +02:00
BattleScriptExecute(BattleScript_GrassyTerrainHeals);
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
effect++;
}
Add new field end turn effects
2018-07-21 13:24:20 +02:00
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_PSYCHIC_TERRAIN:
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN
Optimized terrain timers
2021-11-06 23:46:52 +01:00
&& (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.terrainTimer == 0))
Add new field end turn effects
2018-07-21 13:24:20 +02:00
{
gFieldStatuses &= ~(STATUS_FIELD_PSYCHIC_TERRAIN);
Made a function to lift Mimicry's effect
2021-11-04 16:20:31 +01:00
TryToRevertMimicry();
Add new field end turn effects
2018-07-21 13:24:20 +02:00
BattleScriptExecute(BattleScript_PsychicTerrainEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_WATER_SPORT:
if (gFieldStatuses & STATUS_FIELD_WATERSPORT && --gFieldTimers.waterSportTimer == 0)
{
gFieldStatuses &= ~(STATUS_FIELD_WATERSPORT);
BattleScriptExecute(BattleScript_WaterSportEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_MUD_SPORT:
if (gFieldStatuses & STATUS_FIELD_MUDSPORT && --gFieldTimers.mudSportTimer == 0)
{
gFieldStatuses &= ~(STATUS_FIELD_MUDSPORT);
BattleScriptExecute(BattleScript_MudSportEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
break;
Add a couple of gen4 moves battlescripts
2018-07-21 16:34:43 +02:00
case ENDTURN_GRAVITY:
if (gFieldStatuses & STATUS_FIELD_GRAVITY && --gFieldTimers.gravityTimer == 0)
{
gFieldStatuses &= ~(STATUS_FIELD_GRAVITY);
BattleScriptExecute(BattleScript_GravityEnds);
effect++;
}
gBattleStruct->turnCountersTracker++;
break;
Topsy Turvy and Ion Deluge.
2018-08-04 23:34:29 +02:00
case ENDTURN_ION_DELUGE:
gFieldStatuses &= ~(STATUS_FIELD_ION_DELUGE);
gBattleStruct->turnCountersTracker++;
break;
Fairy Lock
2020-04-20 19:41:07 +02:00
case ENDTURN_FAIRY_LOCK:
if (gFieldStatuses & STATUS_FIELD_FAIRY_LOCK && --gFieldTimers.fairyLockTimer == 0)
{
gFieldStatuses &= ~(STATUS_FIELD_FAIRY_LOCK);
}
gBattleStruct->turnCountersTracker++;
break;
Turned Retaliate into a side timer
2021-10-16 10:41:50 +02:00
case ENDTURN_RETALIATE:
Made ENDTURN_RETALIATE use constants
2021-10-22 16:43:38 +02:00
if (gSideTimers[B_SIDE_PLAYER].retaliateTimer > 0)
gSideTimers[B_SIDE_PLAYER].retaliateTimer--;
if (gSideTimers[B_SIDE_OPPONENT].retaliateTimer > 0)
gSideTimers[B_SIDE_OPPONENT].retaliateTimer--;
Turned Retaliate into a side timer
2021-10-16 10:41:50 +02:00
gBattleStruct->turnCountersTracker++;
break;
Start Side/Field end turn
2018-07-21 12:10:08 +02:00
case ENDTURN_FIELD_COUNT:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
break;
}
} while (effect == 0);
Add new field end turn effects
2018-07-21 13:24:20 +02:00
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
return (gBattleMainFunc != BattleTurnPassed);
}
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
enum
{
ENDTURN_INGRAIN,
ENDTURN_AQUA_RING,
ENDTURN_ABILITIES,
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
ENDTURN_ITEMS1,
ENDTURN_LEECH_SEED,
ENDTURN_POISON,
ENDTURN_BAD_POISON,
ENDTURN_BURN,
ENDTURN_NIGHTMARES,
ENDTURN_CURSE,
ENDTURN_WRAP,
Gen 8 moves initial commit Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 07:50:54 +01:00
ENDTURN_OCTOLOCK,
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
ENDTURN_UPROAR,
ENDTURN_THRASH,
ENDTURN_FLINCH,
ENDTURN_DISABLE,
ENDTURN_ENCORE,
ENDTURN_MAGNET_RISE,
ENDTURN_TELEKINESIS,
ENDTURN_HEALBLOCK,
ENDTURN_EMBARGO,
ENDTURN_LOCK_ON,
ENDTURN_CHARGE,
ENDTURN_LASER_FOCUS,
ENDTURN_TAUNT,
ENDTURN_YAWN,
ENDTURN_ITEMS2,
ENDTURN_ORBS,
ENDTURN_ROOST,
ENDTURN_ELECTRIFY,
ENDTURN_POWDER,
ENDTURN_THROAT_CHOP,
ENDTURN_SLOW_START,
Implemented Plasma Fists
2021-10-17 17:27:17 +02:00
ENDTURN_PLASMA_FISTS,
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
ENDTURN_BATTLER_COUNT
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
};
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
// Ingrain, Leech Seed, Strength Sap and Aqua Ring
s32 GetDrainedBigRootHp(u32 battler, s32 hp)
{
if (GetBattlerHoldEffect(battler, TRUE) == HOLD_EFFECT_BIG_ROOT)
hp = (hp * 1300) / 1000;
if (hp == 0)
hp = 1;
return hp * -1;
}
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
2021-05-01 12:37:23 +02:00
#define MAGIC_GUARD_CHECK \
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
if (ability == ABILITY_MAGIC_GUARD) \
{\
RecordAbilityBattle(gActiveBattler, ability);\
gBattleStruct->turnEffectsTracker++;\
break;\
}
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
u8 DoBattlerEndTurnEffects(void)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
u32 ability, i, effect = 0;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 15:03:14 +02:00
gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK);
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
while (gBattleStruct->turnEffectsBattlerId < gBattlersCount && gBattleStruct->turnEffectsTracker <= ENDTURN_BATTLER_COUNT)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document party status summary
2018-06-28 21:06:32 +02:00
gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->turnEffectsBattlerId];
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->turnEffectsBattlerId++;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
continue;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
ability = GetBattlerAbility(gActiveBattler);
switch (gBattleStruct->turnEffectsTracker)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
case ENDTURN_INGRAIN: // ingrain
if ((gStatuses3[gActiveBattler] & STATUS3_ROOTED)
&& !BATTLER_MAX_HP(gActiveBattler)
&& !(gStatuses3[gActiveBattler] & STATUS3_HEAL_BLOCK)
&& gBattleMons[gActiveBattler].hp != 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
gBattleMoveDamage = GetDrainedBigRootHp(gActiveBattler, gBattleMons[gActiveBattler].maxHP / 16);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
BattleScriptExecute(BattleScript_IngrainTurnHeal);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_AQUA_RING: // aqua ring
if ((gStatuses3[gActiveBattler] & STATUS3_AQUA_RING)
&& !BATTLER_MAX_HP(gActiveBattler)
&& !(gStatuses3[gActiveBattler] & STATUS3_HEAL_BLOCK)
&& gBattleMons[gActiveBattler].hp != 0)
{
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
gBattleMoveDamage = GetDrainedBigRootHp(gActiveBattler, gBattleMons[gActiveBattler].maxHP / 16);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
BattleScriptExecute(BattleScript_AquaRingHeal);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_ABILITIES: // end turn abilities
if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBattler, 0, 0, 0))
effect++;
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_ITEMS1: // item effects
if (ItemBattleEffects(1, gActiveBattler, FALSE))
effect++;
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_ITEMS2: // item effects again
if (ItemBattleEffects(1, gActiveBattler, TRUE))
effect++;
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_ORBS:
if (ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE))
effect++;
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_LEECH_SEED: // leech seed
if ((gStatuses3[gActiveBattler] & STATUS3_LEECHSEED)
&& gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER].hp != 0
&& gBattleMons[gActiveBattler].hp != 0)
{
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
2021-05-01 12:37:23 +02:00
MAGIC_GUARD_CHECK;
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER; // Notice gBattlerTarget is actually the HP receiver.
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
gBattleScripting.animArg1 = gBattlerTarget;
gBattleScripting.animArg2 = gBattlerAttacker;
BattleScriptExecute(BattleScript_LeechSeedTurnDrain);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_POISON: // poison
if ((gBattleMons[gActiveBattler].status1 & STATUS1_POISON)
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
&& gBattleMons[gActiveBattler].hp != 0)
Updated switch mechanics
2019-08-22 15:57:33 +02:00
{
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
2021-05-01 12:37:23 +02:00
MAGIC_GUARD_CHECK;
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (ability == ABILITY_POISON_HEAL)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (!BATTLER_MAX_HP(gActiveBattler) && !(gStatuses3[gActiveBattler] & STATUS3_HEAL_BLOCK))
{
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
gBattleMoveDamage *= -1;
BattleScriptExecute(BattleScript_PoisonHealActivates);
effect++;
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
BattleScriptExecute(BattleScript_PoisonTurnDmg);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_BAD_POISON: // toxic poison
if ((gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON)
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
&& gBattleMons[gActiveBattler].hp != 0)
Updated switch mechanics
2019-08-22 15:57:33 +02:00
{
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
2021-05-01 12:37:23 +02:00
MAGIC_GUARD_CHECK;
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (ability == ABILITY_POISON_HEAL)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (!BATTLER_MAX_HP(gActiveBattler) && !(gStatuses3[gActiveBattler] & STATUS3_HEAL_BLOCK))
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
{
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleMoveDamage *= -1;
BattleScriptExecute(BattleScript_PoisonHealActivates);
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
effect++;
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
Clean up some battle scr cmd data
2020-07-17 02:12:12 +02:00
if ((gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_COUNTER) != STATUS1_TOXIC_TURN(15)) // not 16 turns
gBattleMons[gActiveBattler].status1 += STATUS1_TOXIC_TURN(1);
gBattleMoveDamage *= (gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_COUNTER) >> 8;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_PoisonTurnDmg);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_BURN: // burn
if ((gBattleMons[gActiveBattler].status1 & STATUS1_BURN)
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
&& gBattleMons[gActiveBattler].hp != 0)
Updated switch mechanics
2019-08-22 15:57:33 +02:00
{
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
2021-05-01 12:37:23 +02:00
MAGIC_GUARD_CHECK;
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
Battle config options (#243) * Option to use pre-GenVI critical hit multiplier. * Clarified the option that multiplies EXP by 1.5 for trainer battles. * Fixed code style. * Option to change Burn damage. * Option to change to Gen 7 paralysis drop. * Ordered settings. * Implemented review suggestions.
2020-02-08 09:51:55 +01:00
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (B_BURN_DAMAGE >= GEN_7 ? 16 : 8);
Heatproof lowers burn dmg
2019-12-23 17:41:42 +01:00
if (ability == ABILITY_HEATPROOF)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
if (gBattleMoveDamage > (gBattleMoveDamage / 2) + 1) // Record ability if the burn takes less damage than it normally would.
RecordAbilityBattle(gActiveBattler, ABILITY_HEATPROOF);
Heatproof lowers burn dmg
2019-12-23 17:41:42 +01:00
gBattleMoveDamage /= 2;
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
BattleScriptExecute(BattleScript_BurnTurnDmg);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_NIGHTMARES: // spooky nightmares
if ((gBattleMons[gActiveBattler].status2 & STATUS2_NIGHTMARE)
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
&& gBattleMons[gActiveBattler].hp != 0)
Updated switch mechanics
2019-08-22 15:57:33 +02:00
{
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
2021-05-01 12:37:23 +02:00
MAGIC_GUARD_CHECK;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
// R/S does not perform this sleep check, which causes the nightmare effect to
// persist even after the affected Pokemon has been awakened by Shed Skin.
if (gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
BattleScriptExecute(BattleScript_NightmareTurnDmg);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleMons[gActiveBattler].status2 &= ~STATUS2_NIGHTMARE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_CURSE: // curse
if ((gBattleMons[gActiveBattler].status2 & STATUS2_CURSED)
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
&& gBattleMons[gActiveBattler].hp != 0)
Updated switch mechanics
2019-08-22 15:57:33 +02:00
{
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
2021-05-01 12:37:23 +02:00
MAGIC_GUARD_CHECK;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
BattleScriptExecute(BattleScript_CurseTurnDmg);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_WRAP: // wrap
if ((gBattleMons[gActiveBattler].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBattler].hp != 0)
{
if (--gDisableStructs[gActiveBattler].wrapTurns != 0) // damaged by wrap
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
2021-05-01 12:37:23 +02:00
MAGIC_GUARD_CHECK;
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleScripting.animArg1 = gBattleStruct->wrappedMove[gActiveBattler];
gBattleScripting.animArg2 = gBattleStruct->wrappedMove[gActiveBattler] >> 8;
PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleStruct->wrappedMove[gActiveBattler]);
gBattlescriptCurrInstr = BattleScript_WrapTurnDmg;
if (GetBattlerHoldEffect(gBattleStruct->wrappedBy[gActiveBattler], TRUE) == HOLD_EFFECT_BINDING_BAND)
[battle_engine] fix wrap style move damage
2021-01-15 16:04:09 +01:00
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / ((B_BINDING_DAMAGE >= GEN_6) ? 6 : 8);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else
[battle_engine] fix wrap style move damage
2021-01-15 16:04:09 +01:00
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / ((B_BINDING_DAMAGE >= GEN_6) ? 8 : 16);
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else // broke free
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleMons[gActiveBattler].status2 &= ~(STATUS2_WRAPPED);
PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleStruct->wrappedMove[gActiveBattler]);
gBattlescriptCurrInstr = BattleScript_WrapEnds;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
BattleScriptExecute(gBattlescriptCurrInstr);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
Gen 8 moves initial commit Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 07:50:54 +01:00
case ENDTURN_OCTOLOCK:
if (gDisableStructs[gActiveBattler].octolock
&& !(GetBattlerAbility(gActiveBattler) == ABILITY_CLEAR_BODY
|| GetBattlerAbility(gActiveBattler) == ABILITY_FULL_METAL_BODY
|| GetBattlerAbility(gActiveBattler) == ABILITY_WHITE_SMOKE))
{
gBattlerTarget = gActiveBattler;
BattleScriptExecute(BattleScript_OctolockEndTurn);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
case ENDTURN_UPROAR: // uproar
if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
{
for (gBattlerAttacker = 0; gBattlerAttacker < gBattlersCount; gBattlerAttacker++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_SOUNDPROOF)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP);
gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
BattleScriptExecute(BattleScript_MonWokeUpInUproar);
gActiveBattler = gBattlerAttacker;
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
MarkBattlerForControllerExec(gActiveBattler);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
}
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (gBattlerAttacker != gBattlersCount)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
effect = 2; // a pokemon was awaken
break;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattlerAttacker = gActiveBattler;
Merge with master
2020-07-27 14:51:39 +02:00
gBattleMons[gActiveBattler].status2 -= STATUS2_UPROAR_TURN(1); // uproar timer goes down
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (WasUnableToUseMove(gActiveBattler))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
CancelMultiTurnMoves(gActiveBattler);
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_UPROAR_ENDS;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_UPROAR_CONTINUES;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleMons[gActiveBattler].status2 |= STATUS2_MULTIPLETURNS;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_UPROAR_ENDS;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
CancelMultiTurnMoves(gActiveBattler);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
BattleScriptExecute(BattleScript_PrintUproarOverTurns);
effect = 1;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
if (effect != 2)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattleStruct->turnEffectsTracker++;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
break;
case ENDTURN_THRASH: // thrash
if (gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE)
{
Merge with master
2020-07-27 14:51:39 +02:00
gBattleMons[gActiveBattler].status2 -= STATUS2_LOCK_CONFUSE_TURN(1);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (WasUnableToUseMove(gActiveBattler))
CancelMultiTurnMoves(gActiveBattler);
else if (!(gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE)
&& (gBattleMons[gActiveBattler].status2 & STATUS2_MULTIPLETURNS))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleMons[gActiveBattler].status2 &= ~(STATUS2_MULTIPLETURNS);
if (!(gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleScripting.moveEffect = MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER;
Merge with master
2020-03-13 23:02:17 +01:00
SetMoveEffect(TRUE, 0);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION)
BattleScriptExecute(BattleScript_ThrashConfuses);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect++;
}
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
gBattleStruct->turnEffectsTracker++;
break;
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
case ENDTURN_FLINCH: // reset flinch
gBattleMons[gActiveBattler].status2 &= ~(STATUS2_FLINCHED);
gBattleStruct->turnEffectsTracker++;
fix rampage cancelling
2021-11-21 00:35:56 +01:00
break;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
case ENDTURN_DISABLE: // disable
if (gDisableStructs[gActiveBattler].disableTimer != 0)
{
for (i = 0; i < MAX_MON_MOVES; i++)
rename bank to battler
2018-02-06 02:46:59 +01:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (gDisableStructs[gActiveBattler].disabledMove == gBattleMons[gActiveBattler].moves[i])
break;
Taunt fix etc. Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's. Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 03:45:21 +01:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (i == MAX_MON_MOVES) // pokemon does not have the disabled move anymore
rename bank to battler
2018-02-06 02:46:59 +01:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gDisableStructs[gActiveBattler].disabledMove = 0;
gDisableStructs[gActiveBattler].disableTimer = 0;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else if (--gDisableStructs[gActiveBattler].disableTimer == 0) // disable ends
New crit calculator.
2018-07-23 21:36:05 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gDisableStructs[gActiveBattler].disabledMove = 0;
BattleScriptExecute(BattleScript_DisabledNoMore);
effect++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_ENCORE: // encore
if (gDisableStructs[gActiveBattler].encoreTimer != 0)
{
if (gBattleMons[gActiveBattler].moves[gDisableStructs[gActiveBattler].encoredMovePos] != gDisableStructs[gActiveBattler].encoredMove) // pokemon does not have the encored move anymore
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gDisableStructs[gActiveBattler].encoredMove = 0;
gDisableStructs[gActiveBattler].encoreTimer = 0;
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
else if (--gDisableStructs[gActiveBattler].encoreTimer == 0
|| gBattleMons[gActiveBattler].pp[gDisableStructs[gActiveBattler].encoredMovePos] == 0)
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gDisableStructs[gActiveBattler].encoredMove = 0;
gDisableStructs[gActiveBattler].encoreTimer = 0;
BattleScriptExecute(BattleScript_EncoredNoMore);
effect++;
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_LOCK_ON: // lock-on decrement
if (gStatuses3[gActiveBattler] & STATUS3_ALWAYS_HITS)
Merge with master
2020-07-27 14:51:39 +02:00
gStatuses3[gActiveBattler] -= STATUS3_ALWAYS_HITS_TURN(1);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_CHARGE: // charge
if (gDisableStructs[gActiveBattler].chargeTimer && --gDisableStructs[gActiveBattler].chargeTimer == 0)
gStatuses3[gActiveBattler] &= ~STATUS3_CHARGED_UP;
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_TAUNT: // taunt
if (gDisableStructs[gActiveBattler].tauntTimer && --gDisableStructs[gActiveBattler].tauntTimer == 0)
{
BattleScriptExecute(BattleScript_BufferEndTurn);
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_TAUNT);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_YAWN: // yawn
if (gStatuses3[gActiveBattler] & STATUS3_YAWN)
{
Merge with master
2020-07-27 14:51:39 +02:00
gStatuses3[gActiveBattler] -= STATUS3_YAWN_TURN(1);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (!(gStatuses3[gActiveBattler] & STATUS3_YAWN) && !(gBattleMons[gActiveBattler].status1 & STATUS1_ANY)
Fixed Yawn + Vital Spirit + Gastro Acid
2021-10-02 23:44:04 +02:00
&& GetBattlerAbility(gActiveBattler) != ABILITY_VITAL_SPIRIT
&& GetBattlerAbility(gActiveBattler) != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBattler)
Implement Leaf Guard.
2019-12-16 09:29:20 +01:00
&& !IsLeafGuardProtected(gActiveBattler))
Updated switch mechanics
2019-08-22 15:57:33 +02:00
{
CancelMultiTurnMoves(gActiveBattler);
gEffectBattler = gActiveBattler;
fix electric/misty yawn/rest interactions
2021-08-12 22:08:41 +02:00
if (IsBattlerTerrainAffected(gActiveBattler, STATUS_FIELD_ELECTRIC_TERRAIN))
{
some syntax/format fixes
2021-09-15 23:15:50 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TERRAINPREVENTS_ELECTRIC;
fix electric/misty yawn/rest interactions
2021-08-12 22:08:41 +02:00
BattleScriptExecute(BattleScript_TerrainPreventsEnd2);
}
else if (IsBattlerTerrainAffected(gActiveBattler, STATUS_FIELD_MISTY_TERRAIN))
{
some syntax/format fixes
2021-09-15 23:15:50 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TERRAINPREVENTS_MISTY;
fix electric/misty yawn/rest interactions
2021-08-12 22:08:41 +02:00
BattleScriptExecute(BattleScript_TerrainPreventsEnd2);
}
else
{
gBattleMons[gActiveBattler].status1 |= (Random() & 3) + 2;
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
MarkBattlerForControllerExec(gActiveBattler);
BattleScriptExecute(BattleScript_YawnMakesAsleep);
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
effect++;
}
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_LASER_FOCUS:
if (gStatuses3[gActiveBattler] & STATUS3_LASER_FOCUS)
{
if (gDisableStructs[gActiveBattler].laserFocusTimer == 0 || --gDisableStructs[gActiveBattler].laserFocusTimer == 0)
gStatuses3[gActiveBattler] &= ~(STATUS3_LASER_FOCUS);
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_EMBARGO:
if (gStatuses3[gActiveBattler] & STATUS3_EMBARGO)
{
if (gDisableStructs[gActiveBattler].embargoTimer == 0 || --gDisableStructs[gActiveBattler].embargoTimer == 0)
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gStatuses3[gActiveBattler] &= ~(STATUS3_EMBARGO);
BattleScriptExecute(BattleScript_EmbargoEndTurn);
effect++;
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_MAGNET_RISE:
if (gStatuses3[gActiveBattler] & STATUS3_MAGNET_RISE)
{
if (gDisableStructs[gActiveBattler].magnetRiseTimer == 0 || --gDisableStructs[gActiveBattler].magnetRiseTimer == 0)
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gStatuses3[gActiveBattler] &= ~(STATUS3_MAGNET_RISE);
BattleScriptExecute(BattleScript_BufferEndTurn);
PREPARE_STRING_BUFFER(gBattleTextBuff1, STRINGID_ELECTROMAGNETISM);
effect++;
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_TELEKINESIS:
if (gStatuses3[gActiveBattler] & STATUS3_TELEKINESIS)
{
if (gDisableStructs[gActiveBattler].telekinesisTimer == 0 || --gDisableStructs[gActiveBattler].telekinesisTimer == 0)
Add Roost endturn effect
2018-07-19 21:18:20 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gStatuses3[gActiveBattler] &= ~(STATUS3_TELEKINESIS);
BattleScriptExecute(BattleScript_TelekinesisEndTurn);
effect++;
Add Roost endturn effect
2018-07-19 21:18:20 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_HEALBLOCK:
if (gStatuses3[gActiveBattler] & STATUS3_HEAL_BLOCK)
{
if (gDisableStructs[gActiveBattler].healBlockTimer == 0 || --gDisableStructs[gActiveBattler].healBlockTimer == 0)
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
{
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gStatuses3[gActiveBattler] &= ~(STATUS3_HEAL_BLOCK);
BattleScriptExecute(BattleScript_BufferEndTurn);
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_HEAL_BLOCK);
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
effect++;
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_ROOST: // Return flying type.
if (gBattleResources->flags->flags[gActiveBattler] & RESOURCE_FLAG_ROOST)
{
gBattleResources->flags->flags[gActiveBattler] &= ~(RESOURCE_FLAG_ROOST);
gBattleMons[gActiveBattler].type1 = gBattleStruct->roostTypes[gActiveBattler][0];
gBattleMons[gActiveBattler].type2 = gBattleStruct->roostTypes[gActiveBattler][1];
}
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_ELECTRIFY:
Moved Electrified to Status4.
2021-10-10 06:13:23 +02:00
gStatuses4[gActiveBattler] &= ~(STATUS4_ELECTRIFIED);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
gBattleStruct->turnEffectsTracker++;
case ENDTURN_POWDER:
gBattleMons[gActiveBattler].status2 &= ~(STATUS2_POWDER);
gBattleStruct->turnEffectsTracker++;
case ENDTURN_THROAT_CHOP:
if (gDisableStructs[gActiveBattler].throatChopTimer && --gDisableStructs[gActiveBattler].throatChopTimer == 0)
{
BattleScriptExecute(BattleScript_ThroatChopEndTurn);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
Slow Start
2020-04-18 12:52:15 +02:00
case ENDTURN_SLOW_START:
if (gDisableStructs[gActiveBattler].slowStartTimer
&& --gDisableStructs[gActiveBattler].slowStartTimer == 0
&& ability == ABILITY_SLOW_START)
{
BattleScriptExecute(BattleScript_SlowStartEnds);
effect++;
}
gBattleStruct->turnEffectsTracker++;
break;
Implemented Plasma Fists
2021-10-17 17:27:17 +02:00
case ENDTURN_PLASMA_FISTS:
for (i = 0; i < gBattlersCount; i++)
gStatuses4[i] &= ~(STATUS4_PLASMA_FISTS);
gBattleStruct->turnEffectsTracker++;
break;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
case ENDTURN_BATTLER_COUNT: // done
gBattleStruct->turnEffectsTracker = 0;
gBattleStruct->turnEffectsBattlerId++;
break;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (effect != 0)
return effect;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 15:03:14 +02:00
gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
return 0;
}
label battle stuff
2017-12-02 14:08:55 +01:00
bool8 HandleWishPerishSongOnTurnEnd(void)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 15:03:14 +02:00
gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
label battle stuff
2017-12-02 14:08:55 +01:00
switch (gBattleStruct->wishPerishSongState)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
case 0:
move battle vars to c file
2018-02-07 22:53:40 +01:00
while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gActiveBattler = gBattleStruct->wishPerishSongBattlerId;
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->wishPerishSongBattlerId++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
continue;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->wishPerishSongBattlerId++;
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gWishFutureKnock.futureSightCounter[gActiveBattler] != 0
&& --gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
&& gBattleMons[gActiveBattler].hp != 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gWishFutureKnock.futureSightMove[gActiveBattler] == MOVE_FUTURE_SIGHT)
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_FUTURE_SIGHT;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
else
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DOOM_DESIRE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
PREPARE_MOVE_BUFFER(gBattleTextBuff1, gWishFutureKnock.futureSightMove[gActiveBattler]);
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
more renaming
2018-02-06 23:09:39 +01:00
gBattlerTarget = gActiveBattler;
gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
move battle vars to c file
2018-02-07 22:53:40 +01:00
gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF;
Fix Future Sight
2018-12-02 18:47:39 +01:00
gCurrentMove = gWishFutureKnock.futureSightMove[gActiveBattler];
SetTypeBeforeUsingMove(gCurrentMove, gActiveBattler);
name more battlescripts
2017-11-26 17:26:11 +01:00
BattleScriptExecute(BattleScript_MonTookFutureAttack);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
&& gWishFutureKnock.futureSightCounter[gActiveBattler ^ BIT_FLANK] == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)] &= ~(SIDE_STATUS_FUTUREATTACK);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
return TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
}
Fix Future Sight
2018-12-02 18:47:39 +01:00
gBattleStruct->wishPerishSongState = 1;
gBattleStruct->wishPerishSongBattlerId = 0;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
// fall through
case 1:
move battle vars to c file
2018-02-07 22:53:40 +01:00
while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document party status summary
2018-06-28 21:06:32 +02:00
gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->wishPerishSongBattlerId];
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->wishPerishSongBattlerId++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
continue;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->wishPerishSongBattlerId++;
rename bank to battler
2018-02-06 02:46:59 +01:00
if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
clean battle structs
2018-10-14 18:10:54 +02:00
PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gActiveBattler].perishSongTimer);
if (gDisableStructs[gActiveBattler].perishSongTimer == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
gStatuses3[gActiveBattler] &= ~STATUS3_PERISH_SONG;
gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
name more battlescripts
2017-11-26 17:26:11 +01:00
gBattlescriptCurrInstr = BattleScript_PerishSongTakesLife;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else
{
clean battle structs
2018-10-14 18:10:54 +02:00
gDisableStructs[gActiveBattler].perishSongTimer--;
name more battlescripts
2017-11-26 17:26:11 +01:00
gBattlescriptCurrInstr = BattleScript_PerishSongCountGoesDown;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(gBattlescriptCurrInstr);
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
return TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
}
// Hm...
{
label battle stuff
2017-12-02 14:08:55 +01:00
u8 *state = &gBattleStruct->wishPerishSongState;
*state = 2;
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->wishPerishSongBattlerId = 0;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
// fall through
case 2:
if ((gBattleTypeFlags & BATTLE_TYPE_ARENA)
Document trainer battle scripts (#430)
2018-12-07 23:50:56 +01:00
&& gBattleStruct->arenaTurnCounter == 2
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
&& gBattleMons[0].hp != 0 && gBattleMons[1].hp != 0)
{
s32 i;
for (i = 0; i < 2; i++)
CancelMultiTurnMoves(i);
Document battle arena
2018-11-11 18:33:16 +01:00
gBattlescriptCurrInstr = BattleScript_ArenaDoJudgment;
BattleScriptExecute(BattleScript_ArenaDoJudgment);
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->wishPerishSongState++;
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
return TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
break;
}
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 15:03:14 +02:00
gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
return FALSE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
label battle stuff
2017-12-02 14:08:55 +01:00
#define FAINTED_ACTIONS_MAX_CASE 7
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
label battle stuff
2017-12-02 14:08:55 +01:00
bool8 HandleFaintedMonActions(void)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
return FALSE;
do
{
document frontier related
2018-07-01 11:15:42 +02:00
s32 i;
label battle stuff
2017-12-02 14:08:55 +01:00
switch (gBattleStruct->faintedActionsState)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
case 0:
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->faintedActionsBattlerId = 0;
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState++;
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Misc battle script cleanup
2021-04-03 18:38:07 +02:00
if (gAbsentBattlerFlags & gBitTable[i] && !HasNoMonsToSwitch(i, PARTY_SIZE, PARTY_SIZE))
rename bank to battler
2018-02-06 02:46:59 +01:00
gAbsentBattlerFlags &= ~(gBitTable[i]);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
// fall through
case 1:
do
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattlerFainted = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
move battle vars to c file
2018-02-07 22:53:40 +01:00
if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0
Document trainer battle scripts (#430)
2018-12-07 23:50:56 +01:00
&& !(gBattleStruct->givenExpMons & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]])
move battle vars to c file
2018-02-07 22:53:40 +01:00
&& !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId]))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
label battle stuff
2017-12-02 14:08:55 +01:00
BattleScriptExecute(BattleScript_GiveExp);
gBattleStruct->faintedActionsState = 2;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
return TRUE;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
} while (++gBattleStruct->faintedActionsBattlerId != gBattlersCount);
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState = 3;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
case 2:
Fix naming style of function
2020-07-28 04:22:16 +02:00
OpponentSwitchInResetSentPokesToOpponentValue(gBattlerFainted);
move battle vars to c file
2018-02-07 22:53:40 +01:00
if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState = 3;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
else
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState = 1;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
// Don't switch mons until all pokemon performed their actions or the battle's over.
if (gBattleOutcome == 0
&& !NoAliveMonsForEitherParty()
&& gCurrentTurnActionNumber != gBattlersCount)
{
gAbsentBattlerFlags |= gBitTable[gBattlerFainted];
return FALSE;
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
case 3:
Fix no targets issue and switching faint issu
2019-08-26 14:55:55 +02:00
// Don't switch mons until all pokemon performed their actions or the battle's over.
if (gBattleOutcome == 0
&& !NoAliveMonsForEitherParty()
&& gCurrentTurnActionNumber != gBattlersCount)
{
return FALSE;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattleStruct->faintedActionsBattlerId = 0;
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
// fall through
case 4:
do
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattlerFainted = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
move battle vars to c file
2018-02-07 22:53:40 +01:00
if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0
&& !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId]))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
label battle stuff
2017-12-02 14:08:55 +01:00
BattleScriptExecute(BattleScript_HandleFaintedMon);
gBattleStruct->faintedActionsState = 5;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
return TRUE;
}
move battle vars to c file
2018-02-07 22:53:40 +01:00
} while (++gBattleStruct->faintedActionsBattlerId != gBattlersCount);
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState = 6;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
case 5:
move battle vars to c file
2018-02-07 22:53:40 +01:00
if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState = 6;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
else
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState = 4;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
case 6:
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
if (ItemBattleEffects(1, 0, TRUE))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
return TRUE;
label battle stuff
2017-12-02 14:08:55 +01:00
gBattleStruct->faintedActionsState++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
label battle stuff
2017-12-02 14:08:55 +01:00
case FAINTED_ACTIONS_MAX_CASE:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
}
label battle stuff
2017-12-02 14:08:55 +01:00
} while (gBattleStruct->faintedActionsState != FAINTED_ACTIONS_MAX_CASE);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
return FALSE;
}
Couple bug fixes
2018-08-11 12:16:00 +02:00
void TryClearRageAndFuryCutter(void)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
s32 i;
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
if ((gBattleMons[i].status2 & STATUS2_RAGE) && gChosenMoveByBattler[i] != MOVE_RAGE)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattleMons[i].status2 &= ~(STATUS2_RAGE);
Couple bug fixes
2018-08-11 12:16:00 +02:00
if (gDisableStructs[i].furyCutterCounter != 0 && gChosenMoveByBattler[i] != MOVE_FURY_CUTTER)
gDisableStructs[i].furyCutterCounter = 0;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
}
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
enum
{
Tabs to spaces
2018-08-03 00:24:10 +02:00
CANCELLER_FLAGS,
CANCELLER_ASLEEP,
CANCELLER_FROZEN,
CANCELLER_TRUANT,
CANCELLER_RECHARGE,
CANCELLER_FLINCH,
CANCELLER_DISABLED,
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
CANCELLER_GRAVITY,
CANCELLER_HEAL_BLOCKED,
Tabs to spaces
2018-08-03 00:24:10 +02:00
CANCELLER_TAUNTED,
CANCELLER_IMPRISONED,
CANCELLER_CONFUSED,
CANCELLER_PARALYSED,
CANCELLER_IN_LOVE,
CANCELLER_BIDE,
CANCELLER_THAW,
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
CANCELLER_POWDER_MOVE,
CANCELLER_POWDER_STATUS,
CANCELLER_THROAT_CHOP,
Tabs to spaces
2018-08-03 00:24:10 +02:00
CANCELLER_END,
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
CANCELLER_PSYCHIC_TERRAIN,
CANCELLER_END2,
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
};
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
u8 AtkCanceller_UnableToUseMove(void)
{
u8 effect = 0;
more battlescript labels
2017-12-03 00:47:21 +01:00
s32 *bideDmg = &gBattleScripting.bideDmg;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
do
{
switch (gBattleStruct->atkCancellerTracker)
{
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_FLAGS: // flags clear
more renaming
2018-02-06 23:09:39 +01:00
gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_DESTINY_BOND);
gStatuses3[gBattlerAttacker] &= ~(STATUS3_GRUDGE);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_ASLEEP: // check being asleep
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
if (UproarWakeUpCheck(gBattlerAttacker))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP);
gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WOKE_UP_UPROAR;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
effect = 2;
}
else
{
u8 toSub;
Fixed Gastro Acid's effect on Early Bird
2021-10-02 23:16:14 +02:00
if (GetBattlerAbility(gBattlerAttacker) == ABILITY_EARLY_BIRD)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
toSub = 2;
else
toSub = 1;
more renaming
2018-02-06 23:09:39 +01:00
if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP) < toSub)
gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
else
more renaming
2018-02-06 23:09:39 +01:00
gBattleMons[gBattlerAttacker].status1 -= toSub;
if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Fixed Sleep talk being canceled by the user being asleep..
2021-10-02 14:38:43 +02:00
if (gChosenMove != MOVE_SNORE && gChosenMove != MOVE_SLEEP_TALK)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 2;
}
}
else
{
more renaming
2018-02-06 23:09:39 +01:00
gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WOKE_UP;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
effect = 2;
}
}
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_FROZEN: // check being frozen
Fix CANCELLER_FROZEN Now checks if current move will thaw user before trying to defrost it.
2021-06-19 01:31:46 +02:00
if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE && !(gBattleMoves[gCurrentMove].flags & FLAG_THAW_USER))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
if (Random() % 5)
{
Fix CANCELLER_FROZEN Now checks if current move will thaw user before trying to defrost it.
2021-06-19 01:31:46 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedIsFrozen;
gHitMarker |= HITMARKER_NO_ATTACKSTRING;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
else // unfreeze
{
more renaming
2018-02-06 23:09:39 +01:00
gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_FREEZE);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DEFROSTED;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
effect = 2;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_TRUANT: // truant
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
if (GetBattlerAbility(gBattlerAttacker) == ABILITY_TRUANT && gDisableStructs[gBattlerAttacker].truantCounter)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
CancelMultiTurnMoves(gBattlerAttacker);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_LOAFING;
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
gBattlerAbility = gBattlerAttacker;
Loafing Around bug fix
2020-04-18 13:04:28 +02:00
gBattlescriptCurrInstr = BattleScript_TruantLoafingAround;
more renaming
2018-01-16 22:12:38 +01:00
gMoveResultFlags |= MOVE_RESULT_MISSED;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_RECHARGE: // recharge
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_RECHARGE)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_RECHARGE);
clean battle structs
2018-10-14 18:10:54 +02:00
gDisableStructs[gBattlerAttacker].rechargeTimer = 0;
more renaming
2018-02-06 23:09:39 +01:00
CancelMultiTurnMoves(gBattlerAttacker);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedMustRecharge;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_FLINCH: // flinch
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_FLINCHED)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].flinchImmobility = TRUE;
more renaming
2018-02-06 23:09:39 +01:00
CancelMultiTurnMoves(gBattlerAttacker);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedFlinched;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_DISABLED: // disabled move
more renaming
2018-02-06 23:09:39 +01:00
if (gDisableStructs[gBattlerAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattlerAttacker].disabledMove != 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].usedDisabledMove = TRUE;
more renaming
2018-02-06 23:09:39 +01:00
gBattleScripting.battler = gBattlerAttacker;
CancelMultiTurnMoves(gBattlerAttacker);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedIsDisabled;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Gravity and Heal Block preventing after choosing a move
2018-08-02 21:27:28 +02:00
case CANCELLER_HEAL_BLOCKED:
if (gStatuses3[gBattlerAttacker] & STATUS3_HEAL_BLOCK && IsHealBlockPreventingMove(gBattlerAttacker, gCurrentMove))
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].usedHealBlockedMove = TRUE;
Gravity and Heal Block preventing after choosing a move
2018-08-02 21:27:28 +02:00
gBattleScripting.battler = gBattlerAttacker;
CancelMultiTurnMoves(gBattlerAttacker);
gBattlescriptCurrInstr = BattleScript_MoveUsedHealBlockPrevents;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
case CANCELLER_GRAVITY:
if (gFieldStatuses & STATUS_FIELD_GRAVITY && IsGravityPreventingMove(gCurrentMove))
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].usedGravityPreventedMove = TRUE;
Gravity and Heal Block preventing after choosing a move
2018-08-02 21:27:28 +02:00
gBattleScripting.battler = gBattlerAttacker;
CancelMultiTurnMoves(gBattlerAttacker);
gBattlescriptCurrInstr = BattleScript_MoveUsedGravityPrevents;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_TAUNTED: // taunt
clean battle structs
2018-10-14 18:10:54 +02:00
if (gDisableStructs[gBattlerAttacker].tauntTimer && gBattleMoves[gCurrentMove].power == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].usedTauntedMove = TRUE;
more renaming
2018-02-06 23:09:39 +01:00
CancelMultiTurnMoves(gBattlerAttacker);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedIsTaunted;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_IMPRISONED: // imprisoned
more renaming
2018-02-06 23:09:39 +01:00
if (GetImprisonedMovesCount(gBattlerAttacker, gCurrentMove))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].usedImprisonedMove = TRUE;
more renaming
2018-02-06 23:09:39 +01:00
CancelMultiTurnMoves(gBattlerAttacker);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_CONFUSED: // confusion
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Clean up some battle scr cmd data
2020-07-17 02:12:12 +02:00
gBattleMons[gBattlerAttacker].status2 -= STATUS2_CONFUSION_TURN(1);
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Fix confusion not working at all (#385)
2020-05-24 10:02:58 +02:00
if (Random() % ((B_CONFUSION_SELF_DMG_CHANCE >= GEN_7) ? 3 : 2) == 0) // confusion dmg
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = TRUE;
more renaming
2018-02-06 23:09:39 +01:00
gBattlerTarget = gBattlerAttacker;
Fix messing with move result flags when not needed
2019-04-02 00:14:01 +02:00
gBattleMoveDamage = CalculateMoveDamage(MOVE_NONE, gBattlerAttacker, gBattlerAttacker, TYPE_MYSTERY, 40, FALSE, FALSE, TRUE);
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].confusionSelfDmg = TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
}
Fixed chances of confusion self-damage. (#371)
2020-05-18 14:51:30 +02:00
else
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = FALSE;
Fixed chances of confusion self-damage. (#371)
2020-05-18 14:51:30 +02:00
BattleScriptPushCursor();
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused;
}
else // snapped out of confusion
{
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfusedNoMore;
}
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_PARALYSED: // paralysis
more renaming
2018-02-06 23:09:39 +01:00
if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].prlzImmobility = TRUE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
// This is removed in Emerald for some reason
more renaming
2018-02-06 23:09:39 +01:00
//CancelMultiTurnMoves(gBattlerAttacker);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedIsParalyzed;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_IN_LOVE: // infatuation
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_INFATUATION)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gBattleScripting.battler = CountTrailingZeroBits((gBattleMons[gBattlerAttacker].status2 & STATUS2_INFATUATION) >> 0x10);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (Random() & 1)
document frontier related
2018-07-01 11:15:42 +02:00
{
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
document frontier related
2018-07-01 11:15:42 +02:00
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
else
{
Rename an erroneously named battlescript
2019-03-05 17:06:29 +01:00
BattleScriptPush(BattleScript_MoveUsedIsInLoveCantAttack);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].loveImmobility = TRUE;
more renaming
2018-02-06 23:09:39 +01:00
CancelMultiTurnMoves(gBattlerAttacker);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
gBattlescriptCurrInstr = BattleScript_MoveUsedIsInLove;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_BIDE: // bide
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Clean up some battle scr cmd data
2020-07-17 02:12:12 +02:00
gBattleMons[gBattlerAttacker].status2 -= STATUS2_BIDE_TURN(1);
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE)
document frontier related
2018-07-01 11:15:42 +02:00
{
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_BideStoringEnergy;
document frontier related
2018-07-01 11:15:42 +02:00
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
else
{
// This is removed in Emerald for some reason
more renaming
2018-02-06 23:09:39 +01:00
//gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
if (gTakenDmg[gBattlerAttacker])
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
gCurrentMove = MOVE_BIDE;
more renaming
2018-02-06 23:09:39 +01:00
*bideDmg = gTakenDmg[gBattlerAttacker] * 2;
move battle vars to c file
2018-02-07 22:53:40 +01:00
gBattlerTarget = gTakenDmgByBattler[gBattlerAttacker];
more renaming
2018-02-06 23:09:39 +01:00
if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
gBattlerTarget = GetMoveTarget(MOVE_BIDE, 1);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_BideAttack;
}
else
document frontier related
2018-07-01 11:15:42 +02:00
{
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_BideNoEnergyToAttack;
document frontier related
2018-07-01 11:15:42 +02:00
}
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_THAW: // move thawing
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE)
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
Fix thawing moves Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
2021-06-10 13:48:18 +02:00
if (!(gBattleMoves[gCurrentMove].effect == EFFECT_BURN_UP && !IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_FIRE)))
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_FREEZE);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
Add remaining multistring chooser constants
2021-04-02 08:27:12 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DEFROSTED_BY_MOVE;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
effect = 2;
}
gBattleStruct->atkCancellerTracker++;
break;
Powder moves on grass types
2019-03-02 13:08:50 +01:00
case CANCELLER_POWDER_MOVE:
Fix powder immunity for self-targeting moves Example: Because Rage Powder targets the user, this check is needed to allow grass types to use it.
2021-03-06 23:00:52 +01:00
if ((gBattleMoves[gCurrentMove].flags & FLAG_POWDER) && (gBattlerAttacker != gBattlerTarget))
Powder moves on grass types
2019-03-02 13:08:50 +01:00
{
Battle Configs: The Revenge (#363) * Turns for Uproar * Chances for the amount of hits with multi-hit moves. * Electric type mon's immunity to paralysis * (Hi) Jump Kick to always do 1/2 of maxHP when crashing * Turns for Disable. * Minimized mons can always be hit by moves like Stomp * Grass types immune to powder and spore moves. * Psywave's damage formula * Fixed random usage.
2020-05-28 10:38:27 +02:00
if ((B_POWDER_GRASS >= GEN_6 && IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_GRASS))
Powder moves on grass types
2019-03-02 13:08:50 +01:00
|| GetBattlerAbility(gBattlerTarget) == ABILITY_OVERCOAT)
{
gBattlerAbility = gBattlerTarget;
effect = 1;
}
Fix Safety Googles Fix typo and update gLastUsedItem before calling the safety goggles battle script.
2021-10-09 04:05:01 +02:00
else if (GetBattlerHoldEffect(gBattlerTarget, TRUE) == HOLD_EFFECT_SAFETY_GOGGLES)
Powder moves on grass types
2019-03-02 13:08:50 +01:00
{
Fix Safety Googles Fix typo and update gLastUsedItem before calling the safety goggles battle script.
2021-10-09 04:05:01 +02:00
RecordItemEffectBattle(gBattlerTarget, HOLD_EFFECT_SAFETY_GOGGLES);
gLastUsedItem = gBattleMons[gBattlerTarget].item;
Powder moves on grass types
2019-03-02 13:08:50 +01:00
effect = 1;
}
if (effect)
gBattlescriptCurrInstr = BattleScript_PowderMoveNoEffect;
}
gBattleStruct->atkCancellerTracker++;
break;
case CANCELLER_POWDER_STATUS:
Add Powder
2018-12-03 12:50:32 +01:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_POWDER)
{
u32 moveType;
GET_MOVE_TYPE(gCurrentMove, moveType);
if (moveType == TYPE_FIRE)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].powderSelfDmg = TRUE;
Add Powder
2018-12-03 12:50:32 +01:00
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4;
gBattlescriptCurrInstr = BattleScript_MoveUsedPowder;
Fix powder and resist berry string
2019-05-20 10:10:00 +02:00
effect = 1;
Add Powder
2018-12-03 12:50:32 +01:00
}
}
gBattleStruct->atkCancellerTracker++;
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
case CANCELLER_THROAT_CHOP:
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
if (gDisableStructs[gBattlerAttacker].throatChopTimer && gBattleMoves[gCurrentMove].flags & FLAG_SOUND)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[gBattlerAttacker].usedThroatChopPreventedMove = TRUE;
Throat Chop Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-16 15:01:48 +02:00
CancelMultiTurnMoves(gBattlerAttacker);
gBattlescriptCurrInstr = BattleScript_MoveUsedIsThroatChopPrevented;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
Battle code enums in case switches
2018-08-03 00:13:44 +02:00
case CANCELLER_END:
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
break;
}
Fix atk canceller
2018-12-02 17:58:21 +01:00
} while (gBattleStruct->atkCancellerTracker != CANCELLER_END && gBattleStruct->atkCancellerTracker != CANCELLER_END2 && effect == 0);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
if (effect == 2)
{
more renaming
2018-02-06 23:09:39 +01:00
gActiveBattler = gBattlerAttacker;
more renaming
2018-02-06 20:48:02 +01:00
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
MarkBattlerForControllerExec(gActiveBattler);
start porting cam's port of battle3
2017-09-17 14:10:32 +02:00
}
return effect;
}
finish porting cam's port
2017-09-17 15:19:15 +02:00
Psychic Terrain blocks priority moves
2018-12-01 11:35:49 +01:00
// After Protean Activation.
u8 AtkCanceller_UnableToUseMove2(void)
{
u8 effect = 0;
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
Psychic Terrain blocks priority moves
2018-12-01 11:35:49 +01:00
do
{
switch (gBattleStruct->atkCancellerTracker)
{
case CANCELLER_END:
gBattleStruct->atkCancellerTracker++;
case CANCELLER_PSYCHIC_TERRAIN:
if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
&& IsBattlerGrounded(gBattlerTarget)
New AI command for using priority moves in death situatiions
2019-02-16 14:54:17 +01:00
&& GetChosenMovePriority(gBattlerAttacker) > 0
Psychic Terrain blocks priority moves
2018-12-01 11:35:49 +01:00
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
{
CancelMultiTurnMoves(gBattlerAttacker);
gBattlescriptCurrInstr = BattleScript_MoveUsedPsychicTerrainPrevents;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1;
}
gBattleStruct->atkCancellerTracker++;
break;
case CANCELLER_END2:
break;
}
} while (gBattleStruct->atkCancellerTracker != CANCELLER_END2 && effect == 0);
return effect;
}
document frontier related
2018-07-01 11:15:42 +02:00
bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
struct Pokemon *party;
u8 id1, id2;
finish porting cam's port
2017-09-17 15:19:15 +02:00
s32 i;
document frontier related
2018-07-01 11:15:42 +02:00
finish porting cam's port
2017-09-17 15:19:15 +02:00
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
return FALSE;
document frontier related
2018-07-01 11:15:42 +02:00
New feature - battle 2 vs 1 opponent
2019-01-27 20:54:34 +01:00
if (BATTLE_TWO_VS_ONE_OPPONENT && GetBattlerSide(battler) == B_SIDE_OPPONENT)
{
id2 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
id1 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
party = gEnemyParty;
if (partyIdBattlerOn1 == PARTY_SIZE)
partyIdBattlerOn1 = gBattlerPartyIndexes[id2];
if (partyIdBattlerOn2 == PARTY_SIZE)
partyIdBattlerOn2 = gBattlerPartyIndexes[id1];
for (i = 0; i < PARTY_SIZE; i++)
{
if (GetMonData(&party[i], MON_DATA_HP) != 0
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG
&& i != partyIdBattlerOn1 && i != partyIdBattlerOn2
&& i != *(gBattleStruct->monToSwitchIntoId + id2) && i != id1[gBattleStruct->monToSwitchIntoId])
break;
}
return (i == PARTY_SIZE);
}
else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (GetBattlerSide(battler) == B_SIDE_PLAYER)
finish porting cam's port
2017-09-17 15:19:15 +02:00
party = gPlayerParty;
else
party = gEnemyParty;
document frontier related
2018-07-01 11:15:42 +02:00
id1 = ((battler & BIT_FLANK) / 2);
for (i = id1 * 3; i < id1 * 3 + 3; i++)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
if (GetMonData(&party[i], MON_DATA_HP) != 0
document frontier related
2018-07-01 11:15:42 +02:00
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
finish porting cam's port
2017-09-17 15:19:15 +02:00
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG)
break;
}
document frontier related
2018-07-01 11:15:42 +02:00
return (i == id1 * 3 + 3);
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
Label remaining battle types
2021-01-13 21:17:32 +01:00
if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (GetBattlerSide(battler) == B_SIDE_PLAYER)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
party = gPlayerParty;
document frontier related
2018-07-01 11:15:42 +02:00
id2 = GetBattlerMultiplayerId(battler);
id1 = GetLinkTrainerFlankId(id2);
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
else
{
party = gEnemyParty;
Fix Battle util fakematch
2020-09-09 02:46:08 +02:00
if (battler == 1)
document frontier related
2018-07-01 11:15:42 +02:00
id1 = 0;
else
id1 = 1;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
else
{
document frontier related
2018-07-01 11:15:42 +02:00
id2 = GetBattlerMultiplayerId(battler);
rename bank to battler
2018-02-06 02:46:59 +01:00
if (GetBattlerSide(battler) == B_SIDE_PLAYER)
finish porting cam's port
2017-09-17 15:19:15 +02:00
party = gPlayerParty;
else
party = gEnemyParty;
document frontier related
2018-07-01 11:15:42 +02:00
id1 = GetLinkTrainerFlankId(id2);
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
document frontier related
2018-07-01 11:15:42 +02:00
for (i = id1 * 3; i < id1 * 3 + 3; i++)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
if (GetMonData(&party[i], MON_DATA_HP) != 0
document frontier related
2018-07-01 11:15:42 +02:00
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
finish porting cam's port
2017-09-17 15:19:15 +02:00
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG)
break;
}
document frontier related
2018-07-01 11:15:42 +02:00
return (i == id1 * 3 + 3);
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
rename bank to battler
2018-02-06 02:46:59 +01:00
else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && GetBattlerSide(battler) == B_SIDE_OPPONENT)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
party = gEnemyParty;
rename bank to battler
2018-02-06 02:46:59 +01:00
if (battler == 1)
document frontier related
2018-07-01 11:15:42 +02:00
id1 = 0;
finish porting cam's port
2017-09-17 15:19:15 +02:00
else
document frontier related
2018-07-01 11:15:42 +02:00
id1 = 3;
for (i = id1; i < id1 + 3; i++)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
if (GetMonData(&party[i], MON_DATA_HP) != 0
document frontier related
2018-07-01 11:15:42 +02:00
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
finish porting cam's port
2017-09-17 15:19:15 +02:00
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG)
break;
}
document frontier related
2018-07-01 11:15:42 +02:00
return (i == id1 + 3);
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
else
{
rename bank to battler
2018-02-06 02:46:59 +01:00
if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
id2 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
id1 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
finish porting cam's port
2017-09-17 15:19:15 +02:00
party = gEnemyParty;
}
else
{
document frontier related
2018-07-01 11:15:42 +02:00
id2 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
id1 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
finish porting cam's port
2017-09-17 15:19:15 +02:00
party = gPlayerParty;
}
document frontier related
2018-07-01 11:15:42 +02:00
if (partyIdBattlerOn1 == PARTY_SIZE)
partyIdBattlerOn1 = gBattlerPartyIndexes[id2];
if (partyIdBattlerOn2 == PARTY_SIZE)
partyIdBattlerOn2 = gBattlerPartyIndexes[id1];
for (i = 0; i < PARTY_SIZE; i++)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
if (GetMonData(&party[i], MON_DATA_HP) != 0
document frontier related
2018-07-01 11:15:42 +02:00
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
finish porting cam's port
2017-09-17 15:19:15 +02:00
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG
document frontier related
2018-07-01 11:15:42 +02:00
&& i != partyIdBattlerOn1 && i != partyIdBattlerOn2
&& i != *(gBattleStruct->monToSwitchIntoId + id2) && i != id1[gBattleStruct->monToSwitchIntoId])
finish porting cam's port
2017-09-17 15:19:15 +02:00
break;
}
document frontier related
2018-07-01 11:15:42 +02:00
return (i == PARTY_SIZE);
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
u8 TryWeatherFormChange(u8 battler)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
u8 ret = 0;
bool32 weatherEffect = WEATHER_HAS_EFFECT;
utility umbrella effect
2021-05-24 17:52:45 +02:00
u16 holdEffect = GetBattlerHoldEffect(battler, TRUE);
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
if (gBattleMons[battler].species == SPECIES_CASTFORM)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
if (GetBattlerAbility(battler) != ABILITY_FORECAST || gBattleMons[battler].hp == 0)
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
{
ret = 0;
}
else if (!weatherEffect && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL))
{
SET_BATTLER_TYPE(battler, TYPE_NORMAL);
ret = 1;
}
else if (!weatherEffect)
{
ret = 0;
}
utility umbrella effect
2021-05-24 17:52:45 +02:00
else if (holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA || (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL)))
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
{
SET_BATTLER_TYPE(battler, TYPE_NORMAL);
ret = 1;
}
utility umbrella effect
2021-05-24 17:52:45 +02:00
else if (gBattleWeather & WEATHER_SUN_ANY && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && !IS_BATTLER_OF_TYPE(battler, TYPE_FIRE))
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
{
SET_BATTLER_TYPE(battler, TYPE_FIRE);
ret = 2;
}
utility umbrella effect
2021-05-24 17:52:45 +02:00
else if (gBattleWeather & WEATHER_RAIN_ANY && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && !IS_BATTLER_OF_TYPE(battler, TYPE_WATER))
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
{
SET_BATTLER_TYPE(battler, TYPE_WATER);
ret = 3;
}
else if (gBattleWeather & WEATHER_HAIL_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_ICE))
{
SET_BATTLER_TYPE(battler, TYPE_ICE);
ret = 4;
}
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
else if (gBattleMons[battler].species == SPECIES_CHERRIM)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
if (GetBattlerAbility(battler) != ABILITY_FLOWER_GIFT || gBattleMons[battler].hp == 0)
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
ret = 0;
utility umbrella effect
2021-05-24 17:52:45 +02:00
else if (gBattleMonForms[battler] == 0 && weatherEffect && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && gBattleWeather & WEATHER_SUN_ANY)
Cherrim
2019-06-16 09:30:05 +02:00
ret = 2;
Fix Cherrim softlock Fix typo that caused infinite loop.
2021-11-14 01:31:06 +01:00
else if (gBattleMonForms[battler] != 0 && (!weatherEffect || holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA || !(gBattleWeather & WEATHER_SUN_ANY)))
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
ret = 1;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
return ret;
}
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
static const u16 sWeatherFlagsInfo[][3] =
{
[ENUM_WEATHER_RAIN] = {WEATHER_RAIN_TEMPORARY, WEATHER_RAIN_PERMANENT, HOLD_EFFECT_DAMP_ROCK},
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-26 21:14:05 +02:00
[ENUM_WEATHER_RAIN_PRIMAL] = {WEATHER_RAIN_PRIMAL, WEATHER_RAIN_PRIMAL, HOLD_EFFECT_DAMP_ROCK},
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
[ENUM_WEATHER_SUN] = {WEATHER_SUN_TEMPORARY, WEATHER_SUN_PERMANENT, HOLD_EFFECT_HEAT_ROCK},
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-26 21:14:05 +02:00
[ENUM_WEATHER_SUN_PRIMAL] = {WEATHER_SUN_PRIMAL, WEATHER_SUN_PRIMAL, HOLD_EFFECT_HEAT_ROCK},
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
[ENUM_WEATHER_SANDSTORM] = {WEATHER_SANDSTORM_TEMPORARY, WEATHER_SANDSTORM_PERMANENT, HOLD_EFFECT_SMOOTH_ROCK},
[ENUM_WEATHER_HAIL] = {WEATHER_HAIL_TEMPORARY, WEATHER_HAIL_PERMANENT, HOLD_EFFECT_ICY_ROCK},
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-26 21:14:05 +02:00
[ENUM_WEATHER_STRONG_WINDS] = {WEATHER_STRONG_WINDS, WEATHER_STRONG_WINDS, HOLD_EFFECT_NONE},
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
};
bool32 TryChangeBattleWeather(u8 battler, u32 weatherEnumId, bool32 viaAbility)
{
if (viaAbility && B_ABILITY_WEATHER <= GEN_5
&& !(gBattleWeather & sWeatherFlagsInfo[weatherEnumId][1]))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
gBattleWeather = (sWeatherFlagsInfo[weatherEnumId][0] | sWeatherFlagsInfo[weatherEnumId][1]);
return TRUE;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-26 21:14:05 +02:00
else if (gBattleWeather & WEATHER_PRIMAL_ANY
&& GetBattlerAbility(battler) != ABILITY_DESOLATE_LAND
&& GetBattlerAbility(battler) != ABILITY_PRIMORDIAL_SEA
&& GetBattlerAbility(battler) != ABILITY_DELTA_STREAM)
{
Fixed infinite loop
2021-10-06 14:10:56 +02:00
return FALSE;
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-26 21:14:05 +02:00
}
Fix weather for pre gen6
2019-10-26 18:28:02 +02:00
else if (!(gBattleWeather & (sWeatherFlagsInfo[weatherEnumId][0] | sWeatherFlagsInfo[weatherEnumId][1])))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
gBattleWeather = (sWeatherFlagsInfo[weatherEnumId][0]);
if (GetBattlerHoldEffect(battler, TRUE) == sWeatherFlagsInfo[weatherEnumId][2])
gWishFutureKnock.weatherDuration = 8;
else
gWishFutureKnock.weatherDuration = 5;
return TRUE;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
Add Surge Abilities
2019-02-09 14:30:16 +01:00
return FALSE;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
Add Surge Abilities
2019-02-09 14:30:16 +01:00
static bool32 TryChangeBattleTerrain(u32 battler, u32 statusFlag, u8 *timer)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add Surge Abilities
2019-02-09 14:30:16 +01:00
if (!(gFieldStatuses & statusFlag))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add Surge Abilities
2019-02-09 14:30:16 +01:00
gFieldStatuses &= ~(STATUS_FIELD_MISTY_TERRAIN | STATUS_FIELD_GRASSY_TERRAIN | EFFECT_ELECTRIC_TERRAIN | EFFECT_PSYCHIC_TERRAIN);
gFieldStatuses |= statusFlag;
finish porting cam's port
2017-09-17 15:19:15 +02:00
Add Surge Abilities
2019-02-09 14:30:16 +01:00
if (GetBattlerHoldEffect(battler, TRUE) == HOLD_EFFECT_TERRAIN_EXTENDER)
*timer = 8;
finish porting cam's port
2017-09-17 15:19:15 +02:00
else
Add Surge Abilities
2019-02-09 14:30:16 +01:00
*timer = 5;
finish porting cam's port
2017-09-17 15:19:15 +02:00
Add Surge Abilities
2019-02-09 14:30:16 +01:00
gBattlerAttacker = gBattleScripting.battler = battler;
return TRUE;
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
}
Add Surge Abilities
2019-02-09 14:30:16 +01:00
return FALSE;
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
}
finish porting cam's port
2017-09-17 15:19:15 +02:00
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
static bool32 ShouldChangeFormHpBased(u32 battler)
{
Schooling
2020-04-21 20:43:47 +02:00
// Ability, form >, form <=, hp divided
static const u16 forms[][4] =
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
{
Fixed compatibility with Pokémon Expansion
2020-11-15 17:35:02 +01:00
{ABILITY_ZEN_MODE, SPECIES_DARMANITAN, SPECIES_DARMANITAN_ZEN_MODE, 2},
{ABILITY_SHIELDS_DOWN, SPECIES_MINIOR, SPECIES_MINIOR_CORE_RED, 2},
{ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_BLUE, SPECIES_MINIOR_CORE_BLUE, 2},
{ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_GREEN, SPECIES_MINIOR_CORE_GREEN, 2},
{ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO, 2},
{ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE, 2},
{ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET, 2},
{ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW, 2},
Schooling
2020-04-21 20:43:47 +02:00
{ABILITY_SCHOOLING, SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI, 4},
Implemented Cramorant's Gulp Missile form change
2021-01-12 18:58:24 +01:00
{ABILITY_GULP_MISSILE, SPECIES_CRAMORANT, SPECIES_CRAMORANT_GORGING, 2},
{ABILITY_GULP_MISSILE, SPECIES_CRAMORANT, SPECIES_CRAMORANT_GULPING, 1},
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
};
u32 i;
finish porting cam's port
2017-09-17 15:19:15 +02:00
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
for (i = 0; i < ARRAY_COUNT(forms); i++)
{
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
if (GetBattlerAbility(battler) == forms[i][0])
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
if (gBattleMons[battler].species == forms[i][2]
Schooling
2020-04-21 20:43:47 +02:00
&& gBattleMons[battler].hp > gBattleMons[battler].maxHP / forms[i][3])
battle_3: tabs
2017-09-18 23:44:55 +02:00
{
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
gBattleMons[battler].species = forms[i][1];
return TRUE;
}
if (gBattleMons[battler].species == forms[i][1]
Schooling
2020-04-21 20:43:47 +02:00
&& gBattleMons[battler].hp <= gBattleMons[battler].maxHP / forms[i][3])
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
{
gBattleMons[battler].species = forms[i][2];
return TRUE;
}
}
}
return FALSE;
}
Forewarn
2020-04-28 15:36:13 +02:00
static u8 ForewarnChooseMove(u32 battler)
{
struct Forewarn {
u8 battlerId;
u8 power;
u16 moveId;
};
u32 i, j, bestId, count;
struct Forewarn *data = malloc(sizeof(struct Forewarn) * MAX_BATTLERS_COUNT * MAX_MON_MOVES);
// Put all moves
for (count = 0, i = 0; i < MAX_BATTLERS_COUNT; i++)
{
if (IsBattlerAlive(i) && GetBattlerSide(i) != GetBattlerSide(battler))
{
for (j = 0; j < MAX_MON_MOVES; j++)
{
if (gBattleMons[i].moves[j] == MOVE_NONE)
continue;
data[count].moveId = gBattleMons[i].moves[j];
data[count].battlerId = i;
switch (gBattleMoves[data[count].moveId].effect)
battle_3: tabs
2017-09-18 23:44:55 +02:00
{
Forewarn
2020-04-28 15:36:13 +02:00
case EFFECT_OHKO:
data[count].power = 150;
break;
case EFFECT_COUNTER:
case EFFECT_MIRROR_COAT:
case EFFECT_METAL_BURST:
data[count].power = 120;
break;
default:
if (gBattleMoves[data[count].moveId].power == 1)
data[count].power = 80;
else
data[count].power = gBattleMoves[data[count].moveId].power;
break;
battle_3: tabs
2017-09-18 23:44:55 +02:00
}
Forewarn
2020-04-28 15:36:13 +02:00
count++;
battle_3: tabs
2017-09-18 23:44:55 +02:00
}
Forewarn
2020-04-28 15:36:13 +02:00
}
}
for (bestId = 0, i = 1; i < count; i++)
{
if (data[i].power > data[bestId].power)
bestId = i;
else if (data[i].power == data[bestId].power && Random() & 1)
bestId = i;
}
gBattlerTarget = data[bestId].battlerId;
PREPARE_MOVE_BUFFER(gBattleTextBuff1, data[bestId].moveId)
Rest Sleep Talk wake up awaraness
2020-07-15 21:30:24 +02:00
RecordKnownMove(gBattlerTarget, data[bestId].moveId);
Forewarn
2020-04-28 15:36:13 +02:00
free(data);
}
Expand ability ids to u16. Thanks to ghoulslash for some assistance!
2020-05-18 23:54:12 +02:00
u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 moveArg)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
u8 effect = 0;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
u32 speciesAtk, speciesDef;
u32 pidAtk, pidDef;
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
u32 moveType, move;
Anticipation clean-up
2020-04-11 12:34:53 +02:00
u32 i, j;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
Fix Safari zone bug
2019-01-27 11:47:36 +01:00
return 0;
finish porting cam's port
2017-09-17 15:19:15 +02:00
more renaming
2018-02-06 23:09:39 +01:00
if (gBattlerAttacker >= gBattlersCount)
gBattlerAttacker = battler;
document frontier related
2018-07-01 11:15:42 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
speciesAtk = gBattleMons[gBattlerAttacker].species;
pidAtk = gBattleMons[gBattlerAttacker].personality;
finish porting cam's port
2017-09-17 15:19:15 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
speciesDef = gBattleMons[gBattlerTarget].species;
pidDef = gBattleMons[gBattlerTarget].personality;
document frontier related
2018-07-01 11:15:42 +02:00
Fix overworld weather
2018-11-23 23:07:02 +01:00
if (special)
gLastUsedAbility = special;
else
gLastUsedAbility = GetBattlerAbility(battler);
finish porting cam's port
2017-09-17 15:19:15 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (moveArg)
move = moveArg;
else
move = gCurrentMove;
finish porting cam's port
2017-09-17 15:19:15 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
GET_MOVE_TYPE(move, moveType);
finish porting cam's port
2017-09-17 15:19:15 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
switch (caseID)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITYEFFECT_ON_SWITCHIN: // 0
Fix Switch-in ability battler sometimes not properly printed
2020-07-28 10:18:44 +02:00
gBattleScripting.battler = battler;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
switch (gLastUsedAbility)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
case ABILITYEFFECT_SWITCH_IN_TERRAIN:
merge with be, give life dew jungle healing effect
2021-07-25 16:22:05 +02:00
if (VarGet(VAR_TERRAIN) & STATUS_FIELD_TERRAIN_ANY)
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
{
merge with be, give life dew jungle healing effect
2021-07-25 16:22:05 +02:00
u16 terrainFlags = VarGet(VAR_TERRAIN) & STATUS_FIELD_TERRAIN_ANY; // only works for status flag (1 << 15)
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
gFieldStatuses = terrainFlags | STATUS_FIELD_TERRAIN_PERMANENT; // terrain is permanent
merge with be, give life dew jungle healing effect
2021-07-25 16:22:05 +02:00
switch (VarGet(VAR_TERRAIN) & STATUS_FIELD_TERRAIN_ANY)
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
{
case STATUS_FIELD_ELECTRIC_TERRAIN:
gBattleCommunication[MULTISTRING_CHOOSER] = 2;
break;
case STATUS_FIELD_MISTY_TERRAIN:
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
break;
case STATUS_FIELD_GRASSY_TERRAIN:
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
break;
case STATUS_FIELD_PSYCHIC_TERRAIN:
gBattleCommunication[MULTISTRING_CHOOSER] = 3;
break;
}
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
BattleScriptPushCursorAndCallback(BattleScript_OverworldTerrain);
effect++;
}
#if B_THUNDERSTORM_TERRAIN == TRUE
else if (GetCurrentWeather() == WEATHER_RAIN_THUNDERSTORM && !(gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN))
{
merge with be
2021-01-13 22:32:14 +01:00
// overworld weather started rain, so just do electric terrain anim
var terrain, surge fixes
2020-12-14 03:42:48 +01:00
gFieldStatuses = (STATUS_FIELD_ELECTRIC_TERRAIN | STATUS_FIELD_TERRAIN_PERMANENT);
gBattleCommunication[MULTISTRING_CHOOSER] = 2;
BattleScriptPushCursorAndCallback(BattleScript_OverworldTerrain);
effect++;
}
#endif
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITYEFFECT_SWITCH_IN_WEATHER:
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Merge with master
2018-12-22 13:53:07 +01:00
switch (GetCurrentWeather())
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Merge with master
2019-12-09 08:16:18 +01:00
case WEATHER_RAIN:
case WEATHER_RAIN_THUNDERSTORM:
case WEATHER_DOWNPOUR:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (!(gBattleWeather & WEATHER_RAIN_ANY))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
gBattleScripting.animArg1 = B_ANIM_RAIN_CONTINUES;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Merge with master
2018-12-22 13:53:07 +01:00
case WEATHER_SANDSTORM:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (!(gBattleWeather & WEATHER_SANDSTORM_ANY))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY);
gBattleScripting.animArg1 = B_ANIM_SANDSTORM_CONTINUES;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Merge with master
2018-12-22 13:53:07 +01:00
case WEATHER_DROUGHT:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (!(gBattleWeather & WEATHER_SUN_ANY))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY);
gBattleScripting.animArg1 = B_ANIM_SUN_CONTINUES;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
}
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (effect)
{
Merge with master
2018-12-22 13:53:07 +01:00
gBattleCommunication[MULTISTRING_CHOOSER] = GetCurrentWeather();
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts);
}
finish porting cam's port
2017-09-17 15:19:15 +02:00
break;
Add Imposter
2018-07-29 12:21:28 +02:00
case ABILITY_IMPOSTER:
if (IsBattlerAlive(BATTLE_OPPOSITE(battler))
&& !(gBattleMons[BATTLE_OPPOSITE(battler)].status2 & (STATUS2_TRANSFORMED | STATUS2_SUBSTITUTE))
Imposter check for semi invulnerable
2019-03-30 11:56:15 +01:00
&& !(gBattleMons[battler].status2 & STATUS2_TRANSFORMED)
Transform Imposter Illusion fix
2020-06-29 13:45:27 +02:00
&& !(gBattleStruct->illusion[BATTLE_OPPOSITE(battler)].on)
Imposter check for semi invulnerable
2019-03-30 11:56:15 +01:00
&& !(gStatuses3[BATTLE_OPPOSITE(battler)] & STATUS3_SEMI_INVULNERABLE))
Add Imposter
2018-07-29 12:21:28 +02:00
{
Fix Imposter looplock
2021-06-10 13:45:24 +02:00
gBattlerAttacker = battler;
Add Imposter
2018-07-29 12:21:28 +02:00
gBattlerTarget = BATTLE_OPPOSITE(battler);
BattleScriptPushCursorAndCallback(BattleScript_ImposterActivates);
effect++;
}
break;
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
case ABILITY_MOLD_BREAKER:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_MOLDBREAKER;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
case ABILITY_TERAVOLT:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_TERAVOLT;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
case ABILITY_TURBOBLAZE:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_TURBOBLAZE;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
case ABILITY_SLOW_START:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Slow Start
2020-04-18 12:52:15 +02:00
gDisableStructs[battler].slowStartTimer = 5;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_SLOWSTART;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
finish porting cam's port
2017-09-17 15:19:15 +02:00
break;
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
case ABILITY_UNNERVE:
if (!gSpecialStatuses[battler].switchInAbilityDone)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_UNNERVE;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
add neigh and as one abilities
2021-01-06 03:37:23 +01:00
case ABILITY_AS_ONE_ICE_RIDER:
case ABILITY_AS_ONE_SHADOW_RIDER:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_ASONE;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
BattleScriptPushCursorAndCallback(BattleScript_ActivateAsOne);
add neigh and as one abilities
2021-01-06 03:37:23 +01:00
effect++;
}
break;
add curious medicine
2021-01-06 04:02:11 +01:00
case ABILITY_CURIOUS_MEDICINE:
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
if (!gSpecialStatuses[battler].switchInAbilityDone && IsDoubleBattle()
&& IsBattlerAlive(BATTLE_PARTNER(battler)) && TryResetBattlerStatChanges(BATTLE_PARTNER(battler)))
add curious medicine
2021-01-06 04:02:11 +01:00
{
u32 i;
gEffectBattler = BATTLE_PARTNER(battler);
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_CURIOUS_MEDICINE;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
add curious medicine
2021-01-06 04:02:11 +01:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
Pastel Veil switchin effect attempt Battle script isn't working for partner for some reason.
2021-11-02 11:06:10 +01:00
case ABILITY_PASTEL_VEIL:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Looping battle script, correct message Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"
2021-11-02 23:51:20 +01:00
gBattlerTarget = battler;
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_PASTEL_VEIL;
BattleScriptPushCursorAndCallback(BattleScript_PastelVeilActivates);
effect++;
Pastel Veil switchin effect attempt Battle script isn't working for partner for some reason.
2021-11-02 11:06:10 +01:00
gSpecialStatuses[battler].switchInAbilityDone = 1;
}
break;
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
case ABILITY_ANTICIPATION:
Anticipation clean-up
2020-04-11 12:34:53 +02:00
if (!gSpecialStatuses[battler].switchInAbilityDone)
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
{
Anticipation clean-up
2020-04-11 12:34:53 +02:00
u32 side = GetBattlerSide(battler);
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
Anticipation clean-up
2020-04-11 12:34:53 +02:00
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Anticipation clean-up
2020-04-11 12:34:53 +02:00
if (IsBattlerAlive(i) && side != GetBattlerSide(i))
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
{
Anticipation clean-up
2020-04-11 12:34:53 +02:00
for (j = 0; j < MAX_MON_MOVES; j++)
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
{
Anticipation clean-up
2020-04-11 12:34:53 +02:00
move = gBattleMons[i].moves[j];
GET_MOVE_TYPE(move, moveType);
if (CalcTypeEffectivenessMultiplier(move, moveType, i, battler, FALSE) >= UQ_4_12(2.0))
{
effect++;
break;
}
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
}
}
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
Anticipation clean-up
2020-04-11 12:34:53 +02:00
if (effect)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_ANTICIPATION;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Anticipation ability (#282)
2020-04-11 12:24:25 +02:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
break;
Frisk, would be easier if it didnt scan 2 opponents
2020-04-19 13:37:56 +02:00
case ABILITY_FRISK:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Frisk, would be easier if it didnt scan 2 opponents
2020-04-19 13:37:56 +02:00
BattleScriptPushCursorAndCallback(BattleScript_FriskActivates); // Try activate
effect++;
}
return effect; // Note: It returns effect as to not record the ability if Frisk does not activate.
Forewarn
2020-04-28 15:36:13 +02:00
case ABILITY_FOREWARN:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
ForewarnChooseMove(battler);
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_FOREWARN;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Forewarn
2020-04-28 15:36:13 +02:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_DOWNLOAD:
Switch-in abilities with a message
2018-07-22 22:21:47 +02:00
if (!gSpecialStatuses[battler].switchInAbilityDone)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Fix Download raising the wrong stat
2019-02-09 13:30:45 +01:00
u32 statId, opposingBattler;
u32 opposingDef = 0, opposingSpDef = 0;
opposingBattler = BATTLE_OPPOSITE(battler);
Fix Download Raises user's stat instead of a random target's, and determines stat boosts using the opposing Pokemon's stats.
2021-09-22 01:53:44 +02:00
for (i = 0; i < 2; opposingBattler ^= BIT_FLANK, i++)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Fix Download raising the wrong stat
2019-02-09 13:30:45 +01:00
if (IsBattlerAlive(opposingBattler))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Fix Download raising the wrong stat
2019-02-09 13:30:45 +01:00
opposingDef += gBattleMons[opposingBattler].defense
* gStatStageRatios[gBattleMons[opposingBattler].statStages[STAT_DEF]][0]
/ gStatStageRatios[gBattleMons[opposingBattler].statStages[STAT_DEF]][1];
opposingSpDef += gBattleMons[opposingBattler].spDefense
* gStatStageRatios[gBattleMons[opposingBattler].statStages[STAT_SPDEF]][0]
/ gStatStageRatios[gBattleMons[opposingBattler].statStages[STAT_SPDEF]][1];
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
ABE is matching
2017-10-12 17:49:24 +02:00
Fix Download raising the wrong stat
2019-02-09 13:30:45 +01:00
if (opposingDef < opposingSpDef)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
statId = STAT_ATK;
Fix Download raising the wrong stat
2019-02-09 13:30:45 +01:00
else
statId = STAT_SPATK;
ABE is matching
2017-10-12 17:49:24 +02:00
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
ABE is matching
2017-10-12 17:49:24 +02:00
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (CompareStat(battler, statId, MAX_STAT_STAGE, CMP_LESS_THAN))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleMons[battler].statStages[statId]++;
SET_STATCHANGER(statId, 1, FALSE);
Fix Download Raises user's stat instead of a random target's, and determines stat boosts using the opposing Pokemon's stats.
2021-09-22 01:53:44 +02:00
gBattlerAttacker = battler;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
PREPARE_STAT_BUFFER(gBattleTextBuff1, statId);
BattleScriptPushCursorAndCallback(BattleScript_AttackerAbilityStatRaiseEnd3);
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
break;
finish switch in ability messages
2020-11-19 19:42:00 +01:00
case ABILITY_PRESSURE:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_PRESSURE;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
finish switch in ability messages
2020-11-19 19:42:00 +01:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
case ABILITY_DARK_AURA:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_DARKAURA;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
finish switch in ability messages
2020-11-19 19:42:00 +01:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
case ABILITY_FAIRY_AURA:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_FAIRYAURA;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
finish switch in ability messages
2020-11-19 19:42:00 +01:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
case ABILITY_AURA_BREAK:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_AURABREAK;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
finish switch in ability messages
2020-11-19 19:42:00 +01:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
case ABILITY_COMATOSE:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_COMATOSE;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
finish switch in ability messages
2020-11-19 19:42:00 +01:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
case ABILITY_SCREEN_CLEANER:
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
if (!gSpecialStatuses[battler].switchInAbilityDone && TryRemoveScreens(battler))
finish switch in ability messages
2020-11-19 19:42:00 +01:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_SCREENCLEANER;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
finish switch in ability messages
2020-11-19 19:42:00 +01:00
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_DRIZZLE:
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
if (TryChangeBattleWeather(battler, ENUM_WEATHER_RAIN, TRUE))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScriptPushCursorAndCallback(BattleScript_DrizzleActivates);
effect++;
}
Fixed infinite loop
2021-10-06 14:10:56 +02:00
else if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_PRIMAL_ANY && !gSpecialStatuses[battler].switchInAbilityDone)
{
gSpecialStatuses[battler].switchInAbilityDone = 1;
BattleScriptPushCursorAndCallback(BattleScript_BlockedByPrimalWeatherEnd3);
effect++;
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
case ABILITY_SAND_STREAM:
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
if (TryChangeBattleWeather(battler, ENUM_WEATHER_SANDSTORM, TRUE))
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
{
Fix Sandstorm raining
2019-01-19 11:22:49 +01:00
BattleScriptPushCursorAndCallback(BattleScript_SandstreamActivates);
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
effect++;
}
Fixed infinite loop
2021-10-06 14:10:56 +02:00
else if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_PRIMAL_ANY && !gSpecialStatuses[battler].switchInAbilityDone)
{
gSpecialStatuses[battler].switchInAbilityDone = 1;
BattleScriptPushCursorAndCallback(BattleScript_BlockedByPrimalWeatherEnd3);
effect++;
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
case ABILITY_DROUGHT:
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
if (TryChangeBattleWeather(battler, ENUM_WEATHER_SUN, TRUE))
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
{
BattleScriptPushCursorAndCallback(BattleScript_DroughtActivates);
effect++;
}
Fixed infinite loop
2021-10-06 14:10:56 +02:00
else if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_PRIMAL_ANY && !gSpecialStatuses[battler].switchInAbilityDone)
{
gSpecialStatuses[battler].switchInAbilityDone = 1;
BattleScriptPushCursorAndCallback(BattleScript_BlockedByPrimalWeatherEnd3);
effect++;
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
case ABILITY_SNOW_WARNING:
if (TryChangeBattleWeather(battler, ENUM_WEATHER_HAIL, TRUE))
{
BattleScriptPushCursorAndCallback(BattleScript_SnowWarningActivates);
effect++;
}
Fixed infinite loop
2021-10-06 14:10:56 +02:00
else if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_PRIMAL_ANY && !gSpecialStatuses[battler].switchInAbilityDone)
{
gSpecialStatuses[battler].switchInAbilityDone = 1;
BattleScriptPushCursorAndCallback(BattleScript_BlockedByPrimalWeatherEnd3);
effect++;
}
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
break;
Add Surge Abilities
2019-02-09 14:30:16 +01:00
case ABILITY_ELECTRIC_SURGE:
Optimized terrain timers
2021-11-06 23:46:52 +01:00
if (TryChangeBattleTerrain(battler, STATUS_FIELD_ELECTRIC_TERRAIN, &gFieldTimers.terrainTimer))
Add Surge Abilities
2019-02-09 14:30:16 +01:00
{
BattleScriptPushCursorAndCallback(BattleScript_ElectricSurgeActivates);
effect++;
}
break;
case ABILITY_GRASSY_SURGE:
Optimized terrain timers
2021-11-06 23:46:52 +01:00
if (TryChangeBattleTerrain(battler, STATUS_FIELD_GRASSY_TERRAIN, &gFieldTimers.terrainTimer))
Add Surge Abilities
2019-02-09 14:30:16 +01:00
{
BattleScriptPushCursorAndCallback(BattleScript_GrassySurgeActivates);
effect++;
}
break;
case ABILITY_MISTY_SURGE:
Optimized terrain timers
2021-11-06 23:46:52 +01:00
if (TryChangeBattleTerrain(battler, STATUS_FIELD_MISTY_TERRAIN, &gFieldTimers.terrainTimer))
Add Surge Abilities
2019-02-09 14:30:16 +01:00
{
BattleScriptPushCursorAndCallback(BattleScript_MistySurgeActivates);
effect++;
}
break;
case ABILITY_PSYCHIC_SURGE:
Optimized terrain timers
2021-11-06 23:46:52 +01:00
if (TryChangeBattleTerrain(battler, STATUS_FIELD_PSYCHIC_TERRAIN, &gFieldTimers.terrainTimer))
Add Surge Abilities
2019-02-09 14:30:16 +01:00
{
BattleScriptPushCursorAndCallback(BattleScript_PsychicSurgeActivates);
effect++;
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_INTIMIDATE:
if (!(gSpecialStatuses[battler].intimidatedMon))
{
Free up two status3 flags
2019-02-25 16:17:23 +01:00
gBattleResources->flags->flags[battler] |= RESOURCE_FLAG_INTIMIDATED;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].intimidatedMon = TRUE;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
case ABILITY_FORECAST:
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
case ABILITY_FLOWER_GIFT:
effect = TryWeatherFormChange(battler);
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (effect != 0)
{
BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
*(&gBattleStruct->formToChangeInto) = effect - 1;
}
break;
case ABILITY_TRACE:
if (!(gSpecialStatuses[battler].traced))
{
Free up two status3 flags
2019-02-25 16:17:23 +01:00
gBattleResources->flags->flags[battler] |= RESOURCE_FLAG_TRACED;
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].traced = TRUE;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
case ABILITY_CLOUD_NINE:
case ABILITY_AIR_LOCK:
finish switch in ability messages
2020-11-19 19:42:00 +01:00
if (!gSpecialStatuses[battler].switchInAbilityDone)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
finish switch in ability messages
2020-11-19 19:42:00 +01:00
BattleScriptPushCursorAndCallback(BattleScript_AnnounceAirLockCloudNine);
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
Schooling
2020-04-21 20:43:47 +02:00
case ABILITY_SCHOOLING:
if (gBattleMons[battler].level < 20)
break;
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
case ABILITY_SHIELDS_DOWN:
if (ShouldChangeFormHpBased(battler))
{
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3);
effect++;
}
break;
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
case ABILITY_INTREPID_SWORD:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
SET_STATCHANGER(STAT_ATK, 1, FALSE);
Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
2020-12-05 17:50:47 +01:00
BattleScriptPushCursorAndCallback(BattleScript_BattlerAbilityStatRaiseOnSwitchIn);
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
effect++;
}
break;
case ABILITY_DAUNTLESS_SHIELD:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
SET_STATCHANGER(STAT_DEF, 1, FALSE);
Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
2020-12-05 17:50:47 +01:00
BattleScriptPushCursorAndCallback(BattleScript_BattlerAbilityStatRaiseOnSwitchIn);
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
effect++;
}
break;
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-26 21:14:05 +02:00
case ABILITY_DESOLATE_LAND:
if (TryChangeBattleWeather(battler, ENUM_WEATHER_SUN_PRIMAL, TRUE))
{
BattleScriptPushCursorAndCallback(BattleScript_DesolateLandActivates);
effect++;
}
break;
case ABILITY_PRIMORDIAL_SEA:
if (TryChangeBattleWeather(battler, ENUM_WEATHER_RAIN_PRIMAL, TRUE))
{
BattleScriptPushCursorAndCallback(BattleScript_PrimordialSeaActivates);
effect++;
}
break;
case ABILITY_DELTA_STREAM:
if (TryChangeBattleWeather(battler, ENUM_WEATHER_STRONG_WINDS, TRUE))
{
BattleScriptPushCursorAndCallback(BattleScript_DeltaStreamActivates);
effect++;
}
break;
Implemented Mimicry Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-10-31 01:40:05 +02:00
case ABILITY_MIMICRY:
if (gBattleMons[battler].hp != 0 && gFieldStatuses & STATUS_FIELD_TERRAIN_ANY)
{
TryToApplyMimicry(battler, FALSE);
effect++;
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
case ABILITYEFFECT_ENDTURN: // 1
if (gBattleMons[battler].hp != 0)
{
gBattlerAttacker = battler;
finish porting cam's port
2017-09-17 15:19:15 +02:00
switch (gLastUsedAbility)
{
Add Harvest
2018-07-28 17:13:47 +02:00
case ABILITY_HARVEST:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if ((IsBattlerWeatherAffected(battler, WEATHER_SUN_ANY) || Random() % 2 == 0)
Add Harvest
2018-07-28 17:13:47 +02:00
&& gBattleMons[battler].item == ITEM_NONE
fix recycle and harvest
2021-10-28 23:52:52 +02:00
&& gBattleStruct->changedItems[battler] == ITEM_NONE // Will not inherit an item
&& ItemId_GetPocket(GetUsedHeldItem(battler)) == POCKET_BERRIES)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add Harvest
2018-07-28 17:13:47 +02:00
BattleScriptPushCursorAndCallback(BattleScript_HarvestActivates);
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Dry Skin Weather fix
2020-07-11 14:25:57 +02:00
case ABILITY_DRY_SKIN:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (IsBattlerWeatherAffected(battler, WEATHER_SUN_ANY))
Dry Skin Weather fix
2020-07-11 14:25:57 +02:00
goto SOLAR_POWER_HP_DROP;
// Dry Skin works similarly to Rain Dish in Rain
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_RAIN_DISH:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (IsBattlerWeatherAffected(battler, WEATHER_RAIN_ANY)
Update Unusable Moves
2018-07-31 23:09:47 +02:00
&& !BATTLER_MAX_HP(battler)
&& !(gStatuses3[battler] & STATUS3_HEAL_BLOCK))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScriptPushCursorAndCallback(BattleScript_RainDishActivates);
Dry Skin Weather fix
2020-07-11 14:25:57 +02:00
gBattleMoveDamage = gBattleMons[battler].maxHP / (gLastUsedAbility == ABILITY_RAIN_DISH ? 16 : 8);
finish porting cam's port
2017-09-17 15:19:15 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleMoveDamage *= -1;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
case ABILITY_HYDRATION:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (IsBattlerWeatherAffected(battler, WEATHER_RAIN_ANY)
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
&& gBattleMons[battler].status1 & STATUS1_ANY)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
goto ABILITY_HEAL_MON_STATUS;
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_SHED_SKIN:
if ((gBattleMons[battler].status1 & STATUS1_ANY) && (Random() % 3) == 0)
{
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
ABILITY_HEAL_MON_STATUS:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (gBattleMons[battler].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON))
StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
if (gBattleMons[battler].status1 & STATUS1_SLEEP)
StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
if (gBattleMons[battler].status1 & STATUS1_PARALYSIS)
StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
if (gBattleMons[battler].status1 & STATUS1_BURN)
StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
if (gBattleMons[battler].status1 & STATUS1_FREEZE)
StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleMons[battler].status1 = 0;
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
gBattleMons[battler].status2 &= ~(STATUS2_NIGHTMARE);
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleScripting.battler = gActiveBattler = battler;
BattleScriptPushCursorAndCallback(BattleScript_ShedSkinActivates);
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[battler].status1);
MarkBattlerForControllerExec(gActiveBattler);
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_SPEED_BOOST:
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (CompareStat(battler, STAT_SPEED, MAX_STAT_STAGE, CMP_LESS_THAN) && gDisableStructs[battler].isFirstTurn != 2)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleMons[battler].statStages[STAT_SPEED]++;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleScripting.animArg1 = 14 + STAT_SPEED;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleScripting.animArg2 = 0;
BattleScriptPushCursorAndCallback(BattleScript_SpeedBoostActivates);
gBattleScripting.battler = battler;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Moody
2020-04-19 15:44:44 +02:00
case ABILITY_MOODY:
if (gDisableStructs[battler].isFirstTurn != 2)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Moody small fix
2020-04-19 16:51:29 +02:00
u32 validToRaise = 0, validToLower = 0;
Moody
2020-04-19 15:44:44 +02:00
u32 statsNum = (B_MOODY_ACC_EVASION != GEN_8) ? NUM_BATTLE_STATS : NUM_STATS;
for (i = STAT_ATK; i < statsNum; i++)
{
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (CompareStat(battler, i, MIN_STAT_STAGE, CMP_GREATER_THAN))
Moody
2020-04-19 15:44:44 +02:00
validToLower |= gBitTable[i];
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (CompareStat(battler, i, MAX_STAT_STAGE, CMP_LESS_THAN))
Moody
2020-04-19 15:44:44 +02:00
validToRaise |= gBitTable[i];
}
if (validToLower != 0 || validToRaise != 0) // Can lower one stat, or can raise one stat
{
gBattleScripting.statChanger = gBattleScripting.savedStatChanger = 0; // for raising and lowering stat respectively
if (validToRaise != 0) // Find stat to raise
{
do
{
i = (Random() % statsNum) + STAT_ATK;
} while (!(validToRaise & gBitTable[i]));
Geomancy
2020-04-20 19:02:03 +02:00
SET_STATCHANGER(i, 2, FALSE);
Moody
2020-04-19 15:44:44 +02:00
validToLower &= ~(gBitTable[i]); // Can't lower the same stat as raising.
}
if (validToLower != 0) // Find stat to lower
{
do
{
i = (Random() % statsNum) + STAT_ATK;
} while (!(validToLower & gBitTable[i]));
SET_STATCHANGER2(gBattleScripting.savedStatChanger, i, 1, TRUE);
}
BattleScriptPushCursorAndCallback(BattleScript_MoodyActivates);
effect++;
}
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_TRUANT:
gDisableStructs[gBattlerAttacker].truantCounter ^= 1;
finish porting cam's port
2017-09-17 15:19:15 +02:00
break;
Add Bad Dreams
2018-07-22 21:05:12 +02:00
case ABILITY_BAD_DREAMS:
Comatose
2019-12-31 16:36:53 +01:00
if (gBattleMons[battler].status1 & STATUS1_SLEEP
|| gBattleMons[BATTLE_OPPOSITE(battler)].status1 & STATUS1_SLEEP
|| GetBattlerAbility(battler) == ABILITY_COMATOSE
|| GetBattlerAbility(BATTLE_OPPOSITE(battler)) == ABILITY_COMATOSE)
Add Bad Dreams
2018-07-22 21:05:12 +02:00
{
BattleScriptPushCursorAndCallback(BattleScript_BadDreamsActivates);
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Dry Skin Weather fix
2020-07-11 14:25:57 +02:00
SOLAR_POWER_HP_DROP:
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
case ABILITY_SOLAR_POWER:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (IsBattlerWeatherAffected(battler, WEATHER_SUN_ANY))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
BattleScriptPushCursorAndCallback(BattleScript_SolarPowerActivates);
gBattleMoveDamage = gBattleMons[battler].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Healer
2020-04-18 19:09:17 +02:00
case ABILITY_HEALER:
gBattleScripting.battler = BATTLE_PARTNER(battler);
if (IsBattlerAlive(gBattleScripting.battler)
&& gBattleMons[gBattleScripting.battler].status1 & STATUS1_ANY
&& (Random() % 100) < 30)
{
BattleScriptPushCursorAndCallback(BattleScript_HealerActivates);
effect++;
}
break;
Schooling
2020-04-21 20:43:47 +02:00
case ABILITY_SCHOOLING:
if (gBattleMons[battler].level < 20)
break;
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
case ABILITY_ZEN_MODE:
case ABILITY_SHIELDS_DOWN:
if ((effect = ShouldChangeFormHpBased(battler)))
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3);
break;
Power Construct
2020-07-16 15:40:56 +02:00
case ABILITY_POWER_CONSTRUCT:
if ((gBattleMons[battler].species == SPECIES_ZYGARDE || gBattleMons[battler].species == SPECIES_ZYGARDE_10)
&& gBattleMons[battler].hp <= gBattleMons[battler].maxHP / 2)
{
gBattleStruct->changedSpecies[gBattlerPartyIndexes[battler]] = gBattleMons[battler].species;
gBattleMons[battler].species = SPECIES_ZYGARDE_COMPLETE;
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3);
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Implemented Ball Fetch
2020-12-03 03:09:35 +01:00
case ABILITY_BALL_FETCH:
if (gBattleMons[battler].item == ITEM_NONE
Review corrections -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.
2021-01-07 08:30:34 +01:00
&& gBattleResults.catchAttempts[gLastUsedBall - ITEM_ULTRA_BALL] >= 1
Implemented Ball Fetch
2020-12-03 03:09:35 +01:00
&& !gHasFetchedBall)
{
gBattleScripting.battler = battler;
BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedBall);
MarkBattlerForControllerExec(battler);
gHasFetchedBall = TRUE;
gLastUsedItem = gLastUsedBall;
BattleScriptPushCursorAndCallback(BattleScript_BallFetch);
effect++;
}
break;
Hunger Switch and Aura Wheel Implement the ability Hunger Switch and the move Aura Wheel.
2021-11-03 07:45:03 +01:00
case ABILITY_HUNGER_SWITCH:
if (!(gBattleMons[battler].status2 & STATUS2_TRANSFORMED))
{
if (gBattleMons[battler].species == SPECIES_MORPEKO)
{
gBattleMons[battler].species = SPECIES_MORPEKO_HANGRY;
Remove ability pop up for Hunger Switch Morpeko should change form each turn without showing its ability.
2021-11-04 03:40:26 +01:00
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3NoPopup);
Hunger Switch and Aura Wheel Implement the ability Hunger Switch and the move Aura Wheel.
2021-11-03 07:45:03 +01:00
}
else if (gBattleMons[battler].species == SPECIES_MORPEKO_HANGRY)
{
gBattleMons[battler].species = SPECIES_MORPEKO;
Remove ability pop up for Hunger Switch Morpeko should change form each turn without showing its ability.
2021-11-04 03:40:26 +01:00
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3NoPopup);
Hunger Switch and Aura Wheel Implement the ability Hunger Switch and the move Aura Wheel.
2021-11-03 07:45:03 +01:00
}
effect++;
}
break;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
case ABILITYEFFECT_MOVES_BLOCK: // 2
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
{
Fix and rename GetMoveTargetType Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 00:09:54 +01:00
u16 moveTarget = GetBattlerMoveTargetType(battler, move);
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
if ((gLastUsedAbility == ABILITY_SOUNDPROOF && gBattleMoves[move].flags & FLAG_SOUND && !(moveTarget & MOVE_TARGET_USER))
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
|| (gLastUsedAbility == ABILITY_BULLETPROOF && gBattleMoves[move].flags & FLAG_BALLISTIC))
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
{
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)
gHitMarker |= HITMARKER_NO_PPDEDUCT;
gBattlescriptCurrInstr = BattleScript_SoundproofProtected;
effect = 1;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
Fix Queenly Majesty
2019-12-31 13:33:54 +01:00
else if ((((gLastUsedAbility == ABILITY_DAZZLING || gLastUsedAbility == ABILITY_QUEENLY_MAJESTY
|| (IsBattlerAlive(battler ^= BIT_FLANK)
&& ((GetBattlerAbility(battler) == ABILITY_DAZZLING) || GetBattlerAbility(battler) == ABILITY_QUEENLY_MAJESTY)))
Fix missing parentheses
2019-12-19 19:53:07 +01:00
))
Fix Queenly Majesty
2019-12-31 13:33:54 +01:00
&& GetChosenMovePriority(gBattlerAttacker) > 0
Add Dazzling
2018-11-30 22:12:18 +01:00
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(battler))
{
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)
gHitMarker |= HITMARKER_NO_PPDEDUCT;
gBattlescriptCurrInstr = BattleScript_DazzlingProtected;
effect = 1;
}
move prankster to ABILITYEFFECT_MOVES_BLOCK
2021-10-16 16:15:15 +02:00
else if (BlocksPrankster(move, gBattlerAttacker, gBattlerTarget, TRUE)
&& !(IS_MOVE_STATUS(move) && GetBattlerAbility(gBattlerTarget) == ABILITY_MAGIC_BOUNCE))
{
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) || !(moveTarget & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY)))
move prankster to ABILITYEFFECT_MOVES_BLOCK
2021-10-16 16:15:15 +02:00
CancelMultiTurnMoves(gBattlerAttacker); // Don't cancel moves that can hit two targets bc one target might not be protected
gBattleScripting.battler = gBattlerAbility = gBattlerTarget;
gBattlescriptCurrInstr = BattleScript_DarkTypePreventsPrankster;
effect = 1;
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITYEFFECT_ABSORBING: // 3
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
if (move != MOVE_NONE)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
{
u8 statId;
switch (gLastUsedAbility)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_VOLT_ABSORB:
if (moveType == TYPE_ELECTRIC)
effect = 1;
break;
case ABILITY_WATER_ABSORB:
case ABILITY_DRY_SKIN:
if (moveType == TYPE_WATER)
effect = 1;
break;
case ABILITY_MOTOR_DRIVE:
if (moveType == TYPE_ELECTRIC)
effect = 2, statId = STAT_SPEED;
break;
case ABILITY_LIGHTNING_ROD:
if (moveType == TYPE_ELECTRIC)
effect = 2, statId = STAT_SPATK;
break;
case ABILITY_STORM_DRAIN:
if (moveType == TYPE_WATER)
effect = 2, statId = STAT_SPATK;
break;
case ABILITY_SAP_SIPPER:
Fix Sap Sipper
2019-02-07 21:33:03 +01:00
if (moveType == TYPE_GRASS)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
effect = 2, statId = STAT_ATK;
break;
case ABILITY_FLASH_FIRE:
More Battle config (#352) * Binding move turns. * Binding damage. * Incineratable Gems. * Flash Fire while frozen. * Sleep turns. * Synchronized natures % * Confusion self damage chance. * Fixed confused self-damage check
2020-04-23 09:01:28 +02:00
if (moveType == TYPE_FIRE && !((gBattleMons[battler].status1 & STATUS1_FREEZE) && B_FLASH_FIRE_FROZEN <= GEN_4))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (!(gBattleResources->flags->flags[battler] & RESOURCE_FLAG_FLASH_FIRE))
more battle labels
2017-11-26 17:15:28 +01:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_FLASH_FIRE_BOOST;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (gProtectStructs[gBattlerAttacker].notFirstStrike)
gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
else
gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
gBattleResources->flags->flags[battler] |= RESOURCE_FLAG_FLASH_FIRE;
Fix Flash Fire string
2019-06-11 10:57:02 +02:00
effect = 3;
more battle labels
2017-11-26 17:15:28 +01:00
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
else
more battle labels
2017-11-26 17:15:28 +01:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_FLASH_FIRE_NO_BOOST;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (gProtectStructs[gBattlerAttacker].notFirstStrike)
gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
else
gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
more battle labels
2017-11-26 17:15:28 +01:00
effect = 3;
}
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
}
merge with master
2018-09-02 00:07:19 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (effect == 1) // Drain Hp ability.
{
Update Unusable Moves
2018-07-31 23:09:47 +02:00
if (BATTLER_MAX_HP(battler) || gStatuses3[battler] & STATUS3_HEAL_BLOCK)
more battle labels
2017-11-26 17:15:28 +01:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if ((gProtectStructs[gBattlerAttacker].notFirstStrike))
gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless;
else
gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless_PPLoss;
}
else
{
if (gProtectStructs[gBattlerAttacker].notFirstStrike)
gBattlescriptCurrInstr = BattleScript_MoveHPDrain;
else
gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss;
ABE is matching
2017-10-12 17:49:24 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gBattleMoveDamage = gBattleMons[battler].maxHP / 4;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
gBattleMoveDamage *= -1;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
else if (effect == 2) // Boost Stat ability;
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (!CompareStat(battler, statId, MAX_STAT_STAGE, CMP_LESS_THAN))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if ((gProtectStructs[gBattlerAttacker].notFirstStrike))
gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless;
else
gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless_PPLoss;
}
else
{
if (gProtectStructs[gBattlerAttacker].notFirstStrike)
gBattlescriptCurrInstr = BattleScript_MoveStatDrain;
else
gBattlescriptCurrInstr = BattleScript_MoveStatDrain_PPLoss;
SET_STATCHANGER(statId, 1, FALSE);
gBattleMons[battler].statStages[statId]++;
PREPARE_STAT_BUFFER(gBattleTextBuff1, statId);
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
merge with master
2018-09-02 00:07:19 +02:00
case ABILITYEFFECT_MOVE_END: // Think contact abilities.
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
switch (gLastUsedAbility)
{
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
case ABILITY_JUSTIFIED:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
&& moveType == TYPE_DARK
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(battler, STAT_ATK, MAX_STAT_STAGE, CMP_LESS_THAN))
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
{
SET_STATCHANGER(STAT_ATK, 1, FALSE);
BattleScriptPushCursor();
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
effect++;
}
finish porting cam's port
2017-09-17 15:19:15 +02:00
break;
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
case ABILITY_RATTLED:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
&& (moveType == TYPE_DARK || moveType == TYPE_BUG || moveType == TYPE_GHOST)
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(battler, STAT_SPEED, MAX_STAT_STAGE, CMP_LESS_THAN))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
SET_STATCHANGER(STAT_SPEED, 1, FALSE);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Stamina, Liquid Voice, Water Compaction
2020-04-15 09:37:12 +02:00
case ABILITY_WATER_COMPACTION:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
&& moveType == TYPE_WATER
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(battler, STAT_DEF, MAX_STAT_STAGE, CMP_LESS_THAN))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Stamina, Liquid Voice, Water Compaction
2020-04-15 09:37:12 +02:00
SET_STATCHANGER(STAT_DEF, 2, FALSE);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
break;
Stamina, Liquid Voice, Water Compaction
2020-04-15 09:37:12 +02:00
case ABILITY_STAMINA:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(battler, STAT_DEF, MAX_STAT_STAGE, CMP_LESS_THAN))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Stamina, Liquid Voice, Water Compaction
2020-04-15 09:37:12 +02:00
SET_STATCHANGER(STAT_DEF, 1, FALSE);
BattleScriptPushCursor();
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
Stamina, Liquid Voice, Water Compaction
2020-04-15 09:37:12 +02:00
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
Berserk
2020-04-12 12:41:26 +02:00
case ABILITY_BERSERK:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
// Had more than half of hp before, now has less
&& gBattleStruct->hpBefore[battler] > gBattleMons[battler].maxHP / 2
&& gBattleMons[battler].hp < gBattleMons[battler].maxHP / 2
&& (gMultiHitCounter == 0 || gMultiHitCounter == 1)
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
&& !(TestSheerForceFlag(gBattlerAttacker, gCurrentMove))
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(battler, STAT_SPATK, MAX_STAT_STAGE, CMP_LESS_THAN))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Berserk
2020-04-12 12:41:26 +02:00
SET_STATCHANGER(STAT_SPATK, 1, FALSE);
BattleScriptPushCursor();
Implemented Intrepid Sword and Dauntless Shield and... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.
2020-12-02 22:46:29 +01:00
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
Berserk
2020-04-12 12:41:26 +02:00
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
Emergency Exit
2020-07-15 17:21:12 +02:00
case ABILITY_EMERGENCY_EXIT:
case ABILITY_WIMP_OUT:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
// Had more than half of hp before, now has less
&& gBattleStruct->hpBefore[battler] > gBattleMons[battler].maxHP / 2
&& gBattleMons[battler].hp < gBattleMons[battler].maxHP / 2
&& (gMultiHitCounter == 0 || gMultiHitCounter == 1)
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
&& !(TestSheerForceFlag(gBattlerAttacker, gCurrentMove))
Emergency Exit
2020-07-15 17:21:12 +02:00
&& (CanBattlerSwitch(battler) || !(gBattleTypeFlags & BATTLE_TYPE_TRAINER))
Fixed Emergency Exit The ability was getting triggered even if the user was the only Pokémon alive in the party.
2021-06-08 03:31:12 +02:00
&& !(gBattleTypeFlags & BATTLE_TYPE_ARENA)
Followed Ghoulslash's suggestion
2021-06-08 16:34:23 +02:00
&& CountUsablePartyMons(battler) > 0)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Emergency Exit
2020-07-15 17:21:12 +02:00
gBattleResources->flags->flags[battler] |= RESOURCE_FLAG_EMERGENCY_EXIT;
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
case ABILITY_WEAK_ARMOR:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
Review changes and option to hide split icon.
2020-10-16 01:15:44 +02:00
&& IS_MOVE_PHYSICAL(gCurrentMove)
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& (CompareStat(battler, STAT_SPEED, MAX_STAT_STAGE, CMP_LESS_THAN) // Don't activate if speed cannot be raised
|| CompareStat(battler, STAT_DEF, MIN_STAT_STAGE, CMP_GREATER_THAN))) // Don't activate if defense cannot be lowered
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
fix eject pack
2021-09-14 21:38:16 +02:00
if (gBattleMoves[gCurrentMove].effect == EFFECT_HIT_ESCAPE && CanBattlerSwitch(gBattlerAttacker))
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gProtectStructs[battler].disableEjectPack = TRUE; // Set flag for target
format fixes
2021-09-16 23:10:41 +02:00
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_WeakArmorActivates;
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
case ABILITY_CURSED_BODY:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& gDisableStructs[gBattlerAttacker].disabledMove == MOVE_NONE
&& IsBattlerAlive(gBattlerAttacker)
Aroma Veil
2019-04-01 11:42:37 +02:00
&& !IsAbilityOnSide(gBattlerAttacker, ABILITY_AROMA_VEIL)
Cursed Body PP check
2019-03-30 11:58:19 +01:00
&& gBattleMons[gBattlerAttacker].pp[gChosenMovePos] != 0
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
&& (Random() % 3) == 0)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
gDisableStructs[gBattlerAttacker].disabledMove = gChosenMove;
Merge with master
2018-10-14 20:51:34 +02:00
gDisableStructs[gBattlerAttacker].disableTimer = 4;
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
PREPARE_MOVE_BUFFER(gBattleTextBuff1, gChosenMove);
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_CursedBodyActivates;
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
case ABILITY_MUMMY:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& IsBattlerAlive(gBattlerAttacker)
fix early mummy activation on two-turn moves
2020-12-14 20:27:48 +01:00
&& TARGET_TURN_DAMAGED
Only thing left is making IsMoveMakingContact work when hitting King's Shield, etc.
2021-06-05 22:47:05 +02:00
&& (IsMoveMakingContact(move, gBattlerAttacker)))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
switch (gBattleMons[gBattlerAttacker].ability)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
case ABILITY_MUMMY:
case ABILITY_BATTLE_BOND:
case ABILITY_COMATOSE:
case ABILITY_DISGUISE:
case ABILITY_MULTITYPE:
case ABILITY_POWER_CONSTRUCT:
case ABILITY_RKS_SYSTEM:
case ABILITY_SCHOOLING:
case ABILITY_SHIELDS_DOWN:
case ABILITY_STANCE_CHANGE:
break;
default:
gLastUsedAbility = gBattleMons[gBattlerAttacker].ability = ABILITY_MUMMY;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_MummyActivates;
effect++;
break;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
break;
add wandering spirit
2021-10-12 16:32:51 +02:00
case ABILITY_WANDERING_SPIRIT:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& IsBattlerAlive(gBattlerAttacker)
&& TARGET_TURN_DAMAGED
&& (gBattleMoves[move].flags & FLAG_MAKES_CONTACT))
{
switch (gBattleMons[gBattlerAttacker].ability)
{
case ABILITY_DISGUISE:
case ABILITY_FLOWER_GIFT:
case ABILITY_GULP_MISSILE:
hunger switch unaffected by wandering spirit
2021-10-30 17:18:50 +02:00
case ABILITY_HUNGER_SWITCH:
add wandering spirit
2021-10-12 16:32:51 +02:00
case ABILITY_ICE_FACE:
case ABILITY_ILLUSION:
case ABILITY_IMPOSTER:
case ABILITY_RECEIVER:
case ABILITY_RKS_SYSTEM:
case ABILITY_SCHOOLING:
case ABILITY_STANCE_CHANGE:
case ABILITY_WONDER_GUARD:
case ABILITY_ZEN_MODE:
break;
default:
gLastUsedAbility = gBattleMons[gBattlerAttacker].ability;
gBattleMons[gBattlerAttacker].ability = gBattleMons[gBattlerTarget].ability;
gBattleMons[gBattlerTarget].ability = gLastUsedAbility;
record abilities from wandering spirit
2021-10-12 17:58:37 +02:00
RecordAbilityBattle(gBattlerAttacker, gBattleMons[gBattlerAttacker].ability);
RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability);
add wandering spirit
2021-10-12 16:32:51 +02:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_WanderingSpiritActivates;
effect++;
break;
}
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_ANGER_POINT:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gIsCriticalHit
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(battler, STAT_ATK, MAX_STAT_STAGE, CMP_LESS_THAN))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
SET_STATCHANGER(STAT_ATK, MAX_STAT_STAGE - gBattleMons[battler].statStages[STAT_ATK], FALSE);
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScriptPushCursor();
Implemented Steam Engine And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 22:27:35 +01:00
gBattlescriptCurrInstr = BattleScript_TargetsStatWasMaxedOut;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_COLOR_CHANGE:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& move != MOVE_STRUGGLE
&& gBattleMoves[move].power != 0
&& TARGET_TURN_DAMAGED
&& !IS_BATTLER_OF_TYPE(battler, moveType)
&& gBattleMons[battler].hp != 0)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
SET_BATTLER_TYPE(battler, moveType);
PREPARE_TYPE_BUFFER(gBattleTextBuff1, moveType);
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_ColorChangeActivates;
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
Gooey and Tangling Hair
2019-12-20 23:38:38 +01:00
case ABILITY_GOOEY:
case ABILITY_TANGLING_HAIR:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerAttacker].hp != 0
add mirror armor
2021-10-13 00:04:34 +02:00
&& (CompareStat(gBattlerAttacker, STAT_SPEED, MIN_STAT_STAGE, CMP_GREATER_THAN) || GetBattlerAbility(gBattlerAttacker) == ABILITY_MIRROR_ARMOR)
Gooey and Tangling Hair
2019-12-20 23:38:38 +01:00
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& TARGET_TURN_DAMAGED
Contact moves for Aftermath and Bestow for Unburden
2019-12-25 12:19:09 +01:00
&& IsMoveMakingContact(move, gBattlerAttacker))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
add mirror armor
2021-10-13 00:04:34 +02:00
SET_STATCHANGER(STAT_SPEED, 1, TRUE);
gBattleScripting.moveEffect = MOVE_EFFECT_SPD_MINUS_1;
Gooey and Tangling Hair
2019-12-20 23:38:38 +01:00
PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gLastUsedAbility);
BattleScriptPushCursor();
add mirror armor
2021-10-13 00:04:34 +02:00
gBattlescriptCurrInstr = BattleScript_GooeyActivates;
Gooey and Tangling Hair
2019-12-20 23:38:38 +01:00
gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_ROUGH_SKIN:
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
case ABILITY_IRON_BARBS:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerAttacker].hp != 0
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& TARGET_TURN_DAMAGED
Contact moves for Aftermath and Bestow for Unburden
2019-12-25 12:19:09 +01:00
&& IsMoveMakingContact(move, gBattlerAttacker))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Rough Skin damage config
2021-10-25 01:07:22 +02:00
#if B_ROUGH_SKIN_DMG >= GEN_4
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 8;
#else
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 16;
#endif
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
Spiky Shield Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-15 13:54:11 +01:00
PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gLastUsedAbility);
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_RoughSkinActivates;
effect++;
}
break;
Implemented Aftermath's effect
2019-12-21 09:01:42 +01:00
case ABILITY_AFTERMATH:
Contact moves for Aftermath and Bestow for Unburden
2019-12-25 12:19:09 +01:00
if (!IsAbilityOnField(ABILITY_DAMP)
&& !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
Implemented Aftermath's effect
2019-12-21 09:01:42 +01:00
&& gBattleMons[gBattlerTarget].hp == 0
Fix Aftermath on fainted
2020-07-26 12:32:02 +02:00
&& IsBattlerAlive(gBattlerAttacker)
Contact moves for Aftermath and Bestow for Unburden
2019-12-25 12:19:09 +01:00
&& IsMoveMakingContact(move, gBattlerAttacker))
Implemented Aftermath's effect
2019-12-21 09:01:42 +01:00
{
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AftermathDmg;
effect++;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
Innards Out
2020-04-18 20:12:29 +02:00
case ABILITY_INNARDS_OUT:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
Fix Aftermath on fainted
2020-07-26 12:32:02 +02:00
&& gBattleMons[gBattlerTarget].hp == 0
&& IsBattlerAlive(gBattlerAttacker))
Innards Out
2020-04-18 20:12:29 +02:00
{
gBattleMoveDamage = gSpecialStatuses[gBattlerTarget].dmg;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AftermathDmg;
effect++;
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_EFFECT_SPORE:
Fix Flame Body Static ability pop-up activation
2019-05-23 09:47:21 +02:00
if (!IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GRASS)
Effect Spore not affected by overcoat
2019-03-02 22:48:55 +01:00
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_OVERCOAT
Fix Safety Googles Fix typo and update gLastUsedItem before calling the safety goggles battle script.
2021-10-09 04:05:01 +02:00
&& GetBattlerHoldEffect(gBattlerAttacker, TRUE) != HOLD_EFFECT_SAFETY_GOGGLES)
Fix Flame Body Static ability pop-up activation
2019-05-23 09:47:21 +02:00
{
i = Random() % 3;
if (i == 0)
goto POISON_POINT;
if (i == 1)
goto STATIC;
// Sleep
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerAttacker].hp != 0
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& TARGET_TURN_DAMAGED
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
&& CanSleep(gBattlerAttacker)
Poison Touch
2020-04-19 14:24:31 +02:00
&& IsMoveMakingContact(move, gBattlerAttacker)
Fix Flame Body Static ability pop-up activation
2019-05-23 09:47:21 +02:00
&& (Random() % 3) == 0)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Fix Flame Body Static ability pop-up activation
2019-05-23 09:47:21 +02:00
gBattleScripting.moveEffect = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_SLEEP;
PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gLastUsedAbility);
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect;
gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
finish porting cam's port
2017-09-17 15:19:15 +02:00
effect++;
}
}
break;
Fix Flame Body Static ability pop-up activation
2019-05-23 09:47:21 +02:00
POISON_POINT:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_POISON_POINT:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerAttacker].hp != 0
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& TARGET_TURN_DAMAGED
Fix Corrosion, Poison Touch - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 10:12:18 +02:00
&& CanBePoisoned(gBattlerAttacker, gBattlerTarget)
Poison Touch
2020-04-19 14:24:31 +02:00
&& IsMoveMakingContact(move, gBattlerAttacker)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
&& (Random() % 3) == 0)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Change move effect to u16
2019-02-14 13:17:27 +01:00
gBattleScripting.moveEffect = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_POISON;
Fix Flame Body Static ability pop-up activation
2019-05-23 09:47:21 +02:00
PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gLastUsedAbility);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
Effect Spore ability pop-up
2019-03-01 13:59:08 +01:00
gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect;
finish porting cam's port
2017-09-17 15:19:15 +02:00
gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
effect++;
}
break;
Fix Flame Body Static ability pop-up activation
2019-05-23 09:47:21 +02:00
STATIC:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_STATIC:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerAttacker].hp != 0
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& TARGET_TURN_DAMAGED
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
&& CanBeParalyzed(gBattlerAttacker)
Poison Touch
2020-04-19 14:24:31 +02:00
&& IsMoveMakingContact(move, gBattlerAttacker)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
&& (Random() % 3) == 0)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Change move effect to u16
2019-02-14 13:17:27 +01:00
gBattleScripting.moveEffect = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_PARALYSIS;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScriptPushCursor();
Effect Spore ability pop-up
2019-03-01 13:59:08 +01:00
gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
effect++;
}
break;
case ABILITY_FLAME_BODY:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerAttacker].hp != 0
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
Only thing left is making IsMoveMakingContact work when hitting King's Shield, etc.
2021-06-05 22:47:05 +02:00
&& (IsMoveMakingContact(move, gBattlerAttacker))
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
&& TARGET_TURN_DAMAGED
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
&& CanBeBurned(gBattlerAttacker)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
&& (Random() % 3) == 0)
{
Change move effect to u16
2019-02-14 13:17:27 +01:00
gBattleScripting.moveEffect = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_BURN;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScriptPushCursor();
Effect Spore ability pop-up
2019-03-01 13:59:08 +01:00
gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
effect++;
}
break;
case ABILITY_CUTE_CHARM:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerAttacker].hp != 0
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
Only thing left is making IsMoveMakingContact work when hitting King's Shield, etc.
2021-06-05 22:47:05 +02:00
&& (IsMoveMakingContact(move, gBattlerAttacker))
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
&& TARGET_TURN_DAMAGED
&& gBattleMons[gBattlerTarget].hp != 0
&& (Random() % 3) == 0
Aroma Veil
2019-04-01 11:42:37 +02:00
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_OBLIVIOUS
&& !IsAbilityOnSide(gBattlerAttacker, ABILITY_AROMA_VEIL)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
&& GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef)
&& !(gBattleMons[gBattlerAttacker].status2 & STATUS2_INFATUATION)
&& GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != MON_GENDERLESS
&& GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != MON_GENDERLESS)
{
gBattleMons[gBattlerAttacker].status2 |= STATUS2_INFATUATED_WITH(gBattlerTarget);
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_CuteCharmActivates;
effect++;
}
break;
Illusion
2019-08-08 13:06:55 +02:00
case ABILITY_ILLUSION:
Hopefully illusion works as intended now
2020-06-28 19:45:48 +02:00
if (gBattleStruct->illusion[gBattlerTarget].on && !gBattleStruct->illusion[gBattlerTarget].broken && TARGET_TURN_DAMAGED)
Illusion
2019-08-08 13:06:55 +02:00
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_IllusionOff;
effect++;
}
break;
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
case ABILITY_COTTON_DOWN:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
Fixed Cotton Down It was tough, but the nightmare is finally over. Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 19:03:52 +01:00
&& gBattleMons[gBattlerAttacker].hp != 0
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& TARGET_TURN_DAMAGED)
{
Fixed Cotton Down It was tough, but the nightmare is finally over. Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 19:03:52 +01:00
gEffectBattler = gBattlerTarget;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_CottonDownActivates;
effect++;
Implemented Cotton Down
2020-12-03 02:53:00 +01:00
}
break;
Implemented Steam Engine And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 22:27:35 +01:00
case ABILITY_STEAM_ENGINE:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(battler, STAT_SPEED, MAX_STAT_STAGE, CMP_LESS_THAN)
Implemented Steam Engine And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 22:27:35 +01:00
&& (moveType == TYPE_FIRE || moveType == TYPE_WATER))
{
Corrections to Steam Engine
2021-01-07 20:19:56 +01:00
SET_STATCHANGER(STAT_SPEED, 6, FALSE);
Implemented Steam Engine And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 22:27:35 +01:00
BattleScriptPushCursor();
Corrections to Steam Engine
2021-01-07 20:19:56 +01:00
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
Implemented Steam Engine And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 22:27:35 +01:00
effect++;
}
break;
Implemented Sand Spit
2020-12-11 20:41:53 +01:00
case ABILITY_SAND_SPIT:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& TARGET_TURN_DAMAGED
fix sand spit + primal weather
2021-10-12 03:29:08 +02:00
&& !(WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SANDSTORM_ANY))
Implemented Sand Spit
2020-12-11 20:41:53 +01:00
{
fix sand spit + primal weather
2021-10-12 03:29:08 +02:00
if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_PRIMAL_ANY)
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_BlockedByPrimalWeatherRet;
effect++;
}
else if (TryChangeBattleWeather(battler, ENUM_WEATHER_SANDSTORM, TRUE))
{
gBattleScripting.battler = gActiveBattler = battler;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_SandSpitActivates;
effect++;
}
Implemented Sand Spit
2020-12-11 20:41:53 +01:00
}
break;
Implemented Perish Body Inspired by Raguzero's implementation.
2020-12-11 23:00:30 +01:00
case ABILITY_PERISH_BODY:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
Only thing left is making IsMoveMakingContact work when hitting King's Shield, etc.
2021-06-05 22:47:05 +02:00
&& (IsMoveMakingContact(move, gBattlerAttacker))
Implemented Perish Body Inspired by Raguzero's implementation.
2020-12-11 23:00:30 +01:00
&& !(gStatuses3[gBattlerAttacker] & STATUS3_PERISH_SONG))
{
if (!(gStatuses3[battler] & STATUS3_PERISH_SONG))
{
gStatuses3[battler] |= STATUS3_PERISH_SONG;
gDisableStructs[battler].perishSongTimer = 3;
gDisableStructs[battler].perishSongTimerStartValue = 3;
}
gStatuses3[gBattlerAttacker] |= STATUS3_PERISH_SONG;
gDisableStructs[gBattlerAttacker].perishSongTimer = 3;
gDisableStructs[gBattlerAttacker].perishSongTimerStartValue = 3;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_PerishBodyActivates;
effect++;
}
break;
Implemented Cramorant's Gulp Missile form change
2021-01-12 18:58:24 +01:00
case ABILITY_GULP_MISSILE:
Poison Touch fix
2020-04-19 14:43:54 +02:00
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
Implemented Cramorant's Gulp Missile form change
2021-01-12 18:58:24 +01:00
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
More fixes -Removed IsBattlerAlive check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Turns out Cramorant can change form even on single wild battles. -Added a check for IsBattlerAlive in the case ABILITY_GULP_MISSILE of ABILITYEFFECT_MOVE_END, because otherwise, for whatever reason, the user was trying to trigger the Gulping effect even in its base form. -Set the stat to change for the Gulping effect from within the battle script. The rest of the effect is handled there, so may as well. -Fixed the check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Apparently, a silent species change was happening because of the order of the checks. Thanks to AsparagusEduardo for pointing this one out. -Fixed the secondary effect of a target's Gulp Missile affecting an attacker that has fainted. -Fixed the Defense reduction of the Gulping effect bypassing Clear Body.
2021-09-29 11:13:56 +02:00
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler))
Poison Touch fix
2020-04-19 14:43:54 +02:00
{
Another small condition fix and small optimization -Checking for IsBattlerAlive is incorrect because Gulp Missile's counterattack should happen even if Cramorant faints. -Made the code a bit more readable.
2021-09-28 02:31:42 +02:00
if (gBattleMons[gBattlerTarget].species == SPECIES_CRAMORANT_GORGING)
A lot of fixes -Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle. -Fixed Gulp Missile activating if the only/last target has already fainted. -Fixed Gulp Missile's Gorging animation, though it still uses Tackle's. -Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard. -Fixed Gulp Missile changing Cramorant's form if Surf failed.
2021-09-27 00:59:56 +02:00
{
Another small condition fix and small optimization -Checking for IsBattlerAlive is incorrect because Gulp Missile's counterattack should happen even if Cramorant faints. -Made the code a bit more readable.
2021-09-28 02:31:42 +02:00
gBattleStruct->changedSpecies[gBattlerPartyIndexes[gBattlerTarget]] = gBattleMons[gBattlerTarget].species;
gBattleMons[gBattlerTarget].species = SPECIES_CRAMORANT;
if (GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
{
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
}
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_GulpMissileGorging;
effect++;
A lot of fixes -Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle. -Fixed Gulp Missile activating if the only/last target has already fainted. -Fixed Gulp Missile's Gorging animation, though it still uses Tackle's. -Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard. -Fixed Gulp Missile changing Cramorant's form if Surf failed.
2021-09-27 00:59:56 +02:00
}
Another small condition fix and small optimization -Checking for IsBattlerAlive is incorrect because Gulp Missile's counterattack should happen even if Cramorant faints. -Made the code a bit more readable.
2021-09-28 02:31:42 +02:00
else if (gBattleMons[gBattlerTarget].species == SPECIES_CRAMORANT_GULPING)
A lot of fixes -Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle. -Fixed Gulp Missile activating if the only/last target has already fainted. -Fixed Gulp Missile's Gorging animation, though it still uses Tackle's. -Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard. -Fixed Gulp Missile changing Cramorant's form if Surf failed.
2021-09-27 00:59:56 +02:00
{
Another small condition fix and small optimization -Checking for IsBattlerAlive is incorrect because Gulp Missile's counterattack should happen even if Cramorant faints. -Made the code a bit more readable.
2021-09-28 02:31:42 +02:00
gBattleStruct->changedSpecies[gBattlerPartyIndexes[gBattlerTarget]] = gBattleMons[gBattlerTarget].species;
gBattleMons[gBattlerTarget].species = SPECIES_CRAMORANT;
if (GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
{
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
}
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_GulpMissileGulping;
effect++;
A lot of fixes -Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle. -Fixed Gulp Missile activating if the only/last target has already fainted. -Fixed Gulp Missile's Gorging animation, though it still uses Tackle's. -Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard. -Fixed Gulp Missile changing Cramorant's form if Surf failed.
2021-09-27 00:59:56 +02:00
}
Implemented Cramorant's Gulp Missile form change
2021-01-12 18:58:24 +01:00
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
Poison Touch fix
2020-04-19 14:43:54 +02:00
case ABILITYEFFECT_MOVE_END_ATTACKER: // Same as above, but for attacker
switch (gLastUsedAbility)
{
case ABILITY_POISON_TOUCH:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerTarget].hp != 0
Revert Poison Touch target check This would prevent Poison Touch activating if the target hurt itself.
2021-11-03 02:49:14 +01:00
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
Fix Corrosion, Poison Touch - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 10:12:18 +02:00
&& CanBePoisoned(gBattlerAttacker, gBattlerTarget)
Poison Touch fix
2020-04-19 14:43:54 +02:00
&& IsMoveMakingContact(move, gBattlerAttacker)
Fix Corrosion, Poison Touch - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 10:12:18 +02:00
&& TARGET_TURN_DAMAGED // Need to actually hit the target
Poison Touch fix
2020-04-19 14:43:54 +02:00
&& (Random() % 3) == 0)
{
gBattleScripting.moveEffect = MOVE_EFFECT_POISON;
PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gLastUsedAbility);
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect;
gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
effect++;
}
break;
Implemented Stench's battle effect And updated its description.
2021-04-04 02:55:49 +02:00
case ABILITY_STENCH:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerTarget].hp != 0
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg
&& (Random() % 10) == 0
&& !IS_MOVE_STATUS(move)
&& !sMovesNotAffectedByStench[gCurrentMove])
{
gBattleScripting.moveEffect = MOVE_EFFECT_FLINCH;
BattleScriptPushCursor();
SetMoveEffect(FALSE, 0);
BattleScriptPop();
effect++;
}
break;
Implemented Cramorant's Gulp Missile form change
2021-01-12 18:58:24 +01:00
case ABILITY_GULP_MISSILE:
More fixes -Removed IsBattlerAlive check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Turns out Cramorant can change form even on single wild battles. -Added a check for IsBattlerAlive in the case ABILITY_GULP_MISSILE of ABILITYEFFECT_MOVE_END, because otherwise, for whatever reason, the user was trying to trigger the Gulping effect even in its base form. -Set the stat to change for the Gulping effect from within the battle script. The rest of the effect is handled there, so may as well. -Fixed the check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Apparently, a silent species change was happening because of the order of the checks. Thanks to AsparagusEduardo for pointing this one out. -Fixed the secondary effect of a target's Gulp Missile affecting an attacker that has fainted. -Fixed the Defense reduction of the Gulping effect bypassing Clear Body.
2021-09-29 11:13:56 +02:00
if (((gCurrentMove == MOVE_SURF && TARGET_TURN_DAMAGED) || gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER)
&& (effect = ShouldChangeFormHpBased(gBattlerAttacker)))
Implemented Cramorant's Gulp Missile form change
2021-01-12 18:58:24 +01:00
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AttackerFormChange;
effect++;
}
break;
Poison Touch fix
2020-04-19 14:43:54 +02:00
}
break;
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
case ABILITYEFFECT_MOVE_END_OTHER: // Abilities that activate on *another* battler's moveend: Dancer, Soul-Heart, Receiver, Symbiosis
switch (GetBattlerAbility(battler))
{
case ABILITY_DANCER:
if (IsBattlerAlive(battler)
&& (gBattleMoves[gCurrentMove].flags & FLAG_DANCE)
&& !gSpecialStatuses[battler].dancerUsedMove
&& gBattlerAttacker != battler)
{
// Set bit and save Dancer mon's original target
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battler].dancerUsedMove = TRUE;
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
gSpecialStatuses[battler].dancerOriginalTarget = *(gBattleStruct->moveTarget + battler) | 0x4;
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
gBattleStruct->atkCancellerTracker = 0;
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
gBattlerAttacker = gBattlerAbility = battler;
gCalledMove = gCurrentMove;
Gooey add check for not displaying ability pop up when not necessary
2019-12-23 17:26:48 +01:00
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
// Set the target to the original target of the mon that first used a Dance move
gBattlerTarget = gBattleScripting.savedBattler & 0x3;
Gooey add check for not displaying ability pop up when not necessary
2019-12-23 17:26:48 +01:00
Dancer Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-11-14 00:03:20 +01:00
// Make sure that the target isn't an ally - if it is, target the original user
if (GetBattlerSide(gBattlerTarget) == GetBattlerSide(gBattlerAttacker))
gBattlerTarget = (gBattleScripting.savedBattler & 0xF0) >> 4;
gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
BattleScriptExecute(BattleScript_DancerActivates);
effect++;
}
break;
}
break;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITYEFFECT_IMMUNITY: // 5
for (battler = 0; battler < gBattlersCount; battler++)
{
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
switch (GetBattlerAbility(battler))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
case ABILITY_IMMUNITY:
if (gBattleMons[battler].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_TOXIC_COUNTER))
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
effect = 1;
}
break;
case ABILITY_OWN_TEMPO:
if (gBattleMons[battler].status2 & STATUS2_CONFUSION)
{
StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
effect = 2;
}
break;
case ABILITY_LIMBER:
if (gBattleMons[battler].status1 & STATUS1_PARALYSIS)
{
StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
effect = 1;
}
break;
case ABILITY_INSOMNIA:
case ABILITY_VITAL_SPIRIT:
if (gBattleMons[battler].status1 & STATUS1_SLEEP)
{
gBattleMons[battler].status2 &= ~(STATUS2_NIGHTMARE);
StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
effect = 1;
}
break;
case ABILITY_WATER_VEIL:
water bubble prevents burn
2021-07-25 15:53:44 +02:00
case ABILITY_WATER_BUBBLE:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (gBattleMons[battler].status1 & STATUS1_BURN)
{
StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
effect = 1;
}
break;
case ABILITY_MAGMA_ARMOR:
if (gBattleMons[battler].status1 & STATUS1_FREEZE)
{
StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
effect = 1;
}
break;
case ABILITY_OBLIVIOUS:
if (gBattleMons[battler].status2 & STATUS2_INFATUATION)
effect = 3;
Tweaked the Oblivious immunities Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-03 12:55:44 +02:00
else if (gDisableStructs[battler].tauntTimer != 0)
effect = 4;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
}
if (effect)
{
switch (effect)
{
case 1: // status cleared
gBattleMons[battler].status1 = 0;
Tweaked the Oblivious immunities Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-03 12:55:44 +02:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
case 2: // get rid of confusion
gBattleMons[battler].status2 &= ~(STATUS2_CONFUSION);
Tweaked the Oblivious immunities Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-03 12:55:44 +02:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
case 3: // get rid of infatuation
gBattleMons[battler].status2 &= ~(STATUS2_INFATUATION);
Tweaked the Oblivious immunities Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-03 12:55:44 +02:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_BattlerGotOverItsInfatuation;
break;
case 4: // get rid of taunt
gDisableStructs[battler].tauntTimer = 0;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_BattlerShookOffTaunt;
finish porting cam's port
2017-09-17 15:19:15 +02:00
break;
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
Eviolite
2020-03-14 12:23:51 +01:00
gBattleScripting.battler = gActiveBattler = gBattlerAbility = battler;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
MarkBattlerForControllerExec(gActiveBattler);
return effect;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
case ABILITYEFFECT_FORECAST: // 6
for (battler = 0; battler < gBattlersCount; battler++)
{
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
if (GetBattlerAbility(battler) == ABILITY_FORECAST || GetBattlerAbility(battler) == ABILITY_FLOWER_GIFT)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Add hopefully support for Cherrim
2019-06-15 14:46:35 +02:00
effect = TryWeatherFormChange(battler);
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (effect)
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
gBattleScripting.battler = battler;
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
gBattleStruct->formToChangeInto = effect - 1;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
return effect;
}
}
}
break;
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
case ABILITYEFFECT_SYNCHRONIZE:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT))
{
gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT);
Fix Synchronize
2019-06-25 13:04:14 +02:00
if (!(gBattleMons[gBattlerAttacker].status1 & STATUS1_ANY))
{
gBattleStruct->synchronizeMoveEffect &= ~(MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN);
Config for Synchronize's interaction with toxic poisoning
2021-11-06 01:16:13 +01:00
#if B_SYNCHRONIZE_TOXIC < GEN_5
if (gBattleStruct->synchronizeMoveEffect == MOVE_EFFECT_TOXIC)
gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
#endif
Fix Synchronize
2019-06-25 13:04:14 +02:00
gBattleScripting.moveEffect = gBattleStruct->synchronizeMoveEffect + MOVE_EFFECT_AFFECTS_USER;
gBattleScripting.battler = gBattlerAbility = gBattlerTarget;
PREPARE_ABILITY_BUFFER(gBattleTextBuff1, ABILITY_SYNCHRONIZE);
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
effect++;
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
case ABILITYEFFECT_ATK_SYNCHRONIZE: // 8
if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT))
{
gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT);
Fix Synchronize
2019-06-25 13:04:14 +02:00
if (!(gBattleMons[gBattlerTarget].status1 & STATUS1_ANY))
{
gBattleStruct->synchronizeMoveEffect &= ~(MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN);
if (gBattleStruct->synchronizeMoveEffect == MOVE_EFFECT_TOXIC)
gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
gBattleScripting.moveEffect = gBattleStruct->synchronizeMoveEffect;
gBattleScripting.battler = gBattlerAbility = gBattlerAttacker;
PREPARE_ABILITY_BUFFER(gBattleTextBuff1, ABILITY_SYNCHRONIZE);
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
effect++;
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
case ABILITYEFFECT_INTIMIDATE1:
case ABILITYEFFECT_INTIMIDATE2:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
for (i = 0; i < gBattlersCount; i++)
{
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
if (GetBattlerAbility(i) == ABILITY_INTIMIDATE && gBattleResources->flags->flags[i] & RESOURCE_FLAG_INTIMIDATED)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
{
gLastUsedAbility = ABILITY_INTIMIDATE;
Free up two status3 flags
2019-02-25 16:17:23 +01:00
gBattleResources->flags->flags[i] &= ~(RESOURCE_FLAG_INTIMIDATED);
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
if (caseID == ABILITYEFFECT_INTIMIDATE1)
{
BattleScriptPushCursorAndCallback(BattleScript_IntimidateActivatesEnd3);
}
else
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_IntimidateActivates;
}
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
battler = gBattlerAbility = gBattleStruct->intimidateBattler = i;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
effect++;
break;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
break;
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
case ABILITYEFFECT_TRACE1:
case ABILITYEFFECT_TRACE2:
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
for (i = 0; i < gBattlersCount; i++)
{
Free up two status3 flags
2019-02-25 16:17:23 +01:00
if (gBattleMons[i].ability == ABILITY_TRACE && (gBattleResources->flags->flags[i] & RESOURCE_FLAG_TRACED))
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
{
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
u8 side = (GetBattlerPosition(i) ^ BIT_SIDE) & BIT_SIDE; // side of the opposing pokemon
u8 target1 = GetBattlerAtPosition(side);
u8 target2 = GetBattlerAtPosition(side + BIT_FLANK);
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
Added non-traceable abilities. (#275) * Added non-traceable abilities. * Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
if (!sAbilitiesNotTraced[gBattleMons[target1].ability] && gBattleMons[target1].hp != 0
&& !sAbilitiesNotTraced[gBattleMons[target2].ability] && gBattleMons[target2].hp != 0)
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
gActiveBattler = GetBattlerAtPosition(((Random() & 1) * 2) | side), effect++;
Added non-traceable abilities. (#275) * Added non-traceable abilities. * Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
else if (!sAbilitiesNotTraced[gBattleMons[target1].ability] && gBattleMons[target1].hp != 0)
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
gActiveBattler = target1, effect++;
Added non-traceable abilities. (#275) * Added non-traceable abilities. * Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
else if (!sAbilitiesNotTraced[gBattleMons[target2].ability] && gBattleMons[target2].hp != 0)
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
gActiveBattler = target2, effect++;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
else
finish porting cam's port
2017-09-17 15:19:15 +02:00
{
Added non-traceable abilities. (#275) * Added non-traceable abilities. * Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
if (!sAbilitiesNotTraced[gBattleMons[target1].ability] && gBattleMons[target1].hp != 0)
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
gActiveBattler = target1, effect++;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
if (effect)
{
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
if (caseID == ABILITYEFFECT_TRACE1)
{
BattleScriptPushCursorAndCallback(BattleScript_TraceActivatesEnd3);
}
else
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TraceActivates;
}
Free up two status3 flags
2019-02-25 16:17:23 +01:00
gBattleResources->flags->flags[i] &= ~(RESOURCE_FLAG_TRACED);
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
gBattleStruct->tracedAbility[i] = gLastUsedAbility = gBattleMons[gActiveBattler].ability;
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
battler = gBattlerAbility = gBattleScripting.battler = i;
ABE is matching
2017-10-12 17:49:24 +02:00
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlerPartyIndexes[gActiveBattler])
PREPARE_ABILITY_BUFFER(gBattleTextBuff2, gLastUsedAbility)
finish porting cam's port
2017-09-17 15:19:15 +02:00
break;
}
}
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
}
break;
start ability
2021-10-30 04:32:19 +02:00
case ABILITYEFFECT_NEUTRALIZINGGAS:
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
// Prints message only. separate from ABILITYEFFECT_ON_SWITCHIN bc activates before entry hazards
start ability
2021-10-30 04:32:19 +02:00
for (i = 0; i < gBattlersCount; i++)
{
if (gBattleMons[i].ability == ABILITY_NEUTRALIZING_GAS && !(gBattleResources->flags->flags[i] & RESOURCE_FLAG_NEUTRALIZING_GAS))
{
gBattleResources->flags->flags[i] |= RESOURCE_FLAG_NEUTRALIZING_GAS;
gBattlerAbility = i;
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_NEUTRALIZING_GAS;
BattleScriptPushCursorAndCallback(BattleScript_SwitchInAbilityMsg);
effect++;
}
fix ABILITYEFFECT_NEUTRALIZINGGAS
2021-11-01 20:10:51 +01:00
if (effect)
break;
start ability
2021-10-30 04:32:19 +02:00
}
break;
finish porting cam's port
2017-09-17 15:19:15 +02:00
}
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
if (effect && gLastUsedAbility != 0xFF)
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
RecordAbilityBattle(battler, gLastUsedAbility);
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
if (effect && caseID <= ABILITYEFFECT_MOVE_END)
gBattlerAbility = battler;
A couple of gen4 abilities
2018-07-22 18:40:18 +02:00
finish porting cam's port
2017-09-17 15:19:15 +02:00
return effect;
}
decompile battle 3
2017-09-17 17:14:32 +02:00
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
bool32 IsNeutralizingGasBannedAbility(u32 ability)
start ability
2021-10-30 04:32:19 +02:00
{
switch (ability)
{
case ABILITY_MULTITYPE:
case ABILITY_ZEN_MODE:
case ABILITY_STANCE_CHANGE:
case ABILITY_POWER_CONSTRUCT:
case ABILITY_SCHOOLING:
case ABILITY_RKS_SYSTEM:
case ABILITY_SHIELDS_DOWN:
case ABILITY_COMATOSE:
case ABILITY_DISGUISE:
case ABILITY_GULP_MISSILE:
case ABILITY_ICE_FACE:
case ABILITY_AS_ONE_ICE_RIDER:
case ABILITY_AS_ONE_SHADOW_RIDER:
return TRUE;
default:
return FALSE;
}
}
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
bool32 IsNeutralizingGasOnField(void)
start ability
2021-10-30 04:32:19 +02:00
{
u32 i;
for (i = 0; i < gBattlersCount; i++)
{
handle simple beam, gastro acid
2021-11-01 18:50:57 +01:00
if (IsBattlerAlive(i) && gBattleMons[i].ability == ABILITY_NEUTRALIZING_GAS && !(gStatuses3[i] & STATUS3_GASTRO_ACID))
start ability
2021-10-30 04:32:19 +02:00
return TRUE;
}
return FALSE;
}
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
u32 GetBattlerAbility(u8 battlerId)
{
if (gStatuses3[battlerId] & STATUS3_GASTRO_ACID)
return ABILITY_NONE;
start ability
2021-10-30 04:32:19 +02:00
if (IsNeutralizingGasOnField() && !IsNeutralizingGasBannedAbility(gBattleMons[battlerId].ability))
return ABILITY_NONE;
if ((((gBattleMons[gBattlerAttacker].ability == ABILITY_MOLD_BREAKER
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
|| gBattleMons[gBattlerAttacker].ability == ABILITY_TERAVOLT
|| gBattleMons[gBattlerAttacker].ability == ABILITY_TURBOBLAZE)
Ability-ignoring moves Just Moongeist Meme and Sunsteel Strike for now. Added a special flag and modified "GetBattlerAbility" to check the current move for it.
2019-04-07 14:03:40 +02:00
&& !(gStatuses3[gBattlerAttacker] & STATUS3_GASTRO_ACID))
|| gBattleMoves[gCurrentMove].flags & FLAG_TARGET_ABILITY_IGNORED)
&& sAbilitiesAffectedByMoldBreaker[gBattleMons[battlerId].ability]
&& gBattlerByTurnOrder[gCurrentTurnActionNumber] == gBattlerAttacker
&& gActionsByTurnOrder[gBattlerByTurnOrder[gBattlerAttacker]] == B_ACTION_USE_MOVE
&& gCurrentTurnActionNumber < gBattlersCount)
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
return ABILITY_NONE;
start ability
2021-10-30 04:32:19 +02:00
return gBattleMons[battlerId].ability;
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
}
u32 IsAbilityOnSide(u32 battlerId, u32 ability)
{
if (IsBattlerAlive(battlerId) && GetBattlerAbility(battlerId) == ability)
return battlerId + 1;
else if (IsBattlerAlive(BATTLE_PARTNER(battlerId)) && GetBattlerAbility(BATTLE_PARTNER(battlerId)) == ability)
return BATTLE_PARTNER(battlerId) + 1;
else
return 0;
}
u32 IsAbilityOnOpposingSide(u32 battlerId, u32 ability)
{
return IsAbilityOnSide(BATTLE_OPPOSITE(battlerId), ability);
}
u32 IsAbilityOnField(u32 ability)
{
u32 i;
for (i = 0; i < gBattlersCount; i++)
{
if (IsBattlerAlive(i) && GetBattlerAbility(i) == ability)
return i + 1;
}
return 0;
}
u32 IsAbilityOnFieldExcept(u32 battlerId, u32 ability)
{
u32 i;
for (i = 0; i < gBattlersCount; i++)
{
if (i != battlerId && IsBattlerAlive(i) && GetBattlerAbility(i) == ability)
return i + 1;
}
return 0;
}
Fix AI trying to switch when it can't, also ghosts can escape
2020-02-08 14:20:02 +01:00
u32 IsAbilityPreventingEscape(u32 battlerId)
{
u32 id;
Config for Shadow Tag vs Shadow Tag
2021-10-03 00:01:11 +02:00
#if B_GHOSTS_ESCAPE >= GEN_6
if (IS_BATTLER_OF_TYPE(battlerId, TYPE_GHOST))
return 0;
#endif
#if B_SHADOW_TAG_ESCAPE >= GEN_4
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
if ((id = IsAbilityOnOpposingSide(battlerId, ABILITY_SHADOW_TAG)) && GetBattlerAbility(battlerId) != ABILITY_SHADOW_TAG)
Config for Shadow Tag vs Shadow Tag
2021-10-03 00:01:11 +02:00
#else
if (id = IsAbilityOnOpposingSide(battlerId, ABILITY_SHADOW_TAG))
#endif
Fix AI trying to switch when it can't, also ghosts can escape
2020-02-08 14:20:02 +01:00
return id;
if ((id = IsAbilityOnOpposingSide(battlerId, ABILITY_ARENA_TRAP)) && IsBattlerGrounded(battlerId))
return id;
if ((id = IsAbilityOnOpposingSide(battlerId, ABILITY_MAGNET_PULL)) && IS_BATTLER_OF_TYPE(battlerId, TYPE_STEEL))
return id;
return 0;
}
Shed Shell
2020-04-28 11:14:20 +02:00
bool32 CanBattlerEscape(u32 battlerId) // no ability check
{
fix ghost types unable to escape from mean look/trap
2021-02-07 20:05:55 +01:00
if (GetBattlerHoldEffect(battlerId, TRUE) == HOLD_EFFECT_SHED_SHELL)
return TRUE;
else if ((B_GHOSTS_ESCAPE >= GEN_6 && !IS_BATTLER_OF_TYPE(battlerId, TYPE_GHOST)) && gBattleMons[battlerId].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED))
return FALSE;
else if (gStatuses3[battlerId] & STATUS3_ROOTED)
return FALSE;
else if (gFieldStatuses & STATUS_FIELD_FAIRY_LOCK)
return FALSE;
else
return TRUE;
Shed Shell
2020-04-28 11:14:20 +02:00
}
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
void BattleScriptExecute(const u8 *BS_ptr)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
gBattlescriptCurrInstr = BS_ptr;
more renaming
2018-02-06 23:09:39 +01:00
gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size++] = gBattleMainFunc;
battle2 more and more and more
2017-10-06 00:12:01 +02:00
gBattleMainFunc = RunBattleScriptCommands_PopCallbacksStack;
gCurrentActionFuncId = 0;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
fix, rename, label battle labels and battlescripts
2017-11-26 13:26:58 +01:00
void BattleScriptPushCursorAndCallback(const u8 *BS_ptr)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BS_ptr;
more renaming
2018-02-06 23:09:39 +01:00
gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size++] = gBattleMainFunc;
battle2 more and more and more
2017-10-06 00:12:01 +02:00
gBattleMainFunc = RunBattleScriptCommands;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
enum
{
ITEM_NO_EFFECT, // 0
ITEM_STATUS_CHANGE, // 1
ITEM_EFFECT_OTHER, // 2
ITEM_PP_CHANGE, // 3
ITEM_HP_CHANGE, // 4
ITEM_STATS_CHANGE, // 5
};
handle battler being affected by terrain
2021-01-16 20:05:51 +01:00
bool32 IsBattlerTerrainAffected(u8 battlerId, u32 terrainFlag)
{
if (!(gFieldStatuses & terrainFlag))
return FALSE;
else if (gStatuses3[battlerId] & STATUS3_SEMI_INVULNERABLE)
return FALSE;
return IsBattlerGrounded(battlerId);
}
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
bool32 CanSleep(u8 battlerId)
{
u16 ability = GetBattlerAbility(battlerId);
if (ability == ABILITY_INSOMNIA
|| ability == ABILITY_VITAL_SPIRIT
|| ability == ABILITY_COMATOSE
add safeguard checks
2021-01-16 19:47:29 +01:00
|| gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_SAFEGUARD
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
|| gBattleMons[battlerId].status1 & STATUS1_ANY
|| IsAbilityOnSide(battlerId, ABILITY_SWEET_VEIL)
|| IsAbilityStatusProtected(battlerId)
handle battler being affected by terrain
2021-01-16 20:05:51 +01:00
|| IsBattlerTerrainAffected(battlerId, STATUS_FIELD_ELECTRIC_TERRAIN | STATUS_FIELD_MISTY_TERRAIN))
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
return FALSE;
return TRUE;
}
Fix Corrosion, Poison Touch - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 10:12:18 +02:00
bool32 CanBePoisoned(u8 battlerAttacker, u8 battlerTarget)
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
{
Fix Corrosion, Poison Touch - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 10:12:18 +02:00
u16 ability = GetBattlerAbility(battlerTarget);
if (!(CanPoisonType(battlerAttacker, battlerTarget))
|| gSideStatuses[GetBattlerSide(battlerTarget)] & SIDE_STATUS_SAFEGUARD
|| gBattleMons[battlerTarget].status1 & STATUS1_ANY
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
|| ability == ABILITY_IMMUNITY
|| ability == ABILITY_COMATOSE
Fix Corrosion, Poison Touch - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 10:12:18 +02:00
|| IsAbilityOnSide(battlerTarget, ABILITY_PASTEL_VEIL)
|| gBattleMons[battlerTarget].status1 & STATUS1_ANY
|| IsAbilityStatusProtected(battlerTarget)
|| IsBattlerTerrainAffected(battlerTarget, STATUS_FIELD_MISTY_TERRAIN))
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
return FALSE;
return TRUE;
}
bool32 CanBeBurned(u8 battlerId)
{
u16 ability = GetBattlerAbility(battlerId);
if (IS_BATTLER_OF_TYPE(battlerId, TYPE_FIRE)
add safeguard checks
2021-01-16 19:47:29 +01:00
|| gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_SAFEGUARD
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
|| gBattleMons[battlerId].status1 & STATUS1_ANY
|| ability == ABILITY_WATER_VEIL
merge with be
2021-09-15 22:42:23 +02:00
|| ability == ABILITY_WATER_BUBBLE
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
|| ability == ABILITY_COMATOSE
|| IsAbilityStatusProtected(battlerId)
handle battler being affected by terrain
2021-01-16 20:05:51 +01:00
|| IsBattlerTerrainAffected(battlerId, STATUS_FIELD_MISTY_TERRAIN))
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
return FALSE;
return TRUE;
}
bool32 CanBeParalyzed(u8 battlerId)
{
u16 ability = GetBattlerAbility(battlerId);
if ((B_PARALYZE_ELECTRIC >= GEN_6 && IS_BATTLER_OF_TYPE(battlerId, TYPE_ELECTRIC))
add safeguard checks
2021-01-16 19:47:29 +01:00
|| gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_SAFEGUARD
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
|| ability == ABILITY_LIMBER
|| ability == ABILITY_COMATOSE
|| gBattleMons[battlerId].status1 & STATUS1_ANY
|| IsAbilityStatusProtected(battlerId)
handle battler being affected by terrain
2021-01-16 20:05:51 +01:00
|| IsBattlerTerrainAffected(battlerId, STATUS_FIELD_MISTY_TERRAIN))
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
return FALSE;
return TRUE;
}
bool32 CanBeFrozen(u8 battlerId)
{
u16 ability = GetBattlerAbility(battlerId);
if (IS_BATTLER_OF_TYPE(battlerId, TYPE_ICE)
merge with be
2021-10-06 19:32:59 +02:00
|| IsBattlerWeatherAffected(battlerId, WEATHER_SUN_ANY)
add safeguard checks
2021-01-16 19:47:29 +01:00
|| gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_SAFEGUARD
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
|| ability == ABILITY_MAGMA_ARMOR
|| ability == ABILITY_COMATOSE
|| gBattleMons[battlerId].status1 & STATUS1_ANY
|| IsAbilityStatusProtected(battlerId)
handle battler being affected by terrain
2021-01-16 20:05:51 +01:00
|| IsBattlerTerrainAffected(battlerId, STATUS_FIELD_MISTY_TERRAIN))
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
return FALSE;
return TRUE;
}
misty terrain blocks confusion
2021-01-16 20:21:04 +01:00
bool32 CanBeConfused(u8 battlerId)
{
if (GetBattlerAbility(gEffectBattler) == ABILITY_OWN_TEMPO
|| gBattleMons[gEffectBattler].status2 & STATUS2_CONFUSION
|| IsBattlerTerrainAffected(battlerId, STATUS_FIELD_MISTY_TERRAIN))
return FALSE;
return TRUE;
}
Add Gluttony
2018-07-28 16:33:01 +02:00
// second argument is 1/X of current hp compared to max hp
custap berry effect, custap/quick claw activation message
2021-01-06 17:37:31 +01:00
bool32 HasEnoughHpToEatBerry(u32 battlerId, u32 hpFraction, u32 itemId)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Unnerve
2020-07-16 14:17:38 +02:00
bool32 isBerry = (ItemId_GetPocket(itemId) == POCKET_BERRIES);
decompile battle 3
2017-09-17 17:14:32 +02:00
oran berry doesnt activate when mons is kill
2020-07-08 17:22:10 +02:00
if (gBattleMons[battlerId].hp == 0)
return FALSE;
add bug bite
2021-07-25 22:55:52 +02:00
if (gBattleScripting.overrideBerryRequirements)
return TRUE;
Unnerve
2020-07-16 14:17:38 +02:00
// Unnerve prevents consumption of opponents' berries.
add neigh and as one abilities
2021-01-06 03:37:23 +01:00
if (isBerry && IsUnnerveAbilityOnOpposingSide(battlerId))
Unnerve
2020-07-16 14:17:38 +02:00
return FALSE;
Add Gluttony
2018-07-28 16:33:01 +02:00
if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / hpFraction)
return TRUE;
oran berry doesnt activate when mons is kill
2020-07-08 17:22:10 +02:00
Unnerve
2020-07-16 14:17:38 +02:00
if (hpFraction <= 4 && GetBattlerAbility(battlerId) == ABILITY_GLUTTONY && isBerry
oran berry doesnt activate when mons is kill
2020-07-08 17:22:10 +02:00
&& gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Add Gluttony
2018-07-28 16:33:01 +02:00
RecordAbilityBattle(battlerId, ABILITY_GLUTTONY);
return TRUE;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
return FALSE;
}
stat raising berries
2021-01-06 06:13:32 +01:00
static u8 HealConfuseBerry(u32 battlerId, u32 itemId, u8 flavorId, bool32 end2)
berries work like in gen4
2020-06-29 18:04:13 +02:00
{
if (HasEnoughHpToEatBerry(battlerId, 2, itemId))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
berries work like in gen4
2020-06-29 18:04:13 +02:00
PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, flavorId);
gBattleMoveDamage = gBattleMons[battlerId].maxHP / GetBattlerHoldEffectParam(battlerId);
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
gBattleMoveDamage *= -1;
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
stat raising berries
2021-01-06 06:13:32 +01:00
if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
{
gBattleMoveDamage *= 2;
gBattlerAbility = battlerId;
}
Fix infinite loop
2021-10-10 13:46:31 +02:00
gBattleScripting.battler = battlerId;
stat raising berries
2021-01-06 06:13:32 +01:00
if (end2)
{
if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, flavorId) < 0)
BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
else
BattleScriptExecute(BattleScript_ItemHealHP_RemoveItemEnd2);
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
else
stat raising berries
2021-01-06 06:13:32 +01:00
{
BattleScriptPushCursor();
if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, flavorId) < 0)
gBattlescriptCurrInstr = BattleScript_BerryConfuseHealRet;
else
gBattlescriptCurrInstr = BattleScript_ItemHealHP_RemoveItemRet;
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
return ITEM_HP_CHANGE;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
return 0;
}
stat raising berries
2021-01-06 06:13:32 +01:00
static u8 StatRaiseBerry(u32 battlerId, u32 itemId, u32 statId, bool32 end2)
berries work like in gen4
2020-06-29 18:04:13 +02:00
{
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (CompareStat(battlerId, statId, MAX_STAT_STAGE, CMP_LESS_THAN) && HasEnoughHpToEatBerry(battlerId, GetBattlerHoldEffectParam(battlerId), itemId))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
replace some BufferStatChange, fix room service and terrain seeds
2021-09-14 21:07:15 +02:00
BufferStatChange(battlerId, statId, STRINGID_STATROSE);
berries work like in gen4
2020-06-29 18:04:13 +02:00
gEffectBattler = battlerId;
stat raising berries
2021-01-06 06:13:32 +01:00
if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
SET_STATCHANGER(statId, 2, FALSE);
else
SET_STATCHANGER(statId, 1, FALSE);
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleScripting.animArg1 = 14 + statId;
berries work like in gen4
2020-06-29 18:04:13 +02:00
gBattleScripting.animArg2 = 0;
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
stat raising berries
2021-01-06 06:13:32 +01:00
if (end2)
{
BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
}
else
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_BerryStatRaiseRet;
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
return ITEM_STATS_CHANGE;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
return 0;
}
stat raising berries
2021-01-06 06:13:32 +01:00
static u8 RandomStatRaiseBerry(u32 battlerId, u32 itemId, bool32 end2)
berries work like in gen4
2020-06-29 18:04:13 +02:00
{
s32 i;
replace some BufferStatChange, fix room service and terrain seeds
2021-09-14 21:07:15 +02:00
u16 stringId;
decompile battle 3
2017-09-17 17:14:32 +02:00
berries work like in gen4
2020-06-29 18:04:13 +02:00
for (i = 0; i < 5; i++)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (CompareStat(battlerId, STAT_ATK + i, MAX_STAT_STAGE, CMP_LESS_THAN))
berries work like in gen4
2020-06-29 18:04:13 +02:00
break;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (i != 5 && HasEnoughHpToEatBerry(battlerId, GetBattlerHoldEffectParam(battlerId), itemId))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
berries work like in gen4
2020-06-29 18:04:13 +02:00
do
{
i = Random() % 5;
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
} while (!CompareStat(battlerId, STAT_ATK + i, MAX_STAT_STAGE, CMP_LESS_THAN));
berries work like in gen4
2020-06-29 18:04:13 +02:00
PREPARE_STAT_BUFFER(gBattleTextBuff1, i + 1);
replace some BufferStatChange, fix room service and terrain seeds
2021-09-14 21:07:15 +02:00
stringId = (GetBattlerAbility(battlerId) == ABILITY_CONTRARY) ? STRINGID_STATFELL : STRINGID_STATROSE;
berries work like in gen4
2020-06-29 18:04:13 +02:00
gBattleTextBuff2[0] = B_BUFF_PLACEHOLDER_BEGIN;
gBattleTextBuff2[1] = B_BUFF_STRING;
gBattleTextBuff2[2] = STRINGID_STATSHARPLY;
gBattleTextBuff2[3] = STRINGID_STATSHARPLY >> 8;
gBattleTextBuff2[4] = B_BUFF_STRING;
replace some BufferStatChange, fix room service and terrain seeds
2021-09-14 21:07:15 +02:00
gBattleTextBuff2[5] = stringId;
gBattleTextBuff2[6] = stringId >> 8;
berries work like in gen4
2020-06-29 18:04:13 +02:00
gBattleTextBuff2[7] = EOS;
gEffectBattler = battlerId;
stat raising berries
2021-01-06 06:13:32 +01:00
if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
SET_STATCHANGER(i + 1, 4, FALSE);
else
SET_STATCHANGER(i + 1, 2, FALSE);
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
berries work like in gen4
2020-06-29 18:04:13 +02:00
gBattleScripting.animArg1 = 0x21 + i + 6;
gBattleScripting.animArg2 = 0;
stat raising berries
2021-01-06 06:13:32 +01:00
if (end2)
{
BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
}
else
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_BerryStatRaiseRet;
}
format fixes
2021-09-16 23:10:41 +02:00
berries work like in gen4
2020-06-29 18:04:13 +02:00
return ITEM_STATS_CHANGE;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
return 0;
Add Gluttony
2018-07-28 16:33:01 +02:00
}
decompile battle 3
2017-09-17 17:14:32 +02:00
micle berry
2021-01-06 18:47:07 +01:00
static u8 TrySetMicleBerry(u32 battlerId, u32 itemId, bool32 end2)
{
if (HasEnoughHpToEatBerry(battlerId, 4, itemId))
{
Better names for Micle and Custap flags
2021-09-23 04:29:26 +02:00
gProtectStructs[battlerId].usedMicleBerry = TRUE; // battler's next attack has increased accuracy
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
micle berry
2021-01-06 18:47:07 +01:00
if (end2)
{
BattleScriptExecute(BattleScript_MicleBerryActivateEnd2);
}
else
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_MicleBerryActivateRet;
}
return ITEM_EFFECT_OTHER;
}
return 0;
}
kee, maranga, sitrus beries
2021-01-06 21:07:18 +01:00
static u8 DamagedStatBoostBerryEffect(u8 battlerId, u8 statId, u8 split)
{
if (IsBattlerAlive(battlerId)
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 17:14:14 +01:00
&& TARGET_TURN_DAMAGED
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(battlerId, statId, MAX_STAT_STAGE, CMP_LESS_THAN)
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 17:14:14 +01:00
&& !DoesSubstituteBlockMove(gBattlerAttacker, battlerId, gCurrentMove)
&& GetBattleMoveSplit(gCurrentMove) == split)
kee, maranga, sitrus beries
2021-01-06 21:07:18 +01:00
{
replace some BufferStatChange, fix room service and terrain seeds
2021-09-14 21:07:15 +02:00
BufferStatChange(battlerId, statId, STRINGID_STATROSE);
kee, maranga, sitrus beries
2021-01-06 21:07:18 +01:00
gEffectBattler = battlerId;
if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
SET_STATCHANGER(statId, 2, FALSE);
else
SET_STATCHANGER(statId, 1, FALSE);
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleScripting.animArg1 = 14 + statId;
kee, maranga, sitrus beries
2021-01-06 21:07:18 +01:00
gBattleScripting.animArg2 = 0;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_BerryStatRaiseRet;
berries work like in gen4
2020-06-29 18:04:13 +02:00
return ITEM_STATS_CHANGE;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
return 0;
Add Gluttony
2018-07-28 16:33:01 +02:00
}
decompile battle 3
2017-09-17 17:14:32 +02:00
add terrain seeds
2021-01-07 04:22:05 +01:00
u8 TryHandleSeed(u8 battler, u32 terrainFlag, u8 statId, u16 itemId, bool32 execute)
{
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (gFieldStatuses & terrainFlag && CompareStat(battler, statId, MAX_STAT_STAGE, CMP_LESS_THAN))
add terrain seeds
2021-01-07 04:22:05 +01:00
{
replace some BufferStatChange, fix room service and terrain seeds
2021-09-14 21:07:15 +02:00
BufferStatChange(battler, statId, STRINGID_STATROSE);
merge with be
2021-09-02 21:33:42 +02:00
gLastUsedItem = itemId; // For surge abilities
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
gEffectBattler = gBattleScripting.battler = battler;
add terrain seeds
2021-01-07 04:22:05 +01:00
SET_STATCHANGER(statId, 1, FALSE);
gBattleScripting.animArg1 = 0xE + statId;
gBattleScripting.animArg2 = 0;
if (execute)
{
BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
}
else
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_BerryStatRaiseRet;
}
return ITEM_STATS_CHANGE;
}
return 0;
}
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
static u8 ItemHealHp(u32 battlerId, u32 itemId, bool32 end2, bool32 percentHeal)
{
format fixes, fix healing berries from printing message at full hp
2021-10-14 00:39:24 +02:00
if (HasEnoughHpToEatBerry(battlerId, 2, itemId)
&& !(gBattleScripting.overrideBerryRequirements && gBattleMons[battlerId].hp == gBattleMons[battlerId].maxHP))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
if (percentHeal)
gBattleMoveDamage = (gBattleMons[battlerId].maxHP * GetBattlerHoldEffectParam(battlerId) / 100) * -1;
else
gBattleMoveDamage = GetBattlerHoldEffectParam(battlerId) * -1;
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
ripen & hp restoring berries
2021-01-06 05:15:21 +01:00
// check ripen
if (ItemId_GetPocket(itemId) == POCKET_BERRIES && GetBattlerAbility(battlerId) == ABILITY_RIPEN)
gBattleMoveDamage *= 2;
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
ripen & hp restoring berries
2021-01-06 05:15:21 +01:00
gBattlerAbility = battlerId; // in SWSH, berry juice shows ability pop up but has no effect. This is mimicked here
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
if (end2)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
BattleScriptExecute(BattleScript_ItemHealHP_RemoveItemEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
}
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
else
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_ItemHealHP_RemoveItemRet;
}
return ITEM_HP_CHANGE;
}
return 0;
}
decompile battle 3
2017-09-17 17:14:32 +02:00
Unnerve
2020-07-16 14:17:38 +02:00
static bool32 UnnerveOn(u32 battlerId, u32 itemId)
{
add neigh and as one abilities
2021-01-06 03:37:23 +01:00
if (ItemId_GetPocket(itemId) == POCKET_BERRIES && IsUnnerveAbilityOnOpposingSide(battlerId))
Unnerve
2020-07-16 14:17:38 +02:00
return TRUE;
return FALSE;
}
clear battle code and battlescripts
2017-11-26 11:55:17 +01:00
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
static bool32 GetMentalHerbEffect(u8 battlerId)
{
bool32 ret = FALSE;
fix mental herb encore, heal block
2021-09-04 14:40:43 +02:00
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-29 16:02:21 +02:00
// Check infatuation
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION)
{
gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION);
update multistring chooser labels in GetMentalHerbEffect
2021-09-15 20:51:24 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_MENTALHERBCURE_INFATUATION; // STRINGID_TARGETGOTOVERINFATUATION
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
ret = TRUE;
}
add config option
2021-01-16 02:28:10 +01:00
#if B_MENTAL_HERB >= GEN_5
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-29 16:02:41 +02:00
// Check taunt
fix mental herb encore, heal block
2021-09-04 14:40:43 +02:00
if (gDisableStructs[battlerId].tauntTimer != 0)
add config option
2021-01-16 02:28:10 +01:00
{
fix mental herb encore, heal block
2021-09-04 14:40:43 +02:00
gDisableStructs[battlerId].tauntTimer = gDisableStructs[battlerId].tauntTimer2 = 0;
update multistring chooser labels in GetMentalHerbEffect
2021-09-15 20:51:24 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_MENTALHERBCURE_TAUNT;
add config option
2021-01-16 02:28:10 +01:00
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_TAUNT);
ret = TRUE;
}
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-29 16:02:51 +02:00
// Check encore
fix mental herb encore, heal block
2021-09-04 14:40:43 +02:00
if (gDisableStructs[battlerId].encoreTimer != 0)
add config option
2021-01-16 02:28:10 +01:00
{
fix mental herb encore, heal block
2021-09-04 14:40:43 +02:00
gDisableStructs[battlerId].encoredMove = 0;
gDisableStructs[battlerId].encoreTimerStartValue = gDisableStructs[battlerId].encoreTimer = 0;
update multistring chooser labels in GetMentalHerbEffect
2021-09-15 20:51:24 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_MENTALHERBCURE_ENCORE; // STRINGID_PKMNENCOREENDED
add config option
2021-01-16 02:28:10 +01:00
ret = TRUE;
}
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-29 16:02:56 +02:00
// Check torment
add config option
2021-01-16 02:28:10 +01:00
if (gBattleMons[battlerId].status2 & STATUS2_TORMENT)
{
gBattleMons[battlerId].status2 &= ~(STATUS2_TORMENT);
update multistring chooser labels in GetMentalHerbEffect
2021-09-15 20:51:24 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_MENTALHERBCURE_TORMENT;
add config option
2021-01-16 02:28:10 +01:00
ret = TRUE;
}
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-29 16:03:00 +02:00
// Check heal block
add config option
2021-01-16 02:28:10 +01:00
if (gStatuses3[battlerId] & STATUS3_HEAL_BLOCK)
{
mental herb fixes
2021-09-15 18:56:58 +02:00
gStatuses3[battlerId] &= ~(STATUS3_HEAL_BLOCK);
update multistring chooser labels in GetMentalHerbEffect
2021-09-15 20:51:24 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_MENTALHERBCURE_HEALBLOCK;
add config option
2021-01-16 02:28:10 +01:00
ret = TRUE;
}
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-29 16:03:05 +02:00
// Check disable
fix mental herb encore, heal block
2021-09-04 14:40:43 +02:00
if (gDisableStructs[battlerId].disableTimer != 0)
add config option
2021-01-16 02:28:10 +01:00
{
fix mental herb encore, heal block
2021-09-04 14:40:43 +02:00
gDisableStructs[battlerId].disableTimer = gDisableStructs[battlerId].disableTimerStartValue = 0;
gDisableStructs[battlerId].disabledMove = 0;
update multistring chooser labels in GetMentalHerbEffect
2021-09-15 20:51:24 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_MENTALHERBCURE_DISABLE;
add config option
2021-01-16 02:28:10 +01:00
ret = TRUE;
}
#endif
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
return ret;
}
Add Gluttony
2018-07-28 16:33:01 +02:00
u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
{
Various battle target items
2019-05-09 20:31:58 +02:00
int i = 0, moveType;
Add Gluttony
2018-07-28 16:33:01 +02:00
u8 effect = ITEM_NO_EFFECT;
u8 changedPP = 0;
u8 battlerHoldEffect, atkHoldEffect;
berries work like in gen4
2020-06-29 18:04:13 +02:00
u8 atkHoldEffectParam;
Add Gluttony
2018-07-28 16:33:01 +02:00
u16 atkItem;
clear battle code and battlescripts
2017-11-26 11:55:17 +01:00
Add Gluttony
2018-07-28 16:33:01 +02:00
gLastUsedItem = gBattleMons[battlerId].item;
battlerHoldEffect = GetBattlerHoldEffect(battlerId, TRUE);
atkItem = gBattleMons[gBattlerAttacker].item;
atkHoldEffect = GetBattlerHoldEffect(gBattlerAttacker, TRUE);
atkHoldEffectParam = GetBattlerHoldEffectParam(gBattlerAttacker);
decompile battle 3
2017-09-17 17:14:32 +02:00
switch (caseID)
{
battle2 more and more and more
2017-10-06 00:12:01 +02:00
case ITEMEFFECT_ON_SWITCH_IN:
Fix Air Baloon msg
2019-05-20 12:20:49 +02:00
if (!gSpecialStatuses[battlerId].switchInItemDone)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Fix Air Baloon msg
2019-05-20 12:20:49 +02:00
switch (battlerHoldEffect)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Fix Air Baloon msg
2019-05-20 12:20:49 +02:00
case HOLD_EFFECT_DOUBLE_PRIZE:
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
2021-09-02 06:15:58 +02:00
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER && !gBattleStruct->moneyMultiplierItem)
Add brackets Oops!
2021-09-06 10:56:02 +02:00
{
Fix Air Baloon msg
2019-05-20 12:20:49 +02:00
gBattleStruct->moneyMultiplier *= 2;
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
2021-09-02 06:15:58 +02:00
gBattleStruct->moneyMultiplierItem = 1;
Add brackets Oops!
2021-09-06 10:56:02 +02:00
}
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_RESTORE_STATS:
Party Size and Num Stats
2018-11-18 20:00:36 +01:00
for (i = 0; i < NUM_BATTLE_STATS; i++)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Add stat stage constants
2020-08-05 02:33:05 +02:00
if (gBattleMons[battlerId].statStages[i] < DEFAULT_STAT_STAGE)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Add stat stage constants
2020-08-05 02:33:05 +02:00
gBattleMons[battlerId].statStages[i] = DEFAULT_STAT_STAGE;
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATS_CHANGE;
}
}
if (effect)
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleScripting.battler = battlerId;
more battle labels
2018-02-08 12:13:29 +01:00
gPotentialItemEffectBattler = battlerId;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gActiveBattler = gBattlerAttacker = battlerId;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_WhiteHerbEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
}
break;
case HOLD_EFFECT_CONFUSE_SPICY:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SPICY, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CONFUSE_DRY:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_DRY, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CONFUSE_SWEET:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SWEET, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CONFUSE_BITTER:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_BITTER, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CONFUSE_SOUR:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SOUR, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_ATTACK_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_ATK, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_DEFENSE_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_DEF, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_SPEED_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPEED, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_SP_ATTACK_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPATK, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_SP_DEFENSE_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPDEF, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CRITICAL_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4 && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY) && HasEnoughHpToEatBerry(battlerId, GetBattlerHoldEffectParam(battlerId), gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_EFFECT_OTHER;
}
break;
case HOLD_EFFECT_RANDOM_STAT_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = RandomStatRaiseBerry(battlerId, gLastUsedItem, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CURE_PAR:
Unnerve
2020-07-16 14:17:38 +02:00
if (B_BERRIES_INSTANT >= GEN_4 && gBattleMons[battlerId].status1 & STATUS1_PARALYSIS && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_PARALYSIS);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCurePrlzEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_PSN:
Unnerve
2020-07-16 14:17:38 +02:00
if (B_BERRIES_INSTANT >= GEN_4 && gBattleMons[battlerId].status1 & STATUS1_PSN_ANY && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCurePsnEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_BRN:
Unnerve
2020-07-16 14:17:38 +02:00
if (B_BERRIES_INSTANT >= GEN_4 && gBattleMons[battlerId].status1 & STATUS1_BURN && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_BURN);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureBrnEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_FRZ:
Unnerve
2020-07-16 14:17:38 +02:00
if (B_BERRIES_INSTANT >= GEN_4 && gBattleMons[battlerId].status1 & STATUS1_FREEZE && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_FREEZE);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureFrzEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_SLP:
Unnerve
2020-07-16 14:17:38 +02:00
if (B_BERRIES_INSTANT >= GEN_4 && gBattleMons[battlerId].status1 & STATUS1_SLEEP && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureSlpEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_STATUS:
Unnerve
2020-07-16 14:17:38 +02:00
if (B_BERRIES_INSTANT >= GEN_4 && (gBattleMons[battlerId].status1 & STATUS1_ANY || gBattleMons[battlerId].status2 & STATUS2_CONFUSION) && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
i = 0;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
decompile battle 3
2017-09-17 17:14:32 +02:00
StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_BURN)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_FREEZE)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
i++;
}
if (!(i > 1))
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CURED_PROBLEM;
decompile battle 3
2017-09-17 17:14:32 +02:00
else
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_NORMALIZED_STATUS;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 = 0;
gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
berries work like in gen4
2020-06-29 18:04:13 +02:00
case HOLD_EFFECT_RESTORE_HP:
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
if (B_BERRIES_INSTANT >= GEN_4)
effect = ItemHealHp(battlerId, gLastUsedItem, TRUE, FALSE);
break;
case HOLD_EFFECT_RESTORE_PCT_HP:
if (B_BERRIES_INSTANT >= GEN_4)
effect = ItemHealHp(battlerId, gLastUsedItem, TRUE, TRUE);
berries work like in gen4
2020-06-29 18:04:13 +02:00
break;
Fix Air Baloon msg
2019-05-20 12:20:49 +02:00
case HOLD_EFFECT_AIR_BALLOON:
effect = ITEM_EFFECT_OTHER;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleScripting.battler = battlerId;
Fix Air Baloon msg
2019-05-20 12:20:49 +02:00
BattleScriptPushCursorAndCallback(BattleScript_AirBaloonMsgIn);
RecordItemEffectBattle(battlerId, HOLD_EFFECT_AIR_BALLOON);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
add room service
2021-01-07 02:00:14 +01:00
case HOLD_EFFECT_ROOM_SERVICE:
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
if (TryRoomService(battlerId))
add room service
2021-01-07 02:00:14 +01:00
{
BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
effect = ITEM_STATS_CHANGE;
}
fix room service switching in effect
2021-09-03 17:16:16 +02:00
break;
add terrain seeds
2021-01-07 04:22:05 +01:00
case HOLD_EFFECT_SEEDS:
switch (GetBattlerHoldEffectParam(battlerId))
{
case HOLD_EFFECT_PARAM_ELECTRIC_TERRAIN:
effect = TryHandleSeed(battlerId, STATUS_FIELD_ELECTRIC_TERRAIN, STAT_DEF, gLastUsedItem, TRUE);
break;
case HOLD_EFFECT_PARAM_GRASSY_TERRAIN:
effect = TryHandleSeed(battlerId, STATUS_FIELD_GRASSY_TERRAIN, STAT_DEF, gLastUsedItem, TRUE);
break;
case HOLD_EFFECT_PARAM_MISTY_TERRAIN:
effect = TryHandleSeed(battlerId, STATUS_FIELD_MISTY_TERRAIN, STAT_SPDEF, gLastUsedItem, TRUE);
break;
case HOLD_EFFECT_PARAM_PSYCHIC_TERRAIN:
effect = TryHandleSeed(battlerId, STATUS_FIELD_PSYCHIC_TERRAIN, STAT_SPDEF, gLastUsedItem, TRUE);
break;
}
add room service
2021-01-07 02:00:14 +01:00
break;
eject pack
2021-01-08 05:11:56 +01:00
case HOLD_EFFECT_EJECT_PACK:
fix lash out stat fell
2021-09-23 03:15:02 +02:00
if (gProtectStructs[battlerId].statFell
fix eject pack weak armor special case
2021-09-23 03:51:37 +02:00
&& gProtectStructs[battlerId].disableEjectPack == 0
fix eject pack
2021-09-14 21:38:16 +02:00
&& !(gCurrentMove == MOVE_PARTING_SHOT && CanBattlerSwitch(gBattlerAttacker))) // Does not activate if attacker used Parting Shot and can switch out
eject pack
2021-01-08 05:11:56 +01:00
{
fix lash out stat fell
2021-09-23 03:15:02 +02:00
gProtectStructs[battlerId].statFell = FALSE;
eject pack
2021-01-08 05:11:56 +01:00
gActiveBattler = gBattleScripting.battler = battlerId;
effect = ITEM_STATS_CHANGE;
if (moveTurn)
{
merge with be
2021-09-02 21:33:42 +02:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_EjectPackActivate_Ret;
}
else
{
BattleScriptExecute(BattleScript_EjectPackActivate_End2);
eject pack
2021-01-08 05:11:56 +01:00
}
}
break;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
berries work like in gen4
2020-06-29 18:04:13 +02:00
decompile battle 3
2017-09-17 17:14:32 +02:00
if (effect)
{
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battlerId].switchInItemDone = TRUE;
berries work like in gen4
2020-06-29 18:04:13 +02:00
gActiveBattler = gBattlerAttacker = gPotentialItemEffectBattler = gBattleScripting.battler = battlerId;
decompile battle 3
2017-09-17 17:14:32 +02:00
switch (effect)
{
case ITEM_STATUS_CHANGE:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[battlerId].status1);
more renaming
2018-02-06 20:48:02 +01:00
MarkBattlerForControllerExec(gActiveBattler);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case ITEM_PP_CHANGE:
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[battlerId].mimickedMoves & gBitTable[i]))
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].pp[i] = changedPP;
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
}
}
}
break;
case 1:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].hp)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Battle files - review changes
2018-07-16 20:47:30 +02:00
switch (battlerHoldEffect)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
case HOLD_EFFECT_RESTORE_HP:
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
if (!moveTurn)
effect = ItemHealHp(battlerId, gLastUsedItem, TRUE, FALSE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
case HOLD_EFFECT_RESTORE_PCT_HP:
stat raising berries
2021-01-06 06:13:32 +01:00
if (!moveTurn)
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
effect = ItemHealHp(battlerId, gLastUsedItem, TRUE, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_RESTORE_PP:
if (!moveTurn)
{
clear battle code and battlescripts
2017-11-26 11:55:17 +01:00
struct Pokemon *mon;
decompile battle 3
2017-09-17 17:14:32 +02:00
u8 ppBonuses;
u16 move;
check bad move
2020-12-13 23:02:21 +01:00
mon = GetBattlerPartyData(battlerId);
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
for (i = 0; i < MAX_MON_MOVES; i++)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
clear battle code and battlescripts
2017-11-26 11:55:17 +01:00
move = GetMonData(mon, MON_DATA_MOVE1 + i);
changedPP = GetMonData(mon, MON_DATA_PP1 + i);
ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
decompile battle 3
2017-09-17 17:14:32 +02:00
if (move && changedPP == 0)
break;
}
use max mon moves constant where able (#480) * use max mon moves constant where able * fix errors in script commands file * fix more errors
2018-12-25 18:50:15 +01:00
if (i != MAX_MON_MOVES)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
u8 maxPP = CalculatePPWithBonus(move, ppBonuses, i);
stat raising berries
2021-01-06 06:13:32 +01:00
u8 ppRestored = GetBattlerHoldEffectParam(battlerId);
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
stat raising berries
2021-01-06 06:13:32 +01:00
if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
{
ppRestored *= 2;
gBattlerAbility = battlerId;
}
if (changedPP + ppRestored > maxPP)
decompile battle 3
2017-09-17 17:14:32 +02:00
changedPP = maxPP;
else
stat raising berries
2021-01-06 06:13:32 +01:00
changedPP = changedPP + ppRestored;
clear battle code and battlescripts
2017-11-26 11:55:17 +01:00
PREPARE_MOVE_BUFFER(gBattleTextBuff1, move);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryPPHealEnd2);
more renaming
2018-02-06 20:48:02 +01:00
BtlController_EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
MarkBattlerForControllerExec(gActiveBattler);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_PP_CHANGE;
}
}
break;
case HOLD_EFFECT_RESTORE_STATS:
Party Size and Num Stats
2018-11-18 20:00:36 +01:00
for (i = 0; i < NUM_BATTLE_STATS; i++)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
if (gBattleMons[battlerId].statStages[i] < DEFAULT_STAT_STAGE)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleMons[battlerId].statStages[i] = DEFAULT_STAT_STAGE;
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATS_CHANGE;
}
}
if (effect)
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleScripting.battler = battlerId;
more battle labels
2018-02-08 12:13:29 +01:00
gPotentialItemEffectBattler = battlerId;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gActiveBattler = gBattlerAttacker = battlerId;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_WhiteHerbEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
}
break;
Various battle target items
2019-05-09 20:31:58 +02:00
case HOLD_EFFECT_BLACK_SLUDGE:
if (IS_BATTLER_OF_TYPE(battlerId, TYPE_POISON))
Completed Black Sludge's effect
2021-09-24 11:34:25 +02:00
{
Various battle target items
2019-05-09 20:31:58 +02:00
goto LEFTOVERS;
Completed Black Sludge's effect
2021-09-24 11:34:25 +02:00
}
else if (GetBattlerAbility(battlerId) != ABILITY_MAGIC_GUARD && !moveTurn)
Various battle target items
2019-05-09 20:31:58 +02:00
{
gBattleMoveDamage = gBattleMons[battlerId].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
BattleScriptExecute(BattleScript_ItemHurtEnd2);
effect = ITEM_HP_CHANGE;
RecordItemEffectBattle(battlerId, battlerHoldEffect);
PREPARE_ITEM_BUFFER(gBattleTextBuff1, gLastUsedItem);
}
break;
decompile battle 3
2017-09-17 17:14:32 +02:00
case HOLD_EFFECT_LEFTOVERS:
Various battle target items
2019-05-09 20:31:58 +02:00
LEFTOVERS:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].hp < gBattleMons[battlerId].maxHP && !moveTurn)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMoveDamage = gBattleMons[battlerId].maxHP / 16;
decompile battle 3
2017-09-17 17:14:32 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
gBattleMoveDamage *= -1;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_ItemHealHP_End2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_HP_CHANGE;
Battle files - review changes
2018-07-16 20:47:30 +02:00
RecordItemEffectBattle(battlerId, battlerHoldEffect);
decompile battle 3
2017-09-17 17:14:32 +02:00
}
break;
case HOLD_EFFECT_CONFUSE_SPICY:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SPICY, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CONFUSE_DRY:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_DRY, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CONFUSE_SWEET:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SWEET, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CONFUSE_BITTER:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_BITTER, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CONFUSE_SOUR:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SOUR, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_ATTACK_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_ATK, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_DEFENSE_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_DEF, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_SPEED_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPEED, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_SP_ATTACK_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPATK, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_SP_DEFENSE_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPDEF, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CRITICAL_UP:
berries work like in gen4
2020-06-29 18:04:13 +02:00
if (!moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY) && HasEnoughHpToEatBerry(battlerId, GetBattlerHoldEffectParam(battlerId), gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY;
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_EFFECT_OTHER;
}
break;
case HOLD_EFFECT_RANDOM_STAT_UP:
Add Gluttony
2018-07-28 16:33:01 +02:00
if (!moveTurn)
stat raising berries
2021-01-06 06:13:32 +01:00
effect = RandomStatRaiseBerry(battlerId, gLastUsedItem, TRUE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case HOLD_EFFECT_CURE_PAR:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_PARALYSIS);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCurePrlzEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_PSN:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCurePsnEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_BRN:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_BURN && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_BURN);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureBrnEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_FRZ:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_FREEZE && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_FREEZE);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureFrzEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_SLP:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_SLEEP && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureSlpEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_CONFUSION:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureConfusionEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_EFFECT_OTHER;
}
break;
case HOLD_EFFECT_CURE_STATUS:
Unnerve
2020-07-16 14:17:38 +02:00
if ((gBattleMons[battlerId].status1 & STATUS1_ANY || gBattleMons[battlerId].status2 & STATUS2_CONFUSION) && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
i = 0;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
decompile battle 3
2017-09-17 17:14:32 +02:00
StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_BURN)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_FREEZE)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
i++;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
i++;
}
if (!(i > 1))
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CURED_PROBLEM;
decompile battle 3
2017-09-17 17:14:32 +02:00
else
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_NORMALIZED_STATUS;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 = 0;
gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
battle 4 commands are decompiled
2017-09-28 15:34:21 +02:00
BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATUS_CHANGE;
}
break;
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
case HOLD_EFFECT_MENTAL_HERB:
if (GetMentalHerbEffect(battlerId))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
gBattleScripting.savedBattler = gBattlerAttacker;
gBattlerAttacker = battlerId;
BattleScriptExecute(BattleScript_MentalHerbCureEnd2);
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_EFFECT_OTHER;
}
break;
micle berry
2021-01-06 18:47:07 +01:00
case HOLD_EFFECT_MICLE_BERRY:
if (!moveTurn)
effect = TrySetMicleBerry(battlerId, gLastUsedItem, TRUE);
break;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
decompile battle 3
2017-09-17 17:14:32 +02:00
if (effect)
{
berries work like in gen4
2020-06-29 18:04:13 +02:00
gActiveBattler = gBattlerAttacker = gPotentialItemEffectBattler = gBattleScripting.battler = battlerId;
decompile battle 3
2017-09-17 17:14:32 +02:00
switch (effect)
{
case ITEM_STATUS_CHANGE:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[battlerId].status1);
more renaming
2018-02-06 20:48:02 +01:00
MarkBattlerForControllerExec(gActiveBattler);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
case ITEM_PP_CHANGE:
Misc. documentation and move some data into .c files
2019-01-19 22:32:25 +01:00
if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[battlerId].mimickedMoves & gBitTable[i]))
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].pp[i] = changedPP;
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
}
}
}
break;
add bug bite
2021-07-25 22:55:52 +02:00
case ITEMEFFECT_BATTLER_MOVE_END:
goto DO_ITEMEFFECT_MOVE_END; // this hurts a bit to do, but is an easy solution
Label various battle scripts
2018-09-01 20:00:13 +02:00
case ITEMEFFECT_MOVE_END:
pokemon and battle constants
2018-02-08 11:17:41 +01:00
for (battlerId = 0; battlerId < gBattlersCount; battlerId++)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gLastUsedItem = gBattleMons[battlerId].item;
Add Gluttony
2018-07-28 16:33:01 +02:00
battlerHoldEffect = GetBattlerHoldEffect(battlerId, TRUE);
add bug bite
2021-07-25 22:55:52 +02:00
DO_ITEMEFFECT_MOVE_END:
Battle files - review changes
2018-07-16 20:47:30 +02:00
switch (battlerHoldEffect)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
micle berry
2021-01-06 18:47:07 +01:00
case HOLD_EFFECT_MICLE_BERRY:
if (B_HP_BERRIES >= GEN_4)
effect = TrySetMicleBerry(battlerId, gLastUsedItem, FALSE);
break;
berries work like in gen4
2020-06-29 18:04:13 +02:00
case HOLD_EFFECT_RESTORE_HP:
Sitrus berry gen4 effect code
2020-06-29 18:56:19 +02:00
if (B_HP_BERRIES >= GEN_4)
effect = ItemHealHp(battlerId, gLastUsedItem, FALSE, FALSE);
break;
case HOLD_EFFECT_RESTORE_PCT_HP:
if (B_BERRIES_INSTANT >= GEN_4)
effect = ItemHealHp(battlerId, gLastUsedItem, FALSE, TRUE);
berries work like in gen4
2020-06-29 18:04:13 +02:00
break;
stat raising berries
2021-01-06 06:13:32 +01:00
case HOLD_EFFECT_CONFUSE_SPICY:
if (B_BERRIES_INSTANT >= GEN_4)
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SPICY, FALSE);
break;
case HOLD_EFFECT_CONFUSE_DRY:
if (B_BERRIES_INSTANT >= GEN_4)
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_DRY, FALSE);
break;
case HOLD_EFFECT_CONFUSE_SWEET:
if (B_BERRIES_INSTANT >= GEN_4)
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SWEET, FALSE);
break;
case HOLD_EFFECT_CONFUSE_BITTER:
if (B_BERRIES_INSTANT >= GEN_4)
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_BITTER, FALSE);
break;
case HOLD_EFFECT_CONFUSE_SOUR:
if (B_BERRIES_INSTANT >= GEN_4)
effect = HealConfuseBerry(battlerId, gLastUsedItem, FLAVOR_SOUR, FALSE);
break;
case HOLD_EFFECT_ATTACK_UP:
if (B_BERRIES_INSTANT >= GEN_4)
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_ATK, FALSE);
break;
case HOLD_EFFECT_DEFENSE_UP:
if (B_BERRIES_INSTANT >= GEN_4)
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_DEF, FALSE);
break;
case HOLD_EFFECT_SPEED_UP:
if (B_BERRIES_INSTANT >= GEN_4)
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPEED, FALSE);
break;
case HOLD_EFFECT_SP_ATTACK_UP:
if (B_BERRIES_INSTANT >= GEN_4)
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPATK, FALSE);
break;
case HOLD_EFFECT_SP_DEFENSE_UP:
if (B_BERRIES_INSTANT >= GEN_4)
effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPDEF, FALSE);
break;
case HOLD_EFFECT_RANDOM_STAT_UP:
if (B_BERRIES_INSTANT >= GEN_4)
effect = RandomStatRaiseBerry(battlerId, gLastUsedItem, FALSE);
break;
decompile battle 3
2017-09-17 17:14:32 +02:00
case HOLD_EFFECT_CURE_PAR:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_PARALYSIS);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_BerryCureParRet;
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_PSN:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_BerryCurePsnRet;
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_BRN:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_BURN && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_BURN);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_BerryCureBrnRet;
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_FRZ:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_FREEZE && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_FREEZE);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_BerryCureFrzRet;
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_SLP:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status1 & STATUS1_SLEEP && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_BerryCureSlpRet;
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_CONFUSION:
Unnerve
2020-07-16 14:17:38 +02:00
if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_BerryCureConfusionRet;
effect = ITEM_EFFECT_OTHER;
}
break;
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
case HOLD_EFFECT_MENTAL_HERB:
if (GetMentalHerbEffect(battlerId))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
gBattleScripting.savedBattler = gBattlerAttacker;
gBattlerAttacker = battlerId;
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
update mental herb to gen 5
2021-01-16 02:11:55 +01:00
gBattlescriptCurrInstr = BattleScript_MentalHerbCureRet;
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_EFFECT_OTHER;
}
break;
case HOLD_EFFECT_CURE_STATUS:
Unnerve
2020-07-16 14:17:38 +02:00
if ((gBattleMons[battlerId].status1 & STATUS1_ANY || gBattleMons[battlerId].status2 & STATUS2_CONFUSION) && !UnnerveOn(battlerId, gLastUsedItem))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
decompile battle 3
2017-09-17 17:14:32 +02:00
StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_BURN)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status1 & STATUS1_FREEZE)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleMons[battlerId].status1 = 0;
gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CURED_PROBLEM;
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet;
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_RESTORE_STATS:
Party Size and Num Stats
2018-11-18 20:00:36 +01:00
for (i = 0; i < NUM_BATTLE_STATS; i++)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Add stat stage constants
2020-08-05 02:33:05 +02:00
if (gBattleMons[battlerId].statStages[i] < DEFAULT_STAT_STAGE)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Add stat stage constants
2020-08-05 02:33:05 +02:00
gBattleMons[battlerId].statStages[i] = DEFAULT_STAT_STAGE;
decompile battle 3
2017-09-17 17:14:32 +02:00
effect = ITEM_STATS_CHANGE;
}
}
if (effect)
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gBattleScripting.battler = battlerId;
more battle labels
2018-02-08 12:13:29 +01:00
gPotentialItemEffectBattler = battlerId;
up to x48 and troubles
2017-09-22 21:33:49 +02:00
BattleScriptPushCursor();
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_WhiteHerbRet;
Label various battle scripts
2018-09-01 20:00:13 +02:00
return effect;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
break;
}
Various battle target items
2019-05-09 20:31:58 +02:00
decompile battle 3
2017-09-17 17:14:32 +02:00
if (effect)
{
berries work like in gen4
2020-06-29 18:04:13 +02:00
gActiveBattler = gPotentialItemEffectBattler = gBattleScripting.battler = battlerId;
if (effect == ITEM_STATUS_CHANGE)
{
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
MarkBattlerForControllerExec(gActiveBattler);
}
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
}
}
break;
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
case ITEMEFFECT_KINGSROCK:
fixes
2021-09-17 01:36:06 +02:00
// Occur on each hit of a multi-strike move
add throat spray
2021-01-06 23:28:58 +01:00
switch (atkHoldEffect)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
add throat spray
2021-01-06 23:28:58 +01:00
case HOLD_EFFECT_FLINCH:
rename config
2021-11-12 13:47:24 +01:00
#if B_SERENE_GRACE_BOOST >= GEN_5
add kings rock serene grace boost config
2021-11-11 23:48:15 +01:00
if (GetBattlerAbility(gBattlerAttacker) == ABILITY_SERENE_GRACE)
atkHoldEffectParam *= 2;
#endif
merge with be
2021-09-02 21:33:42 +02:00
if (gBattleMoveDamage != 0 // Need to have done damage
add throat spray
2021-01-06 23:28:58 +01:00
&& !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& (Random() % 100) < atkHoldEffectParam
merge with be
2021-01-08 05:24:21 +01:00
&& gBattleMoves[gCurrentMove].flags & FLAG_KINGS_ROCK_AFFECTED
add throat spray
2021-01-06 23:28:58 +01:00
&& gBattleMons[gBattlerTarget].hp)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
add throat spray
2021-01-06 23:28:58 +01:00
gBattleScripting.moveEffect = MOVE_EFFECT_FLINCH;
BattleScriptPushCursor();
SetMoveEffect(FALSE, 0);
BattleScriptPop();
decompile battle 3
2017-09-17 17:14:32 +02:00
}
add throat spray
2021-01-06 23:28:58 +01:00
break;
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
case HOLD_EFFECT_BLUNDER_POLICY:
if (gBattleStruct->blunderPolicy
&& gBattleMons[gBattlerAttacker].hp != 0
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(gBattlerAttacker, STAT_SPEED, MAX_STAT_STAGE, CMP_LESS_THAN))
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
{
gBattleStruct->blunderPolicy = FALSE;
gLastUsedItem = atkItem;
gBattleScripting.statChanger = SET_STATCHANGER(STAT_SPEED, 2, FALSE);
effect = ITEM_STATS_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AttackerItemStatRaise;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
break;
}
break;
case ITEMEFFECT_LIFEORB_SHELLBELL:
fixes
2021-09-17 01:36:06 +02:00
// Occur after the final hit of a multi-strike move
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
switch (atkHoldEffect)
{
add throat spray
2021-01-06 23:28:58 +01:00
case HOLD_EFFECT_SHELL_BELL:
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 17:53:35 +02:00
if (gSpecialStatuses[gBattlerAttacker].damagedMons // Need to have done damage
add throat spray
2021-01-06 23:28:58 +01:00
&& gBattlerAttacker != gBattlerTarget
&& gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP
&& gBattleMons[gBattlerAttacker].hp != 0)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
add throat spray
2021-01-06 23:28:58 +01:00
gLastUsedItem = atkItem;
gPotentialItemEffectBattler = gBattlerAttacker;
gBattleScripting.battler = gBattlerAttacker;
gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].dmg / atkHoldEffectParam) * -1;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = -1;
gSpecialStatuses[gBattlerTarget].dmg = 0;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret;
fixes
2021-09-17 01:36:06 +02:00
effect = ITEM_HP_CHANGE;
add throat spray
2021-01-06 23:28:58 +01:00
}
break;
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
case HOLD_EFFECT_LIFE_ORB:
if (IsBattlerAlive(gBattlerAttacker)
&& !(TestSheerForceFlag(gBattlerAttacker, gCurrentMove))
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD
&& gSpecialStatuses[gBattlerAttacker].damagedMons)
add throat spray
2021-01-06 23:28:58 +01:00
{
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 10;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
fixes
2021-09-17 01:36:06 +02:00
effect = ITEM_HP_CHANGE;
add throat spray
2021-01-06 23:28:58 +01:00
BattleScriptPushCursor();
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
gBattlescriptCurrInstr = BattleScript_ItemHurtRet;
gLastUsedItem = gBattleMons[gBattlerAttacker].item;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
add throat spray
2021-01-06 23:28:58 +01:00
break;
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
case HOLD_EFFECT_THROAT_SPRAY: // Does NOT need to be a damaging move
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 17:53:35 +02:00
if (gProtectStructs[gBattlerAttacker].targetAffected
add blunder policy
2021-01-06 23:40:20 +01:00
&& gBattleMons[gBattlerAttacker].hp != 0
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
&& gBattleMoves[gCurrentMove].flags & FLAG_SOUND
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
&& CompareStat(gBattlerAttacker, STAT_SPATK, MAX_STAT_STAGE, CMP_LESS_THAN)
fixes
2021-09-17 01:36:06 +02:00
&& !NoAliveMonsForEitherParty()) // Don't activate if battle will end
add blunder policy
2021-01-06 23:40:20 +01:00
{
gLastUsedItem = atkItem;
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 17:05:11 +02:00
gBattleScripting.battler = gBattlerAttacker;
gBattleScripting.statChanger = SET_STATCHANGER(STAT_SPATK, 1, FALSE);
add blunder policy
2021-01-06 23:40:20 +01:00
effect = ITEM_STATS_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AttackerItemStatRaise;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
add blunder policy
2021-01-06 23:40:20 +01:00
break;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
break;
Various battle target items
2019-05-09 20:31:58 +02:00
case ITEMEFFECT_TARGET:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Various battle target items
2019-05-09 20:31:58 +02:00
GET_MOVE_TYPE(gCurrentMove, moveType);
switch (battlerHoldEffect)
{
case HOLD_EFFECT_AIR_BALLOON:
if (TARGET_TURN_DAMAGED)
{
effect = ITEM_EFFECT_OTHER;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AirBaloonMsgPop;
}
break;
case HOLD_EFFECT_ROCKY_HELMET:
if (TARGET_TURN_DAMAGED
&& IsMoveMakingContact(gCurrentMove, gBattlerAttacker)
Rocky Helmet softlock fix
2020-06-26 21:56:18 +02:00
&& IsBattlerAlive(gBattlerAttacker)
Various battle target items
2019-05-09 20:31:58 +02:00
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
{
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 6;
Various battle target items
2019-05-09 20:31:58 +02:00
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
effect = ITEM_HP_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_RockyHelmetActivates;
PREPARE_ITEM_BUFFER(gBattleTextBuff1, gLastUsedItem);
RecordItemEffectBattle(battlerId, HOLD_EFFECT_ROCKY_HELMET);
}
break;
case HOLD_EFFECT_WEAKNESS_POLICY:
if (IsBattlerAlive(battlerId)
&& TARGET_TURN_DAMAGED
&& gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)
{
effect = ITEM_STATS_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_WeaknessPolicy;
}
break;
case HOLD_EFFECT_SNOWBALL:
if (IsBattlerAlive(battlerId)
&& TARGET_TURN_DAMAGED
&& moveType == TYPE_ICE)
{
effect = ITEM_STATS_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetItemStatRaise;
gBattleScripting.statChanger = SET_STATCHANGER(STAT_ATK, 1, FALSE);
}
break;
case HOLD_EFFECT_LUMINOUS_MOSS:
if (IsBattlerAlive(battlerId)
&& TARGET_TURN_DAMAGED
&& moveType == TYPE_WATER)
{
effect = ITEM_STATS_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetItemStatRaise;
gBattleScripting.statChanger = SET_STATCHANGER(STAT_SPDEF, 1, FALSE);
}
break;
case HOLD_EFFECT_CELL_BATTERY:
if (IsBattlerAlive(battlerId)
&& TARGET_TURN_DAMAGED
&& moveType == TYPE_ELECTRIC)
{
effect = ITEM_STATS_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetItemStatRaise;
gBattleScripting.statChanger = SET_STATCHANGER(STAT_ATK, 1, FALSE);
}
break;
case HOLD_EFFECT_ABSORB_BULB:
if (IsBattlerAlive(battlerId)
&& TARGET_TURN_DAMAGED
&& moveType == TYPE_WATER)
{
effect = ITEM_STATS_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetItemStatRaise;
gBattleScripting.statChanger = SET_STATCHANGER(STAT_SPATK, 1, FALSE);
}
break;
kee, maranga, sitrus beries
2021-01-06 21:07:18 +01:00
case HOLD_EFFECT_JABOCA_BERRY: // consume and damage attacker if used physical move
jaboca, rowap berry effects
2021-01-06 19:15:56 +01:00
if (IsBattlerAlive(battlerId)
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 17:14:20 +01:00
&& TARGET_TURN_DAMAGED
&& !DoesSubstituteBlockMove(gBattlerAttacker, battlerId, gCurrentMove)
merge with be. magic guard checks
2021-03-03 17:21:06 +01:00
&& IS_MOVE_PHYSICAL(gCurrentMove)
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 18:48:05 +01:00
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
jaboca, rowap berry effects
2021-01-06 19:15:56 +01:00
{
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
gBattleMoveDamage *= 2;
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
jaboca, rowap berry effects
2021-01-06 19:15:56 +01:00
effect = ITEM_HP_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_JabocaRowapBerryActivates;
PREPARE_ITEM_BUFFER(gBattleTextBuff1, gLastUsedItem);
RecordItemEffectBattle(battlerId, HOLD_EFFECT_ROCKY_HELMET);
}
break;
kee, maranga, sitrus beries
2021-01-06 21:07:18 +01:00
case HOLD_EFFECT_ROWAP_BERRY: // consume and damage attacker if used special move
if (IsBattlerAlive(battlerId)
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 17:14:25 +01:00
&& TARGET_TURN_DAMAGED
&& !DoesSubstituteBlockMove(gBattlerAttacker, battlerId, gCurrentMove)
merge with be. magic guard checks
2021-03-03 17:21:06 +01:00
&& IS_MOVE_SPECIAL(gCurrentMove)
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 18:48:11 +01:00
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
kee, maranga, sitrus beries
2021-01-06 21:07:18 +01:00
{
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
gBattleMoveDamage *= 2;
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
kee, maranga, sitrus beries
2021-01-06 21:07:18 +01:00
effect = ITEM_HP_CHANGE;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_JabocaRowapBerryActivates;
PREPARE_ITEM_BUFFER(gBattleTextBuff1, gLastUsedItem);
RecordItemEffectBattle(battlerId, HOLD_EFFECT_ROCKY_HELMET);
}
break;
case HOLD_EFFECT_KEE_BERRY: // consume and boost defense if used physical move
effect = DamagedStatBoostBerryEffect(battlerId, STAT_DEF, SPLIT_PHYSICAL);
break;
case HOLD_EFFECT_MARANGA_BERRY: // consume and boost sp. defense if used special move
effect = DamagedStatBoostBerryEffect(battlerId, STAT_SPDEF, SPLIT_SPECIAL);
break;
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
case HOLD_EFFECT_STICKY_BARB:
if (TARGET_TURN_DAMAGED
&& (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
&& IsMoveMakingContact(gCurrentMove, gBattlerAttacker)
fix DoesSubstituteBlockMove calls
2021-10-06 21:30:44 +02:00
&& !DoesSubstituteBlockMove(gBattlerAttacker, battlerId, gCurrentMove)
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
&& IsBattlerAlive(gBattlerAttacker)
fix sticky barb theft in trainer battles
2020-12-22 16:35:11 +01:00
&& CanStealItem(gBattlerAttacker, gBattlerTarget, gBattleMons[gBattlerTarget].item)
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
&& gBattleMons[gBattlerAttacker].item == ITEM_NONE)
{
fix sticky barb theft in trainer battles
2020-12-22 16:35:11 +01:00
// No sticky hold checks.
add additional item theft check
2020-12-21 03:06:50 +01:00
gEffectBattler = battlerId; // gEffectBattler = target
StealTargetItem(gBattlerAttacker, gBattlerTarget); // Attacker takes target's barb
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_StickyBarbTransfer;
effect = ITEM_EFFECT_OTHER;
}
break;
Various battle target items
2019-05-09 20:31:58 +02:00
}
}
break;
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
case ITEMEFFECT_ORBS:
switch (battlerHoldEffect)
{
case HOLD_EFFECT_TOXIC_ORB:
if (!gBattleMons[battlerId].status1
Corrosion (#306) * Status move poisoning for Steel and Poison types. * Can poison itself with Toxic Orb. * Secondary effect poisoning now working. * Created a function that checks if abilities can bypass type immunities. * Created macro to handle typeimmunity * Applied review changes. * Applied review requests. * Left more readable version of HOLD_EFFECT_TOXIC_ORB.
2020-04-21 15:59:19 +02:00
&& CanPoisonType(battlerId, battlerId)
Fix Toxic and Flame Orb Shouldn't inflict status conditions on a fainted mon.
2021-05-04 12:55:19 +02:00
&& GetBattlerAbility(battlerId) != ABILITY_IMMUNITY
Add missing ability checks to orbs Flame Orb shouldn't burn mons with Water Bubble and neither orb should affect mons with Comatose.
2021-05-04 13:08:48 +02:00
&& GetBattlerAbility(battlerId) != ABILITY_COMATOSE
Fix Toxic and Flame Orb Shouldn't inflict status conditions on a fainted mon.
2021-05-04 12:55:19 +02:00
&& IsBattlerAlive)
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
{
effect = ITEM_STATUS_CHANGE;
gBattleMons[battlerId].status1 = STATUS1_TOXIC_POISON;
BattleScriptExecute(BattleScript_ToxicOrb);
RecordItemEffectBattle(battlerId, battlerHoldEffect);
}
break;
case HOLD_EFFECT_FLAME_ORB:
if (!gBattleMons[battlerId].status1
&& !IS_BATTLER_OF_TYPE(battlerId, TYPE_FIRE)
Fix Toxic and Flame Orb Shouldn't inflict status conditions on a fainted mon.
2021-05-04 12:55:19 +02:00
&& GetBattlerAbility(battlerId) != ABILITY_WATER_VEIL
Add missing ability checks to orbs Flame Orb shouldn't burn mons with Water Bubble and neither orb should affect mons with Comatose.
2021-05-04 13:08:48 +02:00
&& GetBattlerAbility(battlerId) != ABILITY_WATER_BUBBLE
&& GetBattlerAbility(battlerId) != ABILITY_COMATOSE
Fix Toxic and Flame Orb Shouldn't inflict status conditions on a fainted mon.
2021-05-04 12:55:19 +02:00
&& IsBattlerAlive)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
effect = ITEM_STATUS_CHANGE;
gBattleMons[battlerId].status1 = STATUS1_BURN;
BattleScriptExecute(BattleScript_FlameOrb);
RecordItemEffectBattle(battlerId, battlerHoldEffect);
}
break;
add additional item theft check
2020-12-21 03:06:50 +01:00
case HOLD_EFFECT_STICKY_BARB: // Not an orb per se, but similar effect, and needs to NOT activate with pickpocket
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
if (GetBattlerAbility(battlerId) != ABILITY_MAGIC_GUARD)
{
gBattleMoveDamage = gBattleMons[battlerId].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
BattleScriptExecute(BattleScript_ItemHurtEnd2);
effect = ITEM_HP_CHANGE;
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
RecordItemEffectBattle(battlerId, battlerHoldEffect);
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
PREPARE_ITEM_BUFFER(gBattleTextBuff1, gLastUsedItem);
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
}
break;
}
if (effect == ITEM_STATUS_CHANGE)
{
gActiveBattler = battlerId;
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[battlerId].status1);
MarkBattlerForControllerExec(gActiveBattler);
}
break;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
Code Belch effect
2019-02-01 14:17:24 +01:00
// Berry was successfully used on a Pokemon.
if (effect && (gLastUsedItem >= FIRST_BERRY_INDEX && gLastUsedItem <= LAST_BERRY_INDEX))
gBattleStruct->ateBerry[battlerId & BIT_SIDE] |= gBitTable[gBattlerPartyIndexes[battlerId]];
decompile battle 3
2017-09-17 17:14:32 +02:00
return effect;
}
pokemon and battle constants
2018-02-08 11:17:41 +01:00
void ClearFuryCutterDestinyBondGrudge(u8 battlerId)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
gDisableStructs[battlerId].furyCutterCounter = 0;
gBattleMons[battlerId].status2 &= ~(STATUS2_DESTINY_BOND);
gStatuses3[battlerId] &= ~(STATUS3_GRUDGE);
decompile battle 3
2017-09-17 17:14:32 +02:00
}
battle 2 is done
2017-10-06 17:06:45 +02:00
void HandleAction_RunBattleScript(void) // identical to RunBattleScriptCommands
decompile battle 3
2017-09-17 17:14:32 +02:00
{
more renaming
2018-02-06 20:48:02 +01:00
if (gBattleControllerExecFlags == 0)
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattleScriptingCommandsTable[*gBattlescriptCurrInstr]();
}
Fix no targets issue and switching faint issu
2019-08-26 14:55:55 +02:00
u32 SetRandomTarget(u32 battlerId)
{
Fix some moves hitting the user
2019-12-30 13:14:20 +01:00
u32 target;
Fix no targets issue and switching faint issu
2019-08-26 14:55:55 +02:00
static const u8 targets[2][2] =
{
[B_SIDE_PLAYER] = {B_POSITION_OPPONENT_LEFT, B_POSITION_OPPONENT_RIGHT},
[B_SIDE_OPPONENT] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT},
};
Fix some moves hitting the user
2019-12-30 13:14:20 +01:00
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
target = GetBattlerAtPosition(targets[GetBattlerSide(battlerId)][Random() % 2]);
if (!IsBattlerAlive(target))
target ^= BIT_FLANK;
}
else
{
target = GetBattlerAtPosition(targets[GetBattlerSide(battlerId)][0]);
}
Fix no targets issue and switching faint issu
2019-08-26 14:55:55 +02:00
return target;
}
expand move target field
2021-10-16 22:10:45 +02:00
u32 GetMoveTarget(u16 move, u8 setTarget)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
u8 targetBattler = 0;
Fix no targets issue and switching faint issu
2019-08-26 14:55:55 +02:00
u32 i, moveTarget, side;
decompile battle 3
2017-09-17 17:14:32 +02:00
more battle files cleaning
2018-03-01 00:59:52 +01:00
if (setTarget)
moveTarget = setTarget - 1;
decompile battle 3
2017-09-17 17:14:32 +02:00
else
Fix and rename GetMoveTargetType Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 00:09:54 +01:00
moveTarget = GetBattlerMoveTargetType(gBattlerAttacker, move);
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
redo prankster checks to handle assist
2021-09-22 14:06:42 +02:00
// Special cases
if (move == MOVE_CURSE && !IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GHOST))
moveTarget = MOVE_TARGET_USER;
Fix terrain checks on DLC moves Expanding Force and Rising Voltage now boost damage correctly. Expanding Force doesn't hit both targets yet however.
2021-11-19 08:20:16 +01:00
decompile battle 3
2017-09-17 17:14:32 +02:00
switch (moveTarget)
{
begin work on battle4, organize battle headers
2017-09-19 21:01:12 +02:00
case MOVE_TARGET_SELECTED:
more renaming
2018-02-06 23:09:39 +01:00
side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
merge with be, give life dew jungle healing effect
2021-07-25 16:22:05 +02:00
if (IsAffectedByFollowMe(gBattlerAttacker, side, move))
Updated switch mechanics
2019-08-22 15:57:33 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
targetBattler = gSideTimers[side].followmeTarget;
Updated switch mechanics
2019-08-22 15:57:33 +02:00
}
decompile battle 3
2017-09-17 17:14:32 +02:00
else
{
Fix no targets issue and switching faint issu
2019-08-26 14:55:55 +02:00
targetBattler = SetRandomTarget(gBattlerAttacker);
decompile battle 3
2017-09-17 17:14:32 +02:00
if (gBattleMoves[move].type == TYPE_ELECTRIC
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
&& IsAbilityOnOpposingSide(gBattlerAttacker, ABILITY_LIGHTNING_ROD)
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
&& GetBattlerAbility(targetBattler) != ABILITY_LIGHTNING_ROD)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
document frontier related
2018-07-01 11:15:42 +02:00
targetBattler ^= BIT_FLANK;
RecordAbilityBattle(targetBattler, gBattleMons[targetBattler].ability);
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[targetBattler].lightningRodRedirected = TRUE;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
else if (gBattleMoves[move].type == TYPE_WATER
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
&& IsAbilityOnOpposingSide(gBattlerAttacker, ABILITY_STORM_DRAIN)
replace gBattleMons[x].ability w GetBattlerAbility
2021-10-31 22:19:30 +01:00
&& GetBattlerAbility(targetBattler) != ABILITY_STORM_DRAIN)
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
{
targetBattler ^= BIT_FLANK;
RecordAbilityBattle(targetBattler, gBattleMons[targetBattler].ability);
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[targetBattler].stormDrainRedirected = TRUE;
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
}
decompile battle 3
2017-09-17 17:14:32 +02:00
}
break;
begin work on battle4, organize battle headers
2017-09-19 21:01:12 +02:00
case MOVE_TARGET_DEPENDS:
case MOVE_TARGET_BOTH:
case MOVE_TARGET_FOES_AND_ALLY:
case MOVE_TARGET_OPPONENTS_FIELD:
document frontier related
2018-07-01 11:15:42 +02:00
targetBattler = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE);
Updated switch mechanics
2019-08-22 15:57:33 +02:00
if (!IsBattlerAlive(targetBattler))
document frontier related
2018-07-01 11:15:42 +02:00
targetBattler ^= BIT_FLANK;
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
begin work on battle4, organize battle headers
2017-09-19 21:01:12 +02:00
case MOVE_TARGET_RANDOM:
more renaming
2018-02-06 23:09:39 +01:00
side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
merge with be, give life dew jungle healing effect
2021-07-25 16:22:05 +02:00
if (IsAffectedByFollowMe(gBattlerAttacker, side, move))
document frontier related
2018-07-01 11:15:42 +02:00
targetBattler = gSideTimers[side].followmeTarget;
begin work on battle4, organize battle headers
2017-09-19 21:01:12 +02:00
else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & MOVE_TARGET_RANDOM)
Fix no targets issue and switching faint issu
2019-08-26 14:55:55 +02:00
targetBattler = SetRandomTarget(gBattlerAttacker);
decompile battle 3
2017-09-17 17:14:32 +02:00
else
document frontier related
2018-07-01 11:15:42 +02:00
targetBattler = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE);
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
correct move target defines
2018-02-26 13:24:46 +01:00
case MOVE_TARGET_USER_OR_SELECTED:
begin work on battle4, organize battle headers
2017-09-19 21:01:12 +02:00
case MOVE_TARGET_USER:
Add Aromatic Mist
2018-11-25 12:59:22 +01:00
default:
document frontier related
2018-07-01 11:15:42 +02:00
targetBattler = gBattlerAttacker;
decompile battle 3
2017-09-17 17:14:32 +02:00
break;
Add Aromatic Mist
2018-11-25 12:59:22 +01:00
case MOVE_TARGET_ALLY:
if (IsBattlerAlive(BATTLE_PARTNER(gBattlerAttacker)))
targetBattler = BATTLE_PARTNER(gBattlerAttacker);
else
targetBattler = gBattlerAttacker;
break;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
document frontier related
2018-07-01 11:15:42 +02:00
*(gBattleStruct->moveTarget + gBattlerAttacker) = targetBattler;
decompile battle 3
2017-09-17 17:14:32 +02:00
document frontier related
2018-07-01 11:15:42 +02:00
return targetBattler;
decompile battle 3
2017-09-17 17:14:32 +02:00
}
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 22:16:40 +02:00
static bool32 IsMonEventLegal(u8 battlerId)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT)
decompile battle 3
2017-09-17 17:14:32 +02:00
return TRUE;
pokemon and battle constants
2018-02-08 11:17:41 +01:00
if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS
&& GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_MEW)
decompile battle 3
2017-09-17 17:14:32 +02:00
return TRUE;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-23 07:08:19 +01:00
return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_EVENT_LEGAL, NULL);
decompile battle 3
2017-09-17 17:14:32 +02:00
}
label battle stuff
2017-12-02 14:08:55 +01:00
u8 IsMonDisobedient(void)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
s32 rnd;
s32 calc;
u8 obedienceLevel = 0;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-01-29 07:45:58 +01:00
if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))
decompile battle 3
2017-09-17 17:14:32 +02:00
return 0;
more renaming
2018-02-06 23:09:39 +01:00
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT)
decompile battle 3
2017-09-17 17:14:32 +02:00
return 0;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 22:16:40 +02:00
if (IsMonEventLegal(gBattlerAttacker)) // only false if illegal Mew or Deoxys
decompile battle 3
2017-09-17 17:14:32 +02:00
{
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gBattlerAttacker) == 2)
decompile battle 3
2017-09-17 17:14:32 +02:00
return 0;
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
return 0;
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
return 0;
more renaming
2018-02-06 23:09:39 +01:00
if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName))
decompile battle 3
2017-09-17 17:14:32 +02:00
return 0;
Update variable and flag names
2017-11-08 22:20:10 +01:00
if (FlagGet(FLAG_BADGE08_GET))
decompile battle 3
2017-09-17 17:14:32 +02:00
return 0;
obedienceLevel = 10;
Update variable and flag names
2017-11-08 22:20:10 +01:00
if (FlagGet(FLAG_BADGE02_GET))
decompile battle 3
2017-09-17 17:14:32 +02:00
obedienceLevel = 30;
Update variable and flag names
2017-11-08 22:20:10 +01:00
if (FlagGet(FLAG_BADGE04_GET))
decompile battle 3
2017-09-17 17:14:32 +02:00
obedienceLevel = 50;
Update variable and flag names
2017-11-08 22:20:10 +01:00
if (FlagGet(FLAG_BADGE06_GET))
decompile battle 3
2017-09-17 17:14:32 +02:00
obedienceLevel = 70;
}
more renaming
2018-02-06 23:09:39 +01:00
if (gBattleMons[gBattlerAttacker].level <= obedienceLevel)
decompile battle 3
2017-09-17 17:14:32 +02:00
return 0;
rnd = (Random() & 255);
more renaming
2018-02-06 23:09:39 +01:00
calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8;
decompile battle 3
2017-09-17 17:14:32 +02:00
if (calc < obedienceLevel)
return 0;
// is not obedient
if (gCurrentMove == MOVE_RAGE)
more renaming
2018-02-06 23:09:39 +01:00
gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_RAGE);
if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
Label various battle scripts
2018-09-01 20:00:13 +02:00
gBattlescriptCurrInstr = BattleScript_IgnoresWhileAsleep;
decompile battle 3
2017-09-17 17:14:32 +02:00
return 1;
}
rnd = (Random() & 255);
more renaming
2018-02-06 23:09:39 +01:00
calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8;
decompile battle 3
2017-09-17 17:14:32 +02:00
if (calc < obedienceLevel)
{
more renaming
2018-02-06 23:09:39 +01:00
calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], 0xFF);
decompile battle 3
2017-09-17 17:14:32 +02:00
if (calc == 0xF) // all moves cannot be used
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
// Randomly select, then print a disobedient string
// B_MSG_LOAFING, B_MSG_WONT_OBEY, B_MSG_TURNED_AWAY, or B_MSG_PRETEND_NOT_NOTICE
gBattleCommunication[MULTISTRING_CHOOSER] = Random() & (NUM_LOAF_STRINGS - 1);
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
return 1;
}
else // use a random move
{
do
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gCurrMovePos = gChosenMovePos = Random() & (MAX_MON_MOVES - 1);
decompile battle 3
2017-09-17 17:14:32 +02:00
} while (gBitTable[gCurrMovePos] & calc);
gRandomMove to gCalledMove
2018-09-22 18:41:00 +02:00
gCalledMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
more battle labels
2017-11-26 17:15:28 +01:00
gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
gRandomMove to gCalledMove
2018-09-22 18:41:00 +02:00
gBattlerTarget = GetMoveTarget(gCalledMove, 0);
decompile battle 3
2017-09-17 17:14:32 +02:00
gHitMarker |= HITMARKER_x200000;
return 2;
}
}
else
{
more renaming
2018-02-06 23:09:39 +01:00
obedienceLevel = gBattleMons[gBattlerAttacker].level - obedienceLevel;
decompile battle 3
2017-09-17 17:14:32 +02:00
calc = (Random() & 255);
electric and misty terrain preventions
2021-01-16 19:40:02 +01:00
if (calc < obedienceLevel && CanSleep(gBattlerAttacker))
decompile battle 3
2017-09-17 17:14:32 +02:00
{
// try putting asleep
int i;
rename bank to battler
2018-02-06 02:46:59 +01:00
for (i = 0; i < gBattlersCount; i++)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
if (gBattleMons[i].status2 & STATUS2_UPROAR)
break;
}
rename bank to battler
2018-02-06 02:46:59 +01:00
if (i == gBattlersCount)
decompile battle 3
2017-09-17 17:14:32 +02:00
{
more battle labels
2017-11-26 17:15:28 +01:00
gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep;
decompile battle 3
2017-09-17 17:14:32 +02:00
return 1;
}
}
calc -= obedienceLevel;
if (calc < obedienceLevel)
{
Fix messing with move result flags when not needed
2019-04-02 00:14:01 +02:00
gBattleMoveDamage = CalculateMoveDamage(MOVE_NONE, gBattlerAttacker, gBattlerAttacker, TYPE_MYSTERY, 40, FALSE, FALSE, TRUE);
more renaming
2018-02-06 23:09:39 +01:00
gBattlerTarget = gBattlerAttacker;
Label various battle scripts
2018-09-01 20:00:13 +02:00
gBattlescriptCurrInstr = BattleScript_IgnoresAndHitsItself;
decompile battle 3
2017-09-17 17:14:32 +02:00
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
return 2;
}
else
{
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
// Randomly select, then print a disobedient string
// B_MSG_LOAFING, B_MSG_WONT_OBEY, B_MSG_TURNED_AWAY, or B_MSG_PRETEND_NOT_NOTICE
gBattleCommunication[MULTISTRING_CHOOSER] = Random() & (NUM_LOAF_STRINGS - 1);
decompile battle 3
2017-09-17 17:14:32 +02:00
gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
return 1;
}
}
}
Important battle util functions
2018-07-14 16:41:14 +02:00
u32 GetBattlerHoldEffect(u8 battlerId, bool32 checkNegating)
{
if (checkNegating)
{
if (gStatuses3[battlerId] & STATUS3_EMBARGO)
return HOLD_EFFECT_NONE;
if (gFieldStatuses & STATUS_FIELD_MAGIC_ROOM)
return HOLD_EFFECT_NONE;
Removed redundant uses of STATUS3_GASTRO_ACID check.
2021-11-16 03:29:54 +01:00
if (GetBattlerAbility(battlerId) == ABILITY_KLUTZ)
Important battle util functions
2018-07-14 16:41:14 +02:00
return HOLD_EFFECT_NONE;
}
gPotentialItemEffectBattler = battlerId;
USE_BATTLE_DEBUG -> B_ENABLE_DEBUG
2020-12-23 18:04:14 +01:00
if (B_ENABLE_DEBUG && gBattleStruct->debugHoldEffects[battlerId] != 0 && gBattleMons[battlerId].item)
Add held effect debug override
2019-04-13 14:56:26 +02:00
return gBattleStruct->debugHoldEffects[battlerId];
else if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY)
Important battle util functions
2018-07-14 16:41:14 +02:00
return gEnigmaBerries[battlerId].holdEffect;
else
return ItemId_GetHoldEffect(gBattleMons[battlerId].item);
}
u32 GetBattlerHoldEffectParam(u8 battlerId)
{
if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY)
return gEnigmaBerries[battlerId].holdEffectParam;
else
return ItemId_GetHoldEffectParam(gBattleMons[battlerId].item);
}
bool32 IsMoveMakingContact(u16 move, u8 battlerAtk)
{
if (!(gBattleMoves[move].flags & FLAG_MAKES_CONTACT))
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 14:28:26 +02:00
{
Quick syntax tweaks
2021-10-27 16:19:39 +02:00
if (gBattleMoves[move].effect == EFFECT_SHELL_SIDE_ARM && gSwapDamageCategory)
Only thing left is making IsMoveMakingContact work when hitting King's Shield, etc.
2021-06-05 22:47:05 +02:00
return TRUE;
else
return FALSE;
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 14:28:26 +02:00
}
Important battle util functions
2018-07-14 16:41:14 +02:00
else if (GetBattlerAbility(battlerAtk) == ABILITY_LONG_REACH)
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 14:28:26 +02:00
{
Important battle util functions
2018-07-14 16:41:14 +02:00
return FALSE;
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 14:28:26 +02:00
}
Important battle util functions
2018-07-14 16:41:14 +02:00
else if (GetBattlerHoldEffect(battlerAtk, TRUE) == HOLD_EFFECT_PROTECTIVE_PADS)
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 14:28:26 +02:00
{
Important battle util functions
2018-07-14 16:41:14 +02:00
return FALSE;
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 14:28:26 +02:00
}
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
else
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 14:28:26 +02:00
{
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
return TRUE;
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 14:28:26 +02:00
}
Important battle util functions
2018-07-14 16:41:14 +02:00
}
IsBattlerProtected
2021-11-13 13:48:08 +01:00
bool32 IsBattlerProtected(u8 battlerId, u16 move)
{
// Decorate bypasses protect and detect, but not crafty shield
if (move == MOVE_DECORATE)
{
if (gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_CRAFTY_SHIELD)
return TRUE;
else if (gProtectStructs[battlerId].protected)
return FALSE;
}
Implement Unseen Fist Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
2021-11-19 04:21:33 +01:00
// Protective Pads doesn't stop Unseen Fist from bypassing Protect effects, so IsMoveMakingContact() isn't used here.
// This means extra logic is needed to handle Shell Side Arm.
fix unseen fist check
2021-11-19 22:32:00 +01:00
if (GetBattlerAbility(gBattlerAttacker) == ABILITY_UNSEEN_FIST
Implement Unseen Fist Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
2021-11-19 04:21:33 +01:00
&& (gBattleMoves[move].flags & FLAG_MAKES_CONTACT || (gBattleMoves[move].effect == EFFECT_SHELL_SIDE_ARM && gSwapDamageCategory)))
return FALSE;
else if (!(gBattleMoves[move].flags & FLAG_PROTECT_AFFECTED))
IsBattlerProtected
2021-11-13 13:48:08 +01:00
return FALSE;
else if (gBattleMoves[move].effect == MOVE_EFFECT_FEINT)
return FALSE;
else if (gProtectStructs[battlerId].protected)
return TRUE;
else if (gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_WIDE_GUARD
Fix and rename GetMoveTargetType Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 00:09:54 +01:00
&& GetBattlerMoveTargetType(gBattlerAttacker, move) & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY))
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
return TRUE;
IsBattlerProtected
2021-11-13 13:48:08 +01:00
else if (gProtectStructs[battlerId].banefulBunkered)
return TRUE;
else if (gProtectStructs[battlerId].obstructed && !IS_MOVE_STATUS(move))
return TRUE;
else if (gProtectStructs[battlerId].spikyShielded)
return TRUE;
else if (gProtectStructs[battlerId].kingsShielded && gBattleMoves[move].power != 0)
return TRUE;
else if (gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_QUICK_GUARD
&& GetChosenMovePriority(gBattlerAttacker) > 0)
return TRUE;
else if (gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_CRAFTY_SHIELD
&& IS_MOVE_STATUS(move))
return TRUE;
else if (gSideStatuses[GetBattlerSide(battlerId)] & SIDE_STATUS_MAT_BLOCK
&& !IS_MOVE_STATUS(move))
return TRUE;
else
return FALSE;
Important battle util functions
2018-07-14 16:41:14 +02:00
}
IsBattlerProtected
2021-11-13 13:48:08 +01:00
Important battle util functions
2018-07-14 16:41:14 +02:00
bool32 IsBattlerGrounded(u8 battlerId)
{
if (GetBattlerHoldEffect(battlerId, TRUE) == HOLD_EFFECT_IRON_BALL)
return TRUE;
else if (gFieldStatuses & STATUS_FIELD_GRAVITY)
return TRUE;
else if (gStatuses3[battlerId] & STATUS3_ROOTED)
return TRUE;
else if (gStatuses3[battlerId] & STATUS3_SMACKED_DOWN)
return TRUE;
else if (gStatuses3[battlerId] & STATUS3_TELEKINESIS)
return FALSE;
Do new battler end turn effects.
2018-07-18 22:07:48 +02:00
else if (gStatuses3[battlerId] & STATUS3_MAGNET_RISE)
return FALSE;
Various battle target items
2019-05-09 20:31:58 +02:00
else if (GetBattlerHoldEffect(battlerId, TRUE) == HOLD_EFFECT_AIR_BALLOON)
return FALSE;
Important battle util functions
2018-07-14 16:41:14 +02:00
else if (GetBattlerAbility(battlerId) == ABILITY_LEVITATE)
return FALSE;
else if (IS_BATTLER_OF_TYPE(battlerId, TYPE_FLYING))
return FALSE;
else
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
return TRUE;
Important battle util functions
2018-07-14 16:41:14 +02:00
}
bool32 IsBattlerAlive(u8 battlerId)
{
if (gBattleMons[battlerId].hp == 0)
return FALSE;
else if (battlerId >= gBattlersCount)
return FALSE;
else if (gAbsentBattlerFlags & gBitTable[battlerId])
return FALSE;
Fixed indentation for various files.
2020-10-19 23:01:19 +02:00
else
return TRUE;
Important battle util functions
2018-07-14 16:41:14 +02:00
}
u8 GetBattleMonMoveSlot(struct BattlePokemon *battleMon, u16 move)
{
u8 i;
for (i = 0; i < 4; i++)
{
if (battleMon->moves[i] == move)
break;
}
return i;
}
u32 GetBattlerWeight(u8 battlerId)
{
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
u32 i;
Important battle util functions
2018-07-14 16:41:14 +02:00
u32 weight = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[battlerId].species), 1);
u32 ability = GetBattlerAbility(battlerId);
u32 holdEffect = GetBattlerHoldEffect(battlerId, TRUE);
if (ability == ABILITY_HEAVY_METAL)
weight *= 2;
else if (ability == ABILITY_LIGHT_METAL)
weight /= 2;
if (holdEffect == HOLD_EFFECT_FLOAT_STONE)
weight /= 2;
Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
for (i = 0; i < gDisableStructs[battlerId].autotomizeCount; i++)
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
{
if (weight > 1000)
{
weight -= 1000;
}
else if (weight <= 1000)
{
weight = 1;
break;
}
}
Important battle util functions
2018-07-14 16:41:14 +02:00
if (weight == 0)
weight = 1;
return weight;
}
u32 CountBattlerStatIncreases(u8 battlerId, bool32 countEvasionAcc)
{
u32 i;
u32 count = 0;
Merge with master
2018-11-18 20:49:52 +01:00
for (i = 0; i < NUM_BATTLE_STATS; i++)
Important battle util functions
2018-07-14 16:41:14 +02:00
{
if ((i == STAT_ACC || i == STAT_EVASION) && !countEvasionAcc)
continue;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
if (gBattleMons[battlerId].statStages[i] > DEFAULT_STAT_STAGE) // Stat is increased.
count += gBattleMons[battlerId].statStages[i] - DEFAULT_STAT_STAGE;
Important battle util functions
2018-07-14 16:41:14 +02:00
}
return count;
}
u32 GetMoveTargetCount(u16 move, u8 battlerAtk, u8 battlerDef)
{
Fix and rename GetMoveTargetType Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 00:09:54 +01:00
switch (GetBattlerMoveTargetType(gBattlerAttacker, move))
Important battle util functions
2018-07-14 16:41:14 +02:00
{
case MOVE_TARGET_BOTH:
return IsBattlerAlive(battlerDef)
+ IsBattlerAlive(BATTLE_PARTNER(battlerDef));
case MOVE_TARGET_FOES_AND_ALLY:
return IsBattlerAlive(battlerDef)
+ IsBattlerAlive(BATTLE_PARTNER(battlerDef))
+ IsBattlerAlive(BATTLE_PARTNER(battlerAtk));
case MOVE_TARGET_OPPONENTS_FIELD:
return 1;
case MOVE_TARGET_DEPENDS:
case MOVE_TARGET_SELECTED:
case MOVE_TARGET_RANDOM:
case MOVE_TARGET_USER_OR_SELECTED:
return IsBattlerAlive(battlerDef);
case MOVE_TARGET_USER:
return IsBattlerAlive(battlerAtk);
default:
return 0;
}
}
Create template of new dmg calc
2018-07-14 19:29:25 +02:00
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
static void MulModifier(u16 *modifier, u16 val)
{
*modifier = UQ_4_12_TO_INT((*modifier * val) + UQ_4_12_ROUND);
}
static u32 ApplyModifier(u16 modifier, u32 val)
{
return UQ_4_12_TO_INT((modifier * val) + UQ_4_12_ROUND);
}
Use more damage look-up tables
2019-01-05 19:02:01 +01:00
static const u8 sFlailHpScaleToPowerTable[] =
{
1, 200,
4, 150,
9, 100,
16, 80,
32, 40,
48, 20
};
// format: min. weight (hectograms), base power
static const u16 sWeightToDamageTable[] =
{
100, 20,
250, 40,
500, 60,
1000, 80,
2000, 100,
0xFFFF, 0xFFFF
};
static const u8 sSpeedDiffPowerTable[] = {40, 60, 80, 120, 150};
Fixed Heat Crash's power table name
2021-10-05 01:17:43 +02:00
static const u8 sHeatCrashPowerTable[] = {40, 40, 60, 80, 100, 120};
Use more damage look-up tables
2019-01-05 19:02:01 +01:00
static const u8 sTrumpCardPowerTable[] = {200, 80, 60, 50, 40};
Natural Gift
2019-05-20 12:03:00 +02:00
const struct TypePower gNaturalGiftTable[] =
{
[ITEM_TO_BERRY(ITEM_CHERI_BERRY)] = {TYPE_FIRE, 80},
[ITEM_TO_BERRY(ITEM_CHESTO_BERRY)] = {TYPE_WATER, 80},
[ITEM_TO_BERRY(ITEM_PECHA_BERRY)] = {TYPE_ELECTRIC, 80},
[ITEM_TO_BERRY(ITEM_RAWST_BERRY)] = {TYPE_GRASS, 80},
[ITEM_TO_BERRY(ITEM_ASPEAR_BERRY)] = {TYPE_ICE, 80},
[ITEM_TO_BERRY(ITEM_LEPPA_BERRY)] = {TYPE_FIGHTING, 80},
[ITEM_TO_BERRY(ITEM_ORAN_BERRY)] = {TYPE_POISON, 80},
[ITEM_TO_BERRY(ITEM_PERSIM_BERRY)] = {TYPE_GROUND, 80},
[ITEM_TO_BERRY(ITEM_LUM_BERRY)] = {TYPE_FLYING, 80},
[ITEM_TO_BERRY(ITEM_SITRUS_BERRY)] = {TYPE_PSYCHIC, 80},
[ITEM_TO_BERRY(ITEM_FIGY_BERRY)] = {TYPE_BUG, 80},
[ITEM_TO_BERRY(ITEM_WIKI_BERRY)] = {TYPE_ROCK, 80},
[ITEM_TO_BERRY(ITEM_MAGO_BERRY)] = {TYPE_GHOST, 80},
[ITEM_TO_BERRY(ITEM_AGUAV_BERRY)] = {TYPE_DRAGON, 80},
[ITEM_TO_BERRY(ITEM_IAPAPA_BERRY)] = {TYPE_DARK, 80},
[ITEM_TO_BERRY(ITEM_RAZZ_BERRY)] = {TYPE_STEEL, 80},
[ITEM_TO_BERRY(ITEM_OCCA_BERRY)] = {TYPE_FIRE, 80},
[ITEM_TO_BERRY(ITEM_PASSHO_BERRY)] = {TYPE_WATER, 80},
[ITEM_TO_BERRY(ITEM_WACAN_BERRY)] = {TYPE_ELECTRIC, 80},
[ITEM_TO_BERRY(ITEM_RINDO_BERRY)] = {TYPE_GRASS, 80},
[ITEM_TO_BERRY(ITEM_YACHE_BERRY)] = {TYPE_ICE, 80},
[ITEM_TO_BERRY(ITEM_CHOPLE_BERRY)] = {TYPE_FIGHTING, 80},
[ITEM_TO_BERRY(ITEM_KEBIA_BERRY)] = {TYPE_POISON, 80},
[ITEM_TO_BERRY(ITEM_SHUCA_BERRY)] = {TYPE_GROUND, 80},
[ITEM_TO_BERRY(ITEM_COBA_BERRY)] = {TYPE_FLYING, 80},
[ITEM_TO_BERRY(ITEM_PAYAPA_BERRY)] = {TYPE_PSYCHIC, 80},
[ITEM_TO_BERRY(ITEM_TANGA_BERRY)] = {TYPE_BUG, 80},
[ITEM_TO_BERRY(ITEM_CHARTI_BERRY)] = {TYPE_ROCK, 80},
[ITEM_TO_BERRY(ITEM_KASIB_BERRY)] = {TYPE_GHOST, 80},
[ITEM_TO_BERRY(ITEM_HABAN_BERRY)] = {TYPE_DRAGON, 80},
[ITEM_TO_BERRY(ITEM_COLBUR_BERRY)] = {TYPE_DARK, 80},
[ITEM_TO_BERRY(ITEM_BABIRI_BERRY)] = {TYPE_STEEL, 80},
[ITEM_TO_BERRY(ITEM_CHILAN_BERRY)] = {TYPE_NORMAL, 80},
[ITEM_TO_BERRY(ITEM_ROSELI_BERRY)] = {TYPE_FAIRY, 80},
[ITEM_TO_BERRY(ITEM_BLUK_BERRY)] = {TYPE_FIRE, 90},
[ITEM_TO_BERRY(ITEM_NANAB_BERRY)] = {TYPE_WATER, 90},
[ITEM_TO_BERRY(ITEM_WEPEAR_BERRY)] = {TYPE_ELECTRIC, 90},
[ITEM_TO_BERRY(ITEM_PINAP_BERRY)] = {TYPE_GRASS, 90},
[ITEM_TO_BERRY(ITEM_POMEG_BERRY)] = {TYPE_ICE, 90},
[ITEM_TO_BERRY(ITEM_KELPSY_BERRY)] = {TYPE_FIGHTING, 90},
[ITEM_TO_BERRY(ITEM_QUALOT_BERRY)] = {TYPE_POISON, 90},
[ITEM_TO_BERRY(ITEM_HONDEW_BERRY)] = {TYPE_GROUND, 90},
[ITEM_TO_BERRY(ITEM_GREPA_BERRY)] = {TYPE_FLYING, 90},
[ITEM_TO_BERRY(ITEM_TAMATO_BERRY)] = {TYPE_PSYCHIC, 90},
[ITEM_TO_BERRY(ITEM_CORNN_BERRY)] = {TYPE_BUG, 90},
[ITEM_TO_BERRY(ITEM_MAGOST_BERRY)] = {TYPE_ROCK, 90},
[ITEM_TO_BERRY(ITEM_RABUTA_BERRY)] = {TYPE_GHOST, 90},
[ITEM_TO_BERRY(ITEM_NOMEL_BERRY)] = {TYPE_DRAGON, 90},
[ITEM_TO_BERRY(ITEM_SPELON_BERRY)] = {TYPE_DARK, 90},
[ITEM_TO_BERRY(ITEM_PAMTRE_BERRY)] = {TYPE_STEEL, 90},
[ITEM_TO_BERRY(ITEM_WATMEL_BERRY)] = {TYPE_FIRE, 100},
[ITEM_TO_BERRY(ITEM_DURIN_BERRY)] = {TYPE_WATER, 100},
[ITEM_TO_BERRY(ITEM_BELUE_BERRY)] = {TYPE_ELECTRIC, 100},
[ITEM_TO_BERRY(ITEM_LIECHI_BERRY)] = {TYPE_GRASS, 100},
[ITEM_TO_BERRY(ITEM_GANLON_BERRY)] = {TYPE_ICE, 100},
[ITEM_TO_BERRY(ITEM_SALAC_BERRY)] = {TYPE_FIGHTING, 100},
[ITEM_TO_BERRY(ITEM_PETAYA_BERRY)] = {TYPE_POISON, 100},
[ITEM_TO_BERRY(ITEM_APICOT_BERRY)] = {TYPE_GROUND, 100},
[ITEM_TO_BERRY(ITEM_LANSAT_BERRY)] = {TYPE_FLYING, 100},
[ITEM_TO_BERRY(ITEM_STARF_BERRY)] = {TYPE_PSYCHIC, 100},
[ITEM_TO_BERRY(ITEM_ENIGMA_BERRY)] = {TYPE_BUG, 100},
[ITEM_TO_BERRY(ITEM_MICLE_BERRY)] = {TYPE_ROCK, 100},
[ITEM_TO_BERRY(ITEM_CUSTAP_BERRY)] = {TYPE_GHOST, 100},
[ITEM_TO_BERRY(ITEM_JABOCA_BERRY)] = {TYPE_DRAGON, 100},
[ITEM_TO_BERRY(ITEM_ROWAP_BERRY)] = {TYPE_DARK, 100},
[ITEM_TO_BERRY(ITEM_KEE_BERRY)] = {TYPE_FAIRY, 100},
[ITEM_TO_BERRY(ITEM_MARANGA_BERRY)] = {TYPE_DARK, 100},
};
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
{
u32 i;
u16 basePower = gBattleMoves[move].power;
u32 weight, hpFraction, speed;
switch (gBattleMoves[move].effect)
{
case EFFECT_PLEDGE:
// todo
break;
case EFFECT_FLING:
Resolve review comments and encapsulate Unburden check and set.
2019-12-23 18:25:26 +01:00
// todo: program Fling + Unburden interaction
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case EFFECT_ERUPTION:
basePower = gBattleMons[battlerAtk].hp * basePower / gBattleMons[battlerAtk].maxHP;
break;
case EFFECT_FLAIL:
hpFraction = GetScaledHPFraction(gBattleMons[battlerAtk].hp, gBattleMons[battlerAtk].maxHP, 48);
for (i = 0; i < sizeof(sFlailHpScaleToPowerTable); i += 2)
{
if (hpFraction <= sFlailHpScaleToPowerTable[i])
break;
}
basePower = sFlailHpScaleToPowerTable[i + 1];
break;
case EFFECT_RETURN:
basePower = 10 * (gBattleMons[battlerAtk].friendship) / 25;
break;
case EFFECT_FRUSTRATION:
basePower = 10 * (255 - gBattleMons[battlerAtk].friendship) / 25;
break;
case EFFECT_FURY_CUTTER:
for (i = 1; i < gDisableStructs[battlerAtk].furyCutterCounter; i++)
basePower *= 2;
break;
case EFFECT_ROLLOUT:
Merge with master
2018-10-14 20:51:34 +02:00
for (i = 1; i < (5 - gDisableStructs[battlerAtk].rolloutTimer); i++)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
basePower *= 2;
if (gBattleMons[battlerAtk].status2 & STATUS2_DEFENSE_CURL)
basePower *= 2;
break;
case EFFECT_MAGNITUDE:
basePower = gBattleStruct->magnitudeBasePower;
break;
case EFFECT_PRESENT:
basePower = gBattleStruct->presentBasePower;
break;
case EFFECT_TRIPLE_KICK:
basePower += gBattleScripting.tripleKickPower;
break;
case EFFECT_SPIT_UP:
basePower = 100 * gDisableStructs[battlerAtk].stockpileCounter;
break;
case EFFECT_REVENGE:
if ((gProtectStructs[battlerAtk].physicalDmg
&& gProtectStructs[battlerAtk].physicalBattlerId == battlerDef)
|| (gProtectStructs[battlerAtk].specialDmg
&& gProtectStructs[battlerAtk].specialBattlerId == battlerDef))
basePower *= 2;
break;
case EFFECT_WEATHER_BALL:
if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_ANY)
basePower *= 2;
break;
case EFFECT_PURSUIT:
Fix Pursuit dbl damage on switch
2019-02-24 09:55:21 +01:00
if (gActionsByTurnOrder[GetBattlerTurnOrderNum(gBattlerTarget)] == B_ACTION_SWITCH)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
basePower *= 2;
break;
case EFFECT_NATURAL_GIFT:
Natural Gift
2019-05-20 12:03:00 +02:00
basePower = gNaturalGiftTable[ITEM_TO_BERRY(gBattleMons[battlerAtk].item)].power;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case EFFECT_WAKE_UP_SLAP:
Comatose
2019-12-31 16:36:53 +01:00
if (gBattleMons[battlerDef].status1 & STATUS1_SLEEP || GetBattlerAbility(battlerDef) == ABILITY_COMATOSE)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
basePower *= 2;
break;
case EFFECT_SMELLINGSALT:
if (gBattleMons[battlerDef].status1 & STATUS1_PARALYSIS)
basePower *= 2;
break;
case EFFECT_WRING_OUT:
basePower = 120 * gBattleMons[battlerDef].hp / gBattleMons[battlerDef].maxHP;
break;
case EFFECT_HEX:
Comatose
2019-12-31 16:36:53 +01:00
if (gBattleMons[battlerDef].status1 & STATUS1_ANY || GetBattlerAbility(battlerDef) == ABILITY_COMATOSE)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
basePower *= 2;
break;
case EFFECT_ASSURANCE:
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
if (gProtectStructs[battlerDef].physicalDmg != 0 || gProtectStructs[battlerDef].specialDmg != 0 || gProtectStructs[battlerDef].confusionSelfDmg)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
basePower *= 2;
break;
case EFFECT_TRUMP_CARD:
i = GetBattleMonMoveSlot(&gBattleMons[battlerAtk], move);
if (i != 4)
{
Use more damage look-up tables
2019-01-05 19:02:01 +01:00
if (gBattleMons[battlerAtk].pp[i] >= ARRAY_COUNT(sTrumpCardPowerTable))
basePower = sTrumpCardPowerTable[ARRAY_COUNT(sTrumpCardPowerTable) - 1];
else
Fixed Trump Card's damage check
2021-10-05 00:40:36 +02:00
basePower = sTrumpCardPowerTable[gBattleMons[battlerAtk].pp[i]];
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
break;
case EFFECT_ACROBATICS:
Fix Acrobatics gem boost
2020-04-27 10:58:35 +02:00
if (gBattleMons[battlerAtk].item == ITEM_NONE
// Edge case, because removal of items happens after damage calculation.
|| (gSpecialStatuses[battlerAtk].gemBoost && GetBattlerHoldEffect(battlerAtk, FALSE) == HOLD_EFFECT_GEMS))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
basePower *= 2;
break;
case EFFECT_LOW_KICK:
weight = GetBattlerWeight(battlerDef);
for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2)
{
if (sWeightToDamageTable[i] > weight)
break;
}
if (sWeightToDamageTable[i] != 0xFFFF)
basePower = sWeightToDamageTable[i + 1];
else
basePower = 120;
break;
case EFFECT_HEAT_CRASH:
weight = GetBattlerWeight(battlerAtk) / GetBattlerWeight(battlerDef);
Fixed Heat Crash's power table name
2021-10-05 01:17:43 +02:00
if (weight >= ARRAY_COUNT(sHeatCrashPowerTable))
basePower = sHeatCrashPowerTable[ARRAY_COUNT(sHeatCrashPowerTable) - 1];
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
else
Fix heat crash/heavy slam calculation
2021-11-09 18:12:40 +01:00
basePower = sHeatCrashPowerTable[weight];
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case EFFECT_PUNISHMENT:
Fix Punishment dmg
2019-11-03 19:58:04 +01:00
basePower = 60 + (CountBattlerStatIncreases(battlerDef, FALSE) * 20);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
if (basePower > 200)
basePower = 200;
break;
case EFFECT_STORED_POWER:
Fix Stored Power's Power
2018-11-30 20:52:39 +01:00
basePower += (CountBattlerStatIncreases(battlerAtk, TRUE) * 20);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case EFFECT_ELECTRO_BALL:
speed = GetBattlerTotalSpeedStat(battlerAtk) / GetBattlerTotalSpeedStat(battlerDef);
Use more damage look-up tables
2019-01-05 19:02:01 +01:00
if (speed >= ARRAY_COUNT(sSpeedDiffPowerTable))
speed = ARRAY_COUNT(sSpeedDiffPowerTable) - 1;
basePower = sSpeedDiffPowerTable[speed];
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case EFFECT_GYRO_BALL:
basePower = ((25 * GetBattlerTotalSpeedStat(battlerDef)) / GetBattlerTotalSpeedStat(battlerAtk)) + 1;
if (basePower > 150)
basePower = 150;
break;
case EFFECT_ECHOED_VOICE:
fix echoed voice power boost
2021-09-09 17:15:58 +02:00
// gBattleStruct->sameMoveTurns incremented in ppreduce
if (gBattleStruct->sameMoveTurns[battlerAtk] != 0)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
tweak formula
2021-09-09 19:54:16 +02:00
basePower += (basePower * gBattleStruct->sameMoveTurns[battlerAtk]);
better echoed voice power boost
2021-09-09 19:38:46 +02:00
if (basePower > 200)
basePower = 200;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
break;
case EFFECT_PAYBACK:
Option for setting Payback's damage double damage if the opponent switches out. (#338) * Option for setting Payback's damage double damage if the opponent switches out. * Simplified * Moody moved to ability settings
2020-04-20 00:00:44 +02:00
if (GetBattlerTurnOrderNum(battlerAtk) > GetBattlerTurnOrderNum(battlerDef)
&& (gDisableStructs[battlerDef].isFirstTurn != 2 || B_PAYBACK_SWITCH_BOOST < GEN_5))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
basePower *= 2;
break;
Gen 8 moves initial commit Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 07:50:54 +01:00
case EFFECT_BOLT_BEAK:
if (GetBattlerTurnOrderNum(battlerAtk) < GetBattlerTurnOrderNum(battlerDef))
basePower *= 2;
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
case EFFECT_ROUND:
if (gChosenMoveByBattler[BATTLE_PARTNER(battlerAtk)] == MOVE_ROUND && !(gAbsentBattlerFlags & gBitTable[BATTLE_PARTNER(battlerAtk)]))
basePower *= 2;
break;
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
case EFFECT_FUSION_COMBO:
if (gBattleMoves[gLastUsedMove].effect == EFFECT_FUSION_COMBO && move != gLastUsedMove)
basePower *= 2;
break;
coaching, lash out, burning jealousy
2021-01-28 20:21:11 +01:00
case EFFECT_LASH_OUT:
fix lash out stat fell
2021-09-23 03:15:02 +02:00
if (gProtectStructs[battlerAtk].statFell)
coaching, lash out, burning jealousy
2021-01-28 20:21:11 +01:00
basePower *= 2;
break;
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
case EFFECT_EXPLOSION:
if (move == MOVE_MISTY_EXPLOSION && gFieldStatuses & STATUS_FIELD_MISTY_TERRAIN && IsBattlerGrounded(battlerAtk))
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
MulModifier(&basePower, UQ_4_12(1.5));
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
break;
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
case EFFECT_DYNAMAX_DOUBLE_DMG:
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
#ifdef B_DYNAMAX
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 17:38:54 +02:00
if (IsDynamaxed(battlerDef))
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 21:27:00 +01:00
basePower *= 2;
#endif
break;
Setting for pre-Gen6 Hidden Power Damage.
2021-10-11 01:26:38 +02:00
case EFFECT_HIDDEN_POWER:
{
#if B_HIDDEN_POWER_DMG < GEN_6
u8 powerBits;
powerBits = ((gBattleMons[gBattlerAttacker].hpIV & 2) >> 1)
| ((gBattleMons[gBattlerAttacker].attackIV & 2) << 0)
| ((gBattleMons[gBattlerAttacker].defenseIV & 2) << 1)
| ((gBattleMons[gBattlerAttacker].speedIV & 2) << 2)
| ((gBattleMons[gBattlerAttacker].spAttackIV & 2) << 3)
| ((gBattleMons[gBattlerAttacker].spDefenseIV & 2) << 4);
basePower = (40 * powerBits) / 63 + 30;
#endif
break;
}
Gave Grav Apple a move effect of its own
2021-10-17 14:27:35 +02:00
case EFFECT_GRAV_APPLE:
if (gFieldStatuses & STATUS_FIELD_GRAVITY)
MulModifier(&basePower, UQ_4_12(1.5));
break;
Terrain Pulse effect implemented
2021-10-05 03:45:37 +02:00
case EFFECT_TERRAIN_PULSE:
if ((gFieldStatuses & STATUS_FIELD_TERRAIN_ANY)
&& IsBattlerGrounded(gBattlerAttacker))
basePower *= 2;
break;
Expanding Force
2021-06-15 16:25:59 +02:00
case EFFECT_EXPANDING_FORCE:
Fix terrain checks on DLC moves Expanding Force and Rising Voltage now boost damage correctly. Expanding Force doesn't hit both targets yet however.
2021-11-19 08:20:16 +01:00
if (IsBattlerTerrainAffected(gBattlerAttacker, STATUS_FIELD_PSYCHIC_TERRAIN))
MulModifier(&basePower, UQ_4_12(1.5));
Expanding Force
2021-06-15 16:25:59 +02:00
break;
Rising Voltage
2021-06-15 17:36:50 +02:00
case EFFECT_RISING_VOLTAGE:
Fix terrain checks on DLC moves Expanding Force and Rising Voltage now boost damage correctly. Expanding Force doesn't hit both targets yet however.
2021-11-19 08:20:16 +01:00
if (IsBattlerTerrainAffected(gBattlerTarget, STATUS_FIELD_ELECTRIC_TERRAIN))
basePower *= 2;
Rising Voltage
2021-06-15 17:36:50 +02:00
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-19 05:48:11 +01:00
// Move-specific base power changes
Implemented Battle Bond
2021-10-02 03:32:48 +02:00
switch (move)
{
case MOVE_WATER_SHURIKEN:
if (gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH)
basePower = 20;
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
if (basePower == 0)
basePower = 1;
return basePower;
}
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, bool32 updateFlags)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
u32 i, ability;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
u32 holdEffectAtk, holdEffectParamAtk;
u16 basePower = CalcMoveBasePower(move, battlerAtk, battlerDef);
u16 holdEffectModifier;
u16 modifier = UQ_4_12(1.0);
Turned Retaliate's effect into a side status
2021-10-15 11:00:24 +02:00
u32 atkSide = GET_BATTLER_SIDE(battlerAtk);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// attacker's abilities
switch (GetBattlerAbility(battlerAtk))
{
case ABILITY_TECHNICIAN:
if (basePower <= 60)
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_FLARE_BOOST:
if (gBattleMons[battlerAtk].status1 & STATUS1_BURN && IS_MOVE_SPECIAL(move))
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_TOXIC_BOOST:
if (gBattleMons[battlerAtk].status1 & STATUS1_PSN_ANY && IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_RECKLESS:
if (gBattleMoves[move].flags & FLAG_RECKLESS_BOOST)
MulModifier(&modifier, UQ_4_12(1.2));
break;
case ABILITY_IRON_FIST:
if (gBattleMoves[move].flags & FLAG_IRON_FIST_BOOST)
MulModifier(&modifier, UQ_4_12(1.2));
break;
case ABILITY_SHEER_FORCE:
if (gBattleMoves[move].flags & FLAG_SHEER_FORCE_BOOST)
MulModifier(&modifier, UQ_4_12(1.3));
break;
case ABILITY_SAND_FORCE:
Update battle_util.c Added weather check for the ability Sand Force.
2021-02-01 04:43:16 +01:00
if ((moveType == TYPE_STEEL || moveType == TYPE_ROCK || moveType == TYPE_GROUND)
&& WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SANDSTORM_ANY)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.3));
break;
case ABILITY_RIVALRY:
if (GetGenderFromSpeciesAndPersonality(gBattleMons[battlerAtk].species, gBattleMons[battlerAtk].personality) != MON_GENDERLESS
&& GetGenderFromSpeciesAndPersonality(gBattleMons[battlerDef].species, gBattleMons[battlerDef].personality) != MON_GENDERLESS)
{
if (GetGenderFromSpeciesAndPersonality(gBattleMons[battlerAtk].species, gBattleMons[battlerAtk].personality)
== GetGenderFromSpeciesAndPersonality(gBattleMons[battlerDef].species, gBattleMons[battlerDef].personality))
MulModifier(&modifier, UQ_4_12(1.25));
else
MulModifier(&modifier, UQ_4_12(0.75));
}
break;
case ABILITY_ANALYTIC:
if (GetBattlerTurnOrderNum(battlerAtk) == gBattlersCount - 1 && move != MOVE_FUTURE_SIGHT && move != MOVE_DOOM_DESIRE)
MulModifier(&modifier, UQ_4_12(1.3));
break;
case ABILITY_TOUGH_CLAWS:
Only thing left is making IsMoveMakingContact work when hitting King's Shield, etc.
2021-06-05 22:47:05 +02:00
if (IsMoveMakingContact(move, battlerAtk))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.3));
break;
case ABILITY_STRONG_JAW:
if (gBattleMoves[move].flags & FLAG_STRONG_JAW_BOOST)
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_MEGA_LAUNCHER:
if (gBattleMoves[move].flags & FLAG_MEGA_LAUNCHER_BOOST)
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_WATER_BUBBLE:
if (moveType == TYPE_WATER)
MulModifier(&modifier, UQ_4_12(2.0));
break;
case ABILITY_STEELWORKER:
if (moveType == TYPE_STEEL)
MulModifier(&modifier, UQ_4_12(1.5));
break;
ate abilities
2018-07-28 18:41:57 +02:00
case ABILITY_PIXILATE:
if (moveType == TYPE_FAIRY && gBattleStruct->ateBoost[battlerAtk])
MulModifier(&modifier, UQ_4_12(1.2));
break;
case ABILITY_GALVANIZE:
if (moveType == TYPE_ELECTRIC && gBattleStruct->ateBoost[battlerAtk])
MulModifier(&modifier, UQ_4_12(1.2));
break;
case ABILITY_REFRIGERATE:
if (moveType == TYPE_ICE && gBattleStruct->ateBoost[battlerAtk])
MulModifier(&modifier, UQ_4_12(1.2));
break;
case ABILITY_AERILATE:
if (moveType == TYPE_FLYING && gBattleStruct->ateBoost[battlerAtk])
MulModifier(&modifier, UQ_4_12(1.2));
break;
case ABILITY_NORMALIZE:
if (moveType == TYPE_NORMAL && gBattleStruct->ateBoost[battlerAtk])
MulModifier(&modifier, UQ_4_12(1.2));
break;
Implemented Punk Rock
2020-12-11 23:46:33 +01:00
case ABILITY_PUNK_ROCK:
Removed redundant check in Punk Rock's effect
2020-12-19 23:15:12 +01:00
if (gBattleMoves[move].flags & FLAG_SOUND)
Implemented Punk Rock
2020-12-11 23:46:33 +01:00
MulModifier(&modifier, UQ_4_12(1.3));
break;
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
case ABILITY_STEELY_SPIRIT:
if (moveType == TYPE_STEEL)
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_TRANSISTOR:
if (moveType == TYPE_ELECTRIC)
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_DRAGONS_MAW:
if (moveType == TYPE_DRAGON)
MulModifier(&modifier, UQ_4_12(1.5));
break;
Implement Gorilla Tactics It's Choice Band but as an ability.
2021-10-30 07:31:44 +02:00
case ABILITY_GORILLA_TACTICS:
if (IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(1.5));
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
// field abilities
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
if ((IsAbilityOnField(ABILITY_DARK_AURA) && moveType == TYPE_DARK)
|| (IsAbilityOnField(ABILITY_FAIRY_AURA) && moveType == TYPE_FAIRY))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
if (IsAbilityOnField(ABILITY_AURA_BREAK))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(0.75));
else
Fix Dark Aura and Fairy Aura Damage boost should be 33%, not 25%.
2021-11-15 09:40:20 +01:00
MulModifier(&modifier, UQ_4_12(1.33));
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
// attacker partner's abilities
if (IsBattlerAlive(BATTLE_PARTNER(battlerAtk)))
{
switch (GetBattlerAbility(BATTLE_PARTNER(battlerAtk)))
{
case ABILITY_BATTERY:
if (IS_MOVE_SPECIAL(move))
MulModifier(&modifier, UQ_4_12(1.3));
break;
Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers
2021-01-05 23:51:52 +01:00
case ABILITY_POWER_SPOT:
MulModifier(&modifier, UQ_4_12(1.3));
break;
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
case ABILITY_STEELY_SPIRIT:
if (moveType == TYPE_STEEL)
MulModifier(&modifier, UQ_4_12(1.5));
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
}
// target's abilities
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
ability = GetBattlerAbility(battlerDef);
switch (ability)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
case ABILITY_HEATPROOF:
case ABILITY_WATER_BUBBLE:
if (moveType == TYPE_FIRE)
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(0.5));
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
if (updateFlags)
RecordAbilityBattle(battlerDef, ability);
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case ABILITY_DRY_SKIN:
if (moveType == TYPE_FIRE)
MulModifier(&modifier, UQ_4_12(1.25));
break;
case ABILITY_FLUFFY:
if (IsMoveMakingContact(move, battlerAtk))
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(0.5));
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
if (updateFlags)
RecordAbilityBattle(battlerDef, ability);
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
if (moveType == TYPE_FIRE)
MulModifier(&modifier, UQ_4_12(2.0));
break;
}
holdEffectAtk = GetBattlerHoldEffect(battlerAtk, TRUE);
holdEffectParamAtk = GetBattlerHoldEffectParam(battlerAtk);
if (holdEffectParamAtk > 100)
holdEffectParamAtk = 100;
holdEffectModifier = UQ_4_12(1.0) + sPercentToModifier[holdEffectParamAtk];
// attacker's hold effect
switch (holdEffectAtk)
{
case HOLD_EFFECT_MUSCLE_BAND:
if (IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, holdEffectModifier);
break;
case HOLD_EFFECT_WISE_GLASSES:
if (IS_MOVE_SPECIAL(move))
MulModifier(&modifier, holdEffectModifier);
break;
case HOLD_EFFECT_LUSTROUS_ORB:
if (gBattleMons[battlerAtk].species == SPECIES_PALKIA && (moveType == TYPE_WATER || moveType == TYPE_DRAGON))
MulModifier(&modifier, holdEffectModifier);
break;
case HOLD_EFFECT_ADAMANT_ORB:
if (gBattleMons[battlerAtk].species == SPECIES_DIALGA && (moveType == TYPE_STEEL || moveType == TYPE_DRAGON))
MulModifier(&modifier, holdEffectModifier);
break;
case HOLD_EFFECT_GRISEOUS_ORB:
if (gBattleMons[battlerAtk].species == SPECIES_GIRATINA && (moveType == TYPE_GHOST || moveType == TYPE_DRAGON))
MulModifier(&modifier, holdEffectModifier);
break;
case HOLD_EFFECT_SOUL_DEW:
Review changes
2021-11-05 01:00:39 +01:00
#if B_SOUL_DEW_BOOST >= GEN_7
if ((gBattleMons[battlerAtk].species == SPECIES_LATIAS || gBattleMons[battlerAtk].species == SPECIES_LATIOS) && (moveType == TYPE_PSYCHIC || moveType == TYPE_DRAGON))
#else
Fixed the offensive boost of the Soul Dew
2021-11-07 18:40:18 +01:00
if ((gBattleMons[battlerAtk].species == SPECIES_LATIAS || gBattleMons[battlerAtk].species == SPECIES_LATIOS) && !(gBattleTypeFlags & BATTLE_TYPE_FRONTIER) && IS_MOVE_SPECIAL(move))
Review changes
2021-11-05 01:00:39 +01:00
#endif
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, holdEffectModifier);
break;
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
case HOLD_EFFECT_GEMS:
if (gSpecialStatuses[battlerAtk].gemBoost && gBattleMons[battlerAtk].item)
MulModifier(&modifier, UQ_4_12(1.0) + sPercentToModifier[gSpecialStatuses[battlerAtk].gemParam]);
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
case HOLD_EFFECT_BUG_POWER:
case HOLD_EFFECT_STEEL_POWER:
case HOLD_EFFECT_GROUND_POWER:
case HOLD_EFFECT_ROCK_POWER:
case HOLD_EFFECT_GRASS_POWER:
case HOLD_EFFECT_DARK_POWER:
case HOLD_EFFECT_FIGHTING_POWER:
case HOLD_EFFECT_ELECTRIC_POWER:
case HOLD_EFFECT_WATER_POWER:
case HOLD_EFFECT_FLYING_POWER:
case HOLD_EFFECT_POISON_POWER:
case HOLD_EFFECT_ICE_POWER:
case HOLD_EFFECT_GHOST_POWER:
case HOLD_EFFECT_PSYCHIC_POWER:
case HOLD_EFFECT_FIRE_POWER:
case HOLD_EFFECT_DRAGON_POWER:
case HOLD_EFFECT_NORMAL_POWER:
case HOLD_EFFECT_FAIRY_POWER:
for (i = 0; i < ARRAY_COUNT(sHoldEffectToType); i++)
{
if (holdEffectAtk == sHoldEffectToType[i][0])
{
if (moveType == sHoldEffectToType[i][1])
MulModifier(&modifier, holdEffectModifier);
break;
}
}
break;
Add damage calc for plates
2020-11-08 08:57:52 +01:00
case HOLD_EFFECT_PLATE:
if (moveType == ItemId_GetSecondaryId(gBattleMons[battlerAtk].item))
MulModifier(&modifier, holdEffectModifier);
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
// move effect
switch (gBattleMoves[move].effect)
{
case EFFECT_FACADE:
if (gBattleMons[battlerAtk].status1 & (STATUS1_BURN | STATUS1_PSN_ANY | STATUS1_PARALYSIS))
MulModifier(&modifier, UQ_4_12(2.0));
break;
case EFFECT_BRINE:
Fix Brine (#388) Addresses #387
2020-05-24 10:05:26 +02:00
if (gBattleMons[battlerDef].hp <= (gBattleMons[battlerDef].maxHP / 2))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(2.0));
break;
case EFFECT_VENOSHOCK:
Fix Venoshock Damage should double if target is poisoned, not attacker.
2021-08-25 12:57:10 +02:00
if (gBattleMons[battlerDef].status1 & STATUS1_PSN_ANY)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(2.0));
break;
Fixed Retaliate's naming.
2021-09-24 16:02:26 +02:00
case EFFECT_RETALIATE:
Turned Retaliate into a side timer
2021-10-16 10:41:50 +02:00
if (gSideTimers[atkSide].retaliateTimer == 1)
Implemented Retaliate's effect
2021-10-11 08:16:59 +02:00
MulModifier(&modifier, UQ_4_12(2.0));
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case EFFECT_SOLARBEAM:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (IsBattlerWeatherAffected(battlerAtk, (WEATHER_HAIL_ANY | WEATHER_SANDSTORM_ANY | WEATHER_RAIN_ANY)))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(0.5));
break;
Stomping Tantrum Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles base power if the timer is set.
2019-04-01 16:28:17 +02:00
case EFFECT_STOMPING_TANTRUM:
if (gBattleStruct->lastMoveFailed & gBitTable[battlerAtk])
MulModifier(&modifier, UQ_4_12(2.0));
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
case EFFECT_BULLDOZE:
case EFFECT_MAGNITUDE:
case EFFECT_EARTHQUAKE:
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
if (gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN && !(gStatuses3[battlerDef] & STATUS3_SEMI_INVULNERABLE))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(0.5));
break;
case EFFECT_KNOCK_OFF:
Fix Knock Off, add config Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
2021-11-12 09:05:42 +01:00
#if B_KNOCK_OFF_DMG >= GEN_6
if (gBattleMons[battlerDef].item != ITEM_NONE
&& CanBattlerGetOrLoseItem(battlerDef, gBattleMons[battlerDef].item))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
Fix Knock Off, add config Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
2021-11-12 09:05:42 +01:00
#endif
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
}
// various effecs
if (gProtectStructs[battlerAtk].helpingHand)
MulModifier(&modifier, UQ_4_12(1.5));
if (gStatuses3[battlerAtk] & STATUS3_CHARGED_UP && moveType == TYPE_ELECTRIC)
MulModifier(&modifier, UQ_4_12(2.0));
if (gStatuses3[battlerAtk] & STATUS3_ME_FIRST)
MulModifier(&modifier, UQ_4_12(1.5));
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
if (gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN && moveType == TYPE_GRASS && IsBattlerGrounded(battlerAtk) && !(gStatuses3[battlerAtk] & STATUS3_SEMI_INVULNERABLE))
More Battle configs (#339) * Fixed naming of King Shield's description variable. * Config for King Shield lowering attack. * Config for terrain type attack boost. * Standarized battle config descriptions. * Adjusted config logic accounting for GEN_8. * Changed KING_S_SHIELD back to KINGS_SHIELD * Missed B_ABILITY_WEATHER.
2020-04-20 14:11:28 +02:00
MulModifier(&modifier, (B_TERRAIN_TYPE_BOOST >= GEN_8) ? UQ_4_12(1.3) : UQ_4_12(1.5));
Grassy Terrain v2 All corrected, simplest version Also includes proper ending strings for all terrains
2019-03-02 23:54:08 +01:00
if (gFieldStatuses & STATUS_FIELD_MISTY_TERRAIN && moveType == TYPE_DRAGON && IsBattlerGrounded(battlerDef) && !(gStatuses3[battlerDef] & STATUS3_SEMI_INVULNERABLE))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(0.5));
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN && moveType == TYPE_ELECTRIC && IsBattlerGrounded(battlerAtk) && !(gStatuses3[battlerAtk] & STATUS3_SEMI_INVULNERABLE))
More Battle configs (#339) * Fixed naming of King Shield's description variable. * Config for King Shield lowering attack. * Config for terrain type attack boost. * Standarized battle config descriptions. * Adjusted config logic accounting for GEN_8. * Changed KING_S_SHIELD back to KINGS_SHIELD * Missed B_ABILITY_WEATHER.
2020-04-20 14:11:28 +02:00
MulModifier(&modifier, (B_TERRAIN_TYPE_BOOST >= GEN_8) ? UQ_4_12(1.3) : UQ_4_12(1.5));
Grassy Terrain + minor fixes Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack
2019-02-28 15:02:54 +01:00
if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN && moveType == TYPE_PSYCHIC && IsBattlerGrounded(battlerAtk) && !(gStatuses3[battlerAtk] & STATUS3_SEMI_INVULNERABLE))
More Battle configs (#339) * Fixed naming of King Shield's description variable. * Config for King Shield lowering attack. * Config for terrain type attack boost. * Standarized battle config descriptions. * Adjusted config logic accounting for GEN_8. * Changed KING_S_SHIELD back to KINGS_SHIELD * Missed B_ABILITY_WEATHER.
2020-04-20 14:11:28 +02:00
MulModifier(&modifier, (B_TERRAIN_TYPE_BOOST >= GEN_8) ? UQ_4_12(1.3) : UQ_4_12(1.5));
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
return ApplyModifier(modifier, basePower);
}
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, bool32 isCrit, bool32 updateFlags)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
u8 atkStage;
u32 atkStat;
u16 modifier;
if (gBattleMoves[move].effect == EFFECT_FOUL_PLAY)
{
if (IS_MOVE_PHYSICAL(move))
Fix physical atk stat stage and third type
2018-11-17 23:47:35 +01:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
atkStat = gBattleMons[battlerDef].attack;
Fix physical atk stat stage and third type
2018-11-17 23:47:35 +01:00
atkStage = gBattleMons[battlerDef].statStages[STAT_ATK];
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
else
Fix physical atk stat stage and third type
2018-11-17 23:47:35 +01:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
atkStat = gBattleMons[battlerDef].spAttack;
Fix physical atk stat stage and third type
2018-11-17 23:47:35 +01:00
atkStage = gBattleMons[battlerDef].statStages[STAT_SPATK];
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
Fix Foul Play if != else if. Pretty sure I broke this when adding Body Press.
2021-09-22 05:44:13 +02:00
else if (gBattleMoves[move].effect == EFFECT_BODY_PRESS)
Implement Body Press' effect Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 10:56:44 +01:00
{
Remove special Body Press effect Only include the official effect for Body Press to stay faithful to the gen 8 games.
2021-03-16 11:37:02 +01:00
atkStat = gBattleMons[battlerAtk].defense;
atkStage = gBattleMons[battlerAtk].statStages[STAT_DEF];
Implement Body Press' effect Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 10:56:44 +01:00
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
else
{
if (IS_MOVE_PHYSICAL(move))
Fix physical atk stat stage and third type
2018-11-17 23:47:35 +01:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
atkStat = gBattleMons[battlerAtk].attack;
Fix physical atk stat stage and third type
2018-11-17 23:47:35 +01:00
atkStage = gBattleMons[battlerAtk].statStages[STAT_ATK];
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
else
Fix physical atk stat stage and third type
2018-11-17 23:47:35 +01:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
atkStat = gBattleMons[battlerAtk].spAttack;
Fix physical atk stat stage and third type
2018-11-17 23:47:35 +01:00
atkStage = gBattleMons[battlerAtk].statStages[STAT_SPATK];
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
// critical hits ignore attack stat's stage drops
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
if (isCrit && atkStage < DEFAULT_STAT_STAGE)
atkStage = DEFAULT_STAT_STAGE;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// pokemon with unaware ignore attack stat changes while taking damage
if (GetBattlerAbility(battlerDef) == ABILITY_UNAWARE)
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
atkStage = DEFAULT_STAT_STAGE;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
atkStat *= gStatStageRatios[atkStage][0];
atkStat /= gStatStageRatios[atkStage][1];
// apply attack stat modifiers
modifier = UQ_4_12(1.0);
// attacker's abilities
switch (GetBattlerAbility(battlerAtk))
{
case ABILITY_HUGE_POWER:
case ABILITY_PURE_POWER:
if (IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(2.0));
break;
case ABILITY_SLOW_START:
if (gDisableStructs[battlerAtk].slowStartTimer != 0)
MulModifier(&modifier, UQ_4_12(0.5));
break;
case ABILITY_SOLAR_POWER:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (IS_MOVE_SPECIAL(move) && IsBattlerWeatherAffected(battlerAtk, WEATHER_SUN_ANY))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_DEFEATIST:
Fixed Defeatist's check
2021-04-01 01:17:05 +02:00
if (gBattleMons[battlerAtk].hp <= (gBattleMons[battlerAtk].maxHP / 2))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(0.5));
break;
case ABILITY_FLASH_FIRE:
Add Roost endturn effect
2018-07-19 21:18:20 +02:00
if (moveType == TYPE_FIRE && gBattleResources->flags->flags[battlerAtk] & RESOURCE_FLAG_FLASH_FIRE)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_SWARM:
if (moveType == TYPE_BUG && gBattleMons[battlerAtk].hp <= (gBattleMons[battlerAtk].maxHP / 3))
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_TORRENT:
if (moveType == TYPE_WATER && gBattleMons[battlerAtk].hp <= (gBattleMons[battlerAtk].maxHP / 3))
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_BLAZE:
if (moveType == TYPE_FIRE && gBattleMons[battlerAtk].hp <= (gBattleMons[battlerAtk].maxHP / 3))
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_OVERGROW:
if (moveType == TYPE_GRASS && gBattleMons[battlerAtk].hp <= (gBattleMons[battlerAtk].maxHP / 3))
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_PLUS:
case ABILITY_MINUS:
if (IsBattlerAlive(BATTLE_PARTNER(battlerAtk)))
{
u32 partnerAbility = GetBattlerAbility(BATTLE_PARTNER(battlerAtk));
if (partnerAbility == ABILITY_PLUS || partnerAbility == ABILITY_MINUS)
MulModifier(&modifier, UQ_4_12(1.5));
}
break;
case ABILITY_FLOWER_GIFT:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (gBattleMons[battlerAtk].species == SPECIES_CHERRIM && IsBattlerWeatherAffected(battlerAtk, WEATHER_SUN_ANY) && IS_MOVE_PHYSICAL(move))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
break;
case ABILITY_HUSTLE:
if (IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(1.5));
break;
Stakeout
2020-04-18 19:15:24 +02:00
case ABILITY_STAKEOUT:
if (gDisableStructs[battlerDef].isFirstTurn == 2) // just switched in
MulModifier(&modifier, UQ_4_12(2.0));
break;
Implemented Guts' missing effect
2020-11-17 00:22:59 +01:00
case ABILITY_GUTS:
if (gBattleMons[battlerAtk].status1 & STATUS1_ANY && IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(1.5));
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
// target's abilities
switch (GetBattlerAbility(battlerDef))
{
case ABILITY_THICK_FAT:
if (moveType == TYPE_FIRE || moveType == TYPE_ICE)
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(0.5));
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
if (updateFlags)
RecordAbilityBattle(battlerDef, ABILITY_THICK_FAT);
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
Implemented Ice Scales
2020-12-12 23:39:35 +01:00
case ABILITY_ICE_SCALES:
if (IS_MOVE_SPECIAL(move))
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
MulModifier(&modifier, UQ_4_12(0.5));
Implemented Ice Scales
2020-12-12 23:39:35 +01:00
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
// ally's abilities
if (IsBattlerAlive(BATTLE_PARTNER(battlerAtk)))
{
switch (GetBattlerAbility(BATTLE_PARTNER(battlerAtk)))
{
case ABILITY_FLOWER_GIFT:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (gBattleMons[BATTLE_PARTNER(battlerAtk)].species == SPECIES_CHERRIM && IsBattlerWeatherAffected(BATTLE_PARTNER(battlerAtk), WEATHER_SUN_ANY) && IS_MOVE_PHYSICAL(move))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
break;
}
}
// attacker's hold effect
switch (GetBattlerHoldEffect(battlerAtk, TRUE))
{
case HOLD_EFFECT_THICK_CLUB:
Corrected base species check for Thick Club's effect Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-20 23:30:48 +01:00
if ((GET_BASE_SPECIES_ID(gBattleMons[battlerAtk].species) == SPECIES_CUBONE
|| GET_BASE_SPECIES_ID(gBattleMons[battlerAtk].species) == SPECIES_MAROWAK)
Made Alolan Marowak be affected by Thick Club
2021-01-03 13:58:19 +01:00
&& IS_MOVE_PHYSICAL(move))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(2.0));
break;
case HOLD_EFFECT_DEEP_SEA_TOOTH:
if (gBattleMons[battlerAtk].species == SPECIES_CLAMPERL && IS_MOVE_SPECIAL(move))
MulModifier(&modifier, UQ_4_12(2.0));
break;
case HOLD_EFFECT_LIGHT_BALL:
if (gBattleMons[battlerAtk].species == SPECIES_PIKACHU)
MulModifier(&modifier, UQ_4_12(2.0));
break;
case HOLD_EFFECT_CHOICE_BAND:
if (IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(1.5));
break;
case HOLD_EFFECT_CHOICE_SPECS:
if (IS_MOVE_SPECIAL(move))
MulModifier(&modifier, UQ_4_12(1.5));
break;
}
Review corrections
2020-10-21 20:01:53 +02:00
// The offensive stats of a Player's Pokémon are boosted by x1.1 (+10%) if they have the 1st badge and 7th badges.
// Having the 1st badge boosts physical attack while having the 7th badge boosts special attack.
More review corrections
2020-10-21 21:39:06 +02:00
if (ShouldGetStatBadgeBoost(FLAG_BADGE01_GET, battlerAtk) && IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(1.1));
if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, battlerAtk) && IS_MOVE_SPECIAL(move))
MulModifier(&modifier, UQ_4_12(1.1));
Reincorporated badge based stat boosts
2020-10-21 16:44:03 +02:00
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
return ApplyModifier(modifier, atkStat);
}
Eviolite
2020-03-14 12:23:51 +01:00
static bool32 CanEvolve(u32 species)
{
u32 i;
for (i = 0; i < EVOS_PER_MON; i++)
{
Small tweak
2021-08-25 07:16:38 +02:00
if (gEvolutionTable[species][i].method
&& gEvolutionTable[species][i].method != EVO_MEGA_EVOLUTION
Implemented Primal Reversion
2021-08-25 08:35:21 +02:00
&& gEvolutionTable[species][i].method != EVO_MOVE_MEGA_EVOLUTION
&& gEvolutionTable[species][i].method != EVO_PRIMAL_REVERSION)
Eviolite
2020-03-14 12:23:51 +01:00
return TRUE;
}
return FALSE;
}
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
static u32 CalcDefenseStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, bool32 isCrit, bool32 updateFlags)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
bool32 usesDefStat;
u8 defStage;
u32 defStat, def, spDef;
u16 modifier;
if (gFieldStatuses & STATUS_FIELD_WONDER_ROOM) // the defense stats are swapped
{
def = gBattleMons[battlerDef].spDefense;
spDef = gBattleMons[battlerDef].defense;
}
else
{
def = gBattleMons[battlerDef].defense;
spDef = gBattleMons[battlerDef].spDefense;
}
if (gBattleMoves[move].effect == EFFECT_PSYSHOCK || IS_MOVE_PHYSICAL(move)) // uses defense stat instead of sp.def
{
defStat = def;
defStage = gBattleMons[battlerDef].statStages[STAT_DEF];
usesDefStat = TRUE;
}
else // is special
{
defStat = spDef;
defStage = gBattleMons[battlerDef].statStages[STAT_SPDEF];
usesDefStat = FALSE;
}
// critical hits ignore positive stat changes
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
if (isCrit && defStage > DEFAULT_STAT_STAGE)
defStage = DEFAULT_STAT_STAGE;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// pokemon with unaware ignore defense stat changes while dealing damage
if (GetBattlerAbility(battlerAtk) == ABILITY_UNAWARE)
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
defStage = DEFAULT_STAT_STAGE;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// certain moves also ignore stat changes
if (gBattleMoves[move].flags & FLAG_STAT_STAGES_IGNORED)
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
defStage = DEFAULT_STAT_STAGE;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
defStat *= gStatStageRatios[defStage][0];
defStat /= gStatStageRatios[defStage][1];
// apply defense stat modifiers
modifier = UQ_4_12(1.0);
// target's abilities
switch (GetBattlerAbility(battlerDef))
{
case ABILITY_MARVEL_SCALE:
if (gBattleMons[battlerDef].status1 & STATUS1_ANY && usesDefStat)
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
if (updateFlags)
RecordAbilityBattle(battlerDef, ABILITY_MARVEL_SCALE);
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case ABILITY_FUR_COAT:
if (usesDefStat)
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(2.0));
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
if (updateFlags)
RecordAbilityBattle(battlerDef, ABILITY_FUR_COAT);
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case ABILITY_GRASS_PELT:
if (gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN && usesDefStat)
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
if (updateFlags)
RecordAbilityBattle(battlerDef, ABILITY_GRASS_PELT);
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case ABILITY_FLOWER_GIFT:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (gBattleMons[battlerDef].species == SPECIES_CHERRIM && IsBattlerWeatherAffected(battlerDef, WEATHER_SUN_ANY) && !usesDefStat)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
break;
Implemented Punk Rock
2020-12-11 23:46:33 +01:00
case ABILITY_PUNK_ROCK:
Removed redundant check in Punk Rock's effect
2020-12-19 23:15:12 +01:00
if (gBattleMoves[move].flags & FLAG_SOUND)
Update battle_util.c
2021-04-02 06:10:20 +02:00
MulModifier(&modifier, UQ_4_12(2.0));
Implemented Punk Rock
2020-12-11 23:46:33 +01:00
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
// ally's abilities
if (IsBattlerAlive(BATTLE_PARTNER(battlerDef)))
{
switch (GetBattlerAbility(BATTLE_PARTNER(battlerDef)))
{
case ABILITY_FLOWER_GIFT:
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (gBattleMons[BATTLE_PARTNER(battlerDef)].species == SPECIES_CHERRIM && IsBattlerWeatherAffected(BATTLE_PARTNER(battlerDef), WEATHER_SUN_ANY) && !usesDefStat)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
break;
}
}
// target's hold effects
switch (GetBattlerHoldEffect(battlerDef, TRUE))
{
case HOLD_EFFECT_DEEP_SEA_SCALE:
if (gBattleMons[battlerDef].species == SPECIES_CLAMPERL && !usesDefStat)
MulModifier(&modifier, UQ_4_12(2.0));
break;
case HOLD_EFFECT_METAL_POWDER:
if (gBattleMons[battlerDef].species == SPECIES_DITTO && usesDefStat && !(gBattleMons[battlerDef].status2 & STATUS2_TRANSFORMED))
MulModifier(&modifier, UQ_4_12(2.0));
break;
case HOLD_EFFECT_EVIOLITE:
Eviolite
2020-03-14 12:23:51 +01:00
if (CanEvolve(gBattleMons[battlerDef].species))
MulModifier(&modifier, UQ_4_12(1.5));
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case HOLD_EFFECT_ASSAULT_VEST:
if (!usesDefStat)
MulModifier(&modifier, UQ_4_12(1.5));
break;
Review changes
2021-11-05 01:00:39 +01:00
#if B_SOUL_DEW_BOOST <= GEN_6
case HOLD_EFFECT_SOUL_DEW:
if ((gBattleMons[battlerDef].species == SPECIES_LATIAS || gBattleMons[battlerDef].species == SPECIES_LATIOS)
&& !(gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
&& !usesDefStat)
MulModifier(&modifier, UQ_4_12(1.5));
break;
#endif
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
Special Def boost for rock types in sandstorm
2019-08-05 11:48:50 +02:00
// sandstorm sp.def boost for rock types
Fix mega evo indicator priority on lvl-up-box
2019-08-05 12:15:15 +02:00
if (IS_BATTLER_OF_TYPE(battlerDef, TYPE_ROCK) && WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SANDSTORM_ANY && !usesDefStat)
Special Def boost for rock types in sandstorm
2019-08-05 11:48:50 +02:00
MulModifier(&modifier, UQ_4_12(1.5));
Review corrections
2020-10-21 20:01:53 +02:00
// The defensive stats of a Player's Pokémon are boosted by x1.1 (+10%) if they have the 5th badge and 7th badges.
// Having the 5th badge boosts physical defense while having the 7th badge boosts special defense.
More review corrections
2020-10-21 21:39:06 +02:00
if (ShouldGetStatBadgeBoost(FLAG_BADGE05_GET, battlerDef) && IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(1.1));
if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, battlerDef) && IS_MOVE_SPECIAL(move))
MulModifier(&modifier, UQ_4_12(1.1));
Reincorporated badge based stat boosts
2020-10-21 16:44:03 +02:00
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
return ApplyModifier(modifier, defStat);
}
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, u16 typeEffectivenessModifier, bool32 isCrit, bool32 updateFlags)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
Metronome item
2020-04-22 12:49:25 +02:00
u32 percentBoost;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
u32 abilityAtk = GetBattlerAbility(battlerAtk);
u32 abilityDef = GetBattlerAbility(battlerDef);
u32 defSide = GET_BATTLER_SIDE(battlerDef);
u16 finalModifier = UQ_4_12(1.0);
Fix Unnerve not canceling out type resist berries.
2021-10-02 07:01:34 +02:00
u16 itemDef = gBattleMons[battlerDef].item;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// check multiple targets in double battle
if (GetMoveTargetCount(move, battlerAtk, battlerDef) >= 2)
MulModifier(&finalModifier, UQ_4_12(0.75));
// take type effectiveness
MulModifier(&finalModifier, typeEffectivenessModifier);
// check crit
if (isCrit)
Battle config options (#243) * Option to use pre-GenVI critical hit multiplier. * Clarified the option that multiplies EXP by 1.5 for trainer battles. * Fixed code style. * Option to change Burn damage. * Option to change to Gen 7 paralysis drop. * Ordered settings. * Implemented review suggestions.
2020-02-08 09:51:55 +01:00
dmg = ApplyModifier((B_CRIT_MULTIPLIER >= GEN_6 ? UQ_4_12(1.5) : UQ_4_12(2.0)), dmg);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// check burn
Burn affects physical moves only
2019-08-05 11:30:25 +02:00
if (gBattleMons[battlerAtk].status1 & STATUS1_BURN && IS_MOVE_PHYSICAL(move)
&& gBattleMoves[move].effect != EFFECT_FACADE && abilityAtk != ABILITY_GUTS)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
dmg = ApplyModifier(UQ_4_12(0.5), dmg);
// check sunny/rain weather
utility umbrella effect
2021-05-24 17:52:45 +02:00
if (IsBattlerWeatherAffected(battlerAtk, WEATHER_RAIN_ANY))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
if (moveType == TYPE_FIRE)
dmg = ApplyModifier(UQ_4_12(0.5), dmg);
else if (moveType == TYPE_WATER)
dmg = ApplyModifier(UQ_4_12(1.5), dmg);
}
utility umbrella effect
2021-05-24 17:52:45 +02:00
else if (IsBattlerWeatherAffected(battlerAtk, WEATHER_SUN_ANY))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
if (moveType == TYPE_FIRE)
dmg = ApplyModifier(UQ_4_12(1.5), dmg);
else if (moveType == TYPE_WATER)
dmg = ApplyModifier(UQ_4_12(0.5), dmg);
}
// check stab
if (IS_BATTLER_OF_TYPE(battlerAtk, moveType) && move != MOVE_STRUGGLE)
{
if (abilityAtk == ABILITY_ADAPTABILITY)
MulModifier(&finalModifier, UQ_4_12(2.0));
else
MulModifier(&finalModifier, UQ_4_12(1.5));
}
// reflect, light screen, aurora veil
some ability tweaks
2020-04-18 20:34:09 +02:00
if (((gSideStatuses[defSide] & SIDE_STATUS_REFLECT && IS_MOVE_PHYSICAL(move))
|| (gSideStatuses[defSide] & SIDE_STATUS_LIGHTSCREEN && IS_MOVE_SPECIAL(move))
|| (gSideStatuses[defSide] & SIDE_STATUS_AURORA_VEIL))
Update src/battle_util.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-12 23:34:44 +01:00
&& abilityAtk != ABILITY_INFILTRATOR
&& !(isCrit)
Crits and Confusion bypass screens
2021-11-12 21:19:06 +01:00
&& !gProtectStructs[gBattlerAttacker].confusionSelfDmg)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
MulModifier(&finalModifier, UQ_4_12(0.66));
else
MulModifier(&finalModifier, UQ_4_12(0.5));
}
// attacker's abilities
switch (abilityAtk)
{
case ABILITY_TINTED_LENS:
if (typeEffectivenessModifier <= UQ_4_12(0.5))
MulModifier(&finalModifier, UQ_4_12(2.0));
break;
case ABILITY_SNIPER:
if (isCrit)
MulModifier(&finalModifier, UQ_4_12(1.5));
break;
Implemented missing Neuroforce. (#242) * Added ID, name and description. * Added damage multiplier.
2020-01-18 18:34:04 +01:00
case ABILITY_NEUROFORCE:
if (typeEffectivenessModifier >= UQ_4_12(2.0))
MulModifier(&finalModifier, UQ_4_12(1.25));
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
// target's abilities
switch (abilityDef)
{
case ABILITY_MULTISCALE:
some ability tweaks
2020-04-18 20:34:09 +02:00
case ABILITY_SHADOW_SHIELD:
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
if (BATTLER_MAX_HP(battlerDef))
MulModifier(&finalModifier, UQ_4_12(0.5));
break;
case ABILITY_FILTER:
case ABILITY_SOLID_ROCK:
case ABILITY_PRISM_ARMOR:
if (typeEffectivenessModifier >= UQ_4_12(2.0))
MulModifier(&finalModifier, UQ_4_12(0.75));
break;
}
// target's ally's abilities
if (IsBattlerAlive(BATTLE_PARTNER(battlerDef)))
{
switch (GetBattlerAbility(BATTLE_PARTNER(battlerDef)))
{
case ABILITY_FRIEND_GUARD:
MulModifier(&finalModifier, UQ_4_12(0.75));
break;
}
}
// attacker's hold effect
switch (GetBattlerHoldEffect(battlerAtk, TRUE))
{
case HOLD_EFFECT_METRONOME:
Metronome item
2020-04-22 12:49:25 +02:00
percentBoost = min((gBattleStruct->sameMoveTurns[battlerAtk] * GetBattlerHoldEffectParam(battlerAtk)), 100);
MulModifier(&finalModifier, UQ_4_12(1.0) + sPercentToModifier[percentBoost]);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
break;
case HOLD_EFFECT_EXPERT_BELT:
if (typeEffectivenessModifier >= UQ_4_12(2.0))
MulModifier(&finalModifier, UQ_4_12(1.2));
break;
case HOLD_EFFECT_LIFE_ORB:
MulModifier(&finalModifier, UQ_4_12(1.3));
break;
}
// target's hold effect
switch (GetBattlerHoldEffect(battlerDef, TRUE))
{
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
// berries reducing dmg
case HOLD_EFFECT_RESIST_BERRY:
if (moveType == GetBattlerHoldEffectParam(battlerDef)
Fix Unnerve not canceling out type resist berries.
2021-10-02 07:01:34 +02:00
&& (moveType == TYPE_NORMAL || typeEffectivenessModifier >= UQ_4_12(2.0))
&& !UnnerveOn(battlerDef, itemDef))
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
{
resist berry ripen boost
2021-01-06 06:21:38 +01:00
if (abilityDef == ABILITY_RIPEN)
MulModifier(&finalModifier, UQ_4_12(0.25));
else
MulModifier(&finalModifier, UQ_4_12(0.5));
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
if (updateFlags)
Applied use of TRUE and FALSE for flags.
2021-09-23 04:29:00 +02:00
gSpecialStatuses[battlerDef].berryReduced = TRUE;
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
}
break;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
if (gBattleMoves[move].flags & FLAG_DMG_MINIMIZE && gStatuses3[battlerDef] & STATUS3_MINIMIZED)
MulModifier(&finalModifier, UQ_4_12(2.0));
if (gBattleMoves[move].flags & FLAG_DMG_UNDERGROUND && gStatuses3[battlerDef] & STATUS3_UNDERGROUND)
MulModifier(&finalModifier, UQ_4_12(2.0));
if (gBattleMoves[move].flags & FLAG_DMG_UNDERWATER && gStatuses3[battlerDef] & STATUS3_UNDERWATER)
MulModifier(&finalModifier, UQ_4_12(2.0));
Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-05 04:26:15 +02:00
if (gBattleMoves[move].flags & FLAG_DMG_2X_IN_AIR && gStatuses3[battlerDef] & STATUS3_ON_AIR)
Change inner structure of semi invulerable moves
2020-04-11 11:47:13 +02:00
MulModifier(&finalModifier, UQ_4_12(2.0));
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
dmg = ApplyModifier(finalModifier, dmg);
if (dmg == 0)
dmg = 1;
return dmg;
}
Fix messing with move result flags when not needed
2019-04-02 00:14:01 +02:00
s32 CalculateMoveDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, s32 fixedBasePower, bool32 isCrit, bool32 randomFactor, bool32 updateFlags)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
s32 dmg;
Remove unneded variable
2019-04-02 00:17:15 +02:00
u16 typeEffectivenessModifier;
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
Fix messing with move result flags when not needed
2019-04-02 00:14:01 +02:00
typeEffectivenessModifier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, updateFlags);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// Don't calculate damage if the move has no effect on target.
if (typeEffectivenessModifier == UQ_4_12(0))
return 0;
if (fixedBasePower)
gBattleMovePower = fixedBasePower;
else
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
gBattleMovePower = CalcMoveBasePowerAfterModifiers(move, battlerAtk, battlerDef, moveType, updateFlags);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// long dmg basic formula
dmg = ((gBattleMons[battlerAtk].level * 2) / 5) + 2;
dmg *= gBattleMovePower;
AI learns abilities which halve/double damage
2020-07-12 10:09:23 +02:00
dmg *= CalcAttackStat(move, battlerAtk, battlerDef, moveType, isCrit, updateFlags);
dmg /= CalcDefenseStat(move, battlerAtk, battlerDef, moveType, isCrit, updateFlags);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
dmg = (dmg / 50) + 2;
// Calculate final modifiers.
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
dmg = CalcFinalDmg(dmg, move, battlerAtk, battlerDef, moveType, typeEffectivenessModifier, isCrit, updateFlags);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
// Add a random factor.
if (randomFactor)
{
dmg *= 100 - (Random() % 16);
dmg /= 100;
}
if (dmg == 0)
dmg = 1;
return dmg;
}
Ring Target
2019-05-16 10:40:44 +02:00
static void MulByTypeEffectiveness(u16 *modifier, u16 move, u8 moveType, u8 battlerDef, u8 defType, u8 battlerAtk, bool32 recordAbilities)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
Inverse battles
2020-07-17 20:53:22 +02:00
u16 mod = GetTypeModifier(moveType, defType);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
Ring Target
2019-05-16 10:40:44 +02:00
if (mod == UQ_4_12(0.0) && GetBattlerHoldEffect(battlerDef, TRUE) == HOLD_EFFECT_RING_TARGET)
{
mod = UQ_4_12(1.0);
if (recordAbilities)
RecordItemEffectBattle(battlerDef, HOLD_EFFECT_RING_TARGET);
}
Inverse battles
2020-07-17 20:53:22 +02:00
else if ((moveType == TYPE_FIGHTING || moveType == TYPE_NORMAL) && defType == TYPE_GHOST && gBattleMons[battlerDef].status2 & STATUS2_FORESIGHT && mod == UQ_4_12(0.0))
Ring Target
2019-05-16 10:40:44 +02:00
{
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
mod = UQ_4_12(1.0);
Ring Target
2019-05-16 10:40:44 +02:00
}
Inverse battles
2020-07-17 20:53:22 +02:00
else if ((moveType == TYPE_FIGHTING || moveType == TYPE_NORMAL) && defType == TYPE_GHOST && GetBattlerAbility(battlerAtk) == ABILITY_SCRAPPY && mod == UQ_4_12(0.0))
Ring Target
2019-05-16 10:40:44 +02:00
{
Add Storm Drain redirection
2018-07-22 19:34:13 +02:00
mod = UQ_4_12(1.0);
Ring Target
2019-05-16 10:40:44 +02:00
if (recordAbilities)
RecordAbilityBattle(battlerAtk, ABILITY_SCRAPPY);
}
Inverse battles
2020-07-17 20:53:22 +02:00
if (moveType == TYPE_PSYCHIC && defType == TYPE_DARK && gStatuses3[battlerDef] & STATUS3_MIRACLE_EYED && mod == UQ_4_12(0.0))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
mod = UQ_4_12(1.0);
Topsy Turvy and Ion Deluge.
2018-08-04 23:34:29 +02:00
if (gBattleMoves[move].effect == EFFECT_FREEZE_DRY && defType == TYPE_WATER)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
mod = UQ_4_12(2.0);
Inverse battles
2020-07-17 20:53:22 +02:00
if (moveType == TYPE_GROUND && defType == TYPE_FLYING && IsBattlerGrounded(battlerDef) && mod == UQ_4_12(0.0))
Flying type pokemon can take ground type moves damage if grounded
2018-07-31 23:21:42 +02:00
mod = UQ_4_12(1.0);
Requested changes Various bug fixes, syntax corrections etc.
2021-11-10 09:11:15 +01:00
if (moveType == TYPE_FIRE && gDisableStructs[battlerDef].tarShot)
mod = UQ_4_12(2.0);
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
WEATHER_STRONG_WINDS modifier fix MulByTypeEffectiveness was the right answer all along. I also added a short pause to BattleScript_AttackWeakenedByStrongWinds before STRINGID_ATTACKWEAKENEDBSTRONGWINDS is printed.
2021-10-06 11:32:06 +02:00
// WEATHER_STRONG_WINDS weakens Super Effective moves against Flying-type Pokémon
if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_STRONG_WINDS)
{
if (defType == TYPE_FLYING && mod >= UQ_4_12(2.0))
mod = UQ_4_12(1.0);
}
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
MulModifier(modifier, mod);
}
New AI damage and type functions
2018-07-15 12:39:07 +02:00
static void UpdateMoveResultFlags(u16 modifier)
{
if (modifier == UQ_4_12(0.0))
{
gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
gMoveResultFlags &= ~(MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE);
}
else if (modifier == UQ_4_12(1.0))
{
gMoveResultFlags &= ~(MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_DOESNT_AFFECT_FOE);
}
else if (modifier > UQ_4_12(1.0))
{
gMoveResultFlags |= MOVE_RESULT_SUPER_EFFECTIVE;
gMoveResultFlags &= ~(MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_DOESNT_AFFECT_FOE);
}
else //if (modifier < UQ_4_12(1.0))
{
gMoveResultFlags |= MOVE_RESULT_NOT_VERY_EFFECTIVE;
gMoveResultFlags &= ~(MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_DOESNT_AFFECT_FOE);
}
}
Support for two typed moves.
2018-08-05 13:57:37 +02:00
static u16 CalcTypeEffectivenessMultiplierInternal(u16 move, u8 moveType, u8 battlerAtk, u8 battlerDef, bool32 recordAbilities, u16 modifier)
Create template of new dmg calc
2018-07-14 19:29:25 +02:00
{
Ring Target
2019-05-16 10:40:44 +02:00
MulByTypeEffectiveness(&modifier, move, moveType, battlerDef, gBattleMons[battlerDef].type1, battlerAtk, recordAbilities);
Support for two typed moves.
2018-08-05 13:57:37 +02:00
if (gBattleMons[battlerDef].type2 != gBattleMons[battlerDef].type1)
Ring Target
2019-05-16 10:40:44 +02:00
MulByTypeEffectiveness(&modifier, move, moveType, battlerDef, gBattleMons[battlerDef].type2, battlerAtk, recordAbilities);
Add third type
2018-11-17 12:10:24 +01:00
if (gBattleMons[battlerDef].type3 != TYPE_MYSTERY && gBattleMons[battlerDef].type3 != gBattleMons[battlerDef].type2
&& gBattleMons[battlerDef].type3 != gBattleMons[battlerDef].type1)
Ring Target
2019-05-16 10:40:44 +02:00
MulByTypeEffectiveness(&modifier, move, moveType, battlerDef, gBattleMons[battlerDef].type3, battlerAtk, recordAbilities);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
Disambiguate Thousand Arrows flag from other flags
2021-06-05 02:34:37 +02:00
if (moveType == TYPE_GROUND && !IsBattlerGrounded(battlerDef) && !(gBattleMoves[move].flags & FLAG_DMG_UNGROUNDED_IGNORE_TYPE_IF_FLYING))
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
Support for two typed moves.
2018-08-05 13:57:37 +02:00
modifier = UQ_4_12(0.0);
if (recordAbilities && GetBattlerAbility(battlerDef) == ABILITY_LEVITATE)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
Support for two typed moves.
2018-08-05 13:57:37 +02:00
gLastUsedAbility = ABILITY_LEVITATE;
gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
gLastLandedMoves[battlerDef] = 0;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MISS_TYPE] = B_MSG_GROUND_MISS;
Support for two typed moves.
2018-08-05 13:57:37 +02:00
RecordAbilityBattle(battlerDef, ABILITY_LEVITATE);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
Support for two typed moves.
2018-08-05 13:57:37 +02:00
}
Fix Thousand Arrows vs. Flying Type Should ignore type modifiers against flying types that aren't grounded. Previous code just negated the targets' flying typing.
2021-04-01 06:23:47 +02:00
// Thousand Arrows ignores type modifiers for flying mons
Disambiguate Thousand Arrows flag from other flags
2021-06-05 02:34:37 +02:00
if (!IsBattlerGrounded(battlerDef) && (gBattleMoves[move].flags & FLAG_DMG_UNGROUNDED_IGNORE_TYPE_IF_FLYING)
Fix Thousand Arrows vs. Flying Type Should ignore type modifiers against flying types that aren't grounded. Previous code just negated the targets' flying typing.
2021-04-01 06:23:47 +02:00
&& (gBattleMons[battlerDef].type1 == TYPE_FLYING || gBattleMons[battlerDef].type2 == TYPE_FLYING || gBattleMons[battlerDef].type3 == TYPE_FLYING))
{
modifier = UQ_4_12(1.0);
}
Applied Egg's implementation of telepathy
2021-09-22 03:57:05 +02:00
if (((GetBattlerAbility(battlerDef) == ABILITY_WONDER_GUARD && modifier <= UQ_4_12(1.0))
|| (GetBattlerAbility(battlerDef) == ABILITY_TELEPATHY && battlerDef == BATTLE_PARTNER(battlerAtk)))
&& gBattleMoves[move].power)
Support for two typed moves.
2018-08-05 13:57:37 +02:00
{
modifier = UQ_4_12(0.0);
if (recordAbilities)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
Applied Egg's implementation of telepathy
2021-09-22 03:57:05 +02:00
gLastUsedAbility = gBattleMons[battlerDef].ability;
Support for two typed moves.
2018-08-05 13:57:37 +02:00
gMoveResultFlags |= MOVE_RESULT_MISSED;
gLastLandedMoves[battlerDef] = 0;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 03:36:37 +02:00
gBattleCommunication[MISS_TYPE] = B_MSG_AVOIDED_DMG;
Applied Egg's implementation of telepathy
2021-09-22 03:57:05 +02:00
RecordAbilityBattle(battlerDef, gBattleMons[battlerDef].ability);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
}
Support for two typed moves.
2018-08-05 13:57:37 +02:00
return modifier;
}
u16 CalcTypeEffectivenessMultiplier(u16 move, u8 moveType, u8 battlerAtk, u8 battlerDef, bool32 recordAbilities)
{
u16 modifier = UQ_4_12(1.0);
if (move != MOVE_STRUGGLE && moveType != TYPE_MYSTERY)
{
modifier = CalcTypeEffectivenessMultiplierInternal(move, moveType, battlerAtk, battlerDef, recordAbilities, modifier);
if (gBattleMoves[move].effect == EFFECT_TWO_TYPED_MOVE)
modifier = CalcTypeEffectivenessMultiplierInternal(move, gBattleMoves[move].argument, battlerAtk, battlerDef, recordAbilities, modifier);
}
Fix messing with move result flags when not needed
2019-04-02 00:14:01 +02:00
if (recordAbilities)
UpdateMoveResultFlags(modifier);
New AI damage and type functions
2018-07-15 12:39:07 +02:00
return modifier;
}
Expand ability ids to u16. Thanks to ghoulslash for some assistance!
2020-05-18 23:54:12 +02:00
u16 CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 abilityDef)
New AI damage and type functions
2018-07-15 12:39:07 +02:00
{
u16 modifier = UQ_4_12(1.0);
u8 moveType = gBattleMoves[move].type;
if (move != MOVE_STRUGGLE && moveType != TYPE_MYSTERY)
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
{
Ring Target
2019-05-16 10:40:44 +02:00
MulByTypeEffectiveness(&modifier, move, moveType, 0, gBaseStats[speciesDef].type1, 0, FALSE);
New AI damage and type functions
2018-07-15 12:39:07 +02:00
if (gBaseStats[speciesDef].type2 != gBaseStats[speciesDef].type1)
Ring Target
2019-05-16 10:40:44 +02:00
MulByTypeEffectiveness(&modifier, move, moveType, 0, gBaseStats[speciesDef].type2, 0, FALSE);
New AI damage and type functions
2018-07-15 12:39:07 +02:00
if (moveType == TYPE_GROUND && abilityDef == ABILITY_LEVITATE && !(gFieldStatuses & STATUS_FIELD_GRAVITY))
modifier = UQ_4_12(0.0);
if (abilityDef == ABILITY_WONDER_GUARD && modifier <= UQ_4_12(1.0) && gBattleMoves[move].power)
modifier = UQ_4_12(0.0);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
}
Create template of new dmg calc
2018-07-14 19:29:25 +02:00
New AI damage and type functions
2018-07-15 12:39:07 +02:00
UpdateMoveResultFlags(modifier);
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
return modifier;
Create template of new dmg calc
2018-07-14 19:29:25 +02:00
}
New AI damage and type functions
2018-07-15 12:39:07 +02:00
u16 GetTypeModifier(u8 atkType, u8 defType)
{
Inverse battles
2020-07-17 20:53:22 +02:00
if (B_FLAG_INVERSE_BATTLE != 0 && FlagGet(B_FLAG_INVERSE_BATTLE))
return sInverseTypeEffectivenessTable[atkType][defType];
else
return sTypeEffectivenessTable[atkType][defType];
New AI damage and type functions
2018-07-15 12:39:07 +02:00
}
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
s32 GetStealthHazardDamage(u8 hazardType, u8 battlerId)
{
u8 type1 = gBattleMons[battlerId].type1;
u8 type2 = gBattleMons[battlerId].type2;
u32 maxHp = gBattleMons[battlerId].maxHP;
s32 dmg = 0;
u16 modifier = UQ_4_12(1.0);
MulModifier(&modifier, GetTypeModifier(hazardType, type1));
if (type2 != type1)
MulModifier(&modifier, GetTypeModifier(hazardType, type2));
switch (modifier)
{
case UQ_4_12(0.0):
dmg = 0;
break;
case UQ_4_12(0.25):
dmg = maxHp / 32;
if (dmg == 0)
dmg = 1;
break;
case UQ_4_12(0.5):
dmg = maxHp / 16;
if (dmg == 0)
dmg = 1;
break;
case UQ_4_12(1.0):
dmg = maxHp / 8;
if (dmg == 0)
dmg = 1;
break;
case UQ_4_12(2.0):
dmg = maxHp / 4;
if (dmg == 0)
dmg = 1;
break;
case UQ_4_12(4.0):
dmg = maxHp / 2;
if (dmg == 0)
dmg = 1;
break;
}
return dmg;
}
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
bool32 IsPartnerMonFromSameTrainer(u8 battlerId)
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
{
if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
return FALSE;
else if (GetBattlerSide(battlerId) == B_SIDE_PLAYER && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
return FALSE;
else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
return FALSE;
else
return TRUE;
}
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
u16 GetMegaEvolutionSpecies(u16 preEvoSpecies, u16 heldItemId)
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
{
u32 i;
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
for (i = 0; i < EVOS_PER_MON; i++)
{
Implemented Primal Reversion
2021-08-25 08:35:21 +02:00
if ((gEvolutionTable[preEvoSpecies][i].method == EVO_MEGA_EVOLUTION
|| gEvolutionTable[preEvoSpecies][i].method == EVO_PRIMAL_REVERSION)
&& gEvolutionTable[preEvoSpecies][i].param == heldItemId)
return gEvolutionTable[preEvoSpecies][i].targetSpecies;
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
}
return SPECIES_NONE;
}
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
u16 GetWishMegaEvolutionSpecies(u16 preEvoSpecies, u16 moveId1, u16 moveId2, u16 moveId3, u16 moveId4)
{
u32 i, par;
for (i = 0; i < EVOS_PER_MON; i++)
{
Review changes 3.
2020-11-09 01:08:58 +01:00
if (gEvolutionTable[preEvoSpecies][i].method == EVO_MOVE_MEGA_EVOLUTION)
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
{
par = gEvolutionTable[preEvoSpecies][i].param;
if (par == moveId1 || par == moveId2 || par == moveId3 || par == moveId4)
return gEvolutionTable[preEvoSpecies][i].targetSpecies;
}
}
return SPECIES_NONE;
}
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
bool32 CanMegaEvolve(u8 battlerId)
{
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
u32 itemId, holdEffect, species;
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
struct Pokemon *mon;
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
u8 battlerPosition = GetBattlerPosition(battlerId);
u8 partnerPosition = GetBattlerPosition(BATTLE_PARTNER(battlerId));
Move buffers to allocated reousrces, get rid of old type effectiveness table
2019-01-05 16:00:57 +01:00
struct MegaEvolutionData *mega = &(((struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]))->mega);
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
Added a check for the Mega Bracelet in CanMegaEvolve
2021-03-10 12:52:43 +01:00
#ifdef ITEM_EXPANSION
Adjusted elements to simplify the conflicts between BE and IE
2021-11-13 16:10:20 +01:00
// Check if Player has a Mega Ring
Added a check for the Mega Bracelet in CanMegaEvolve
2021-03-10 12:52:43 +01:00
if ((GetBattlerPosition(battlerId) == B_POSITION_PLAYER_LEFT || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battlerId) == B_POSITION_PLAYER_RIGHT))
Adjusted elements to simplify the conflicts between BE and IE
2021-11-13 16:10:20 +01:00
&& !CheckBagHasItem(ITEM_MEGA_RING, 1))
Added a check for the Mega Bracelet in CanMegaEvolve
2021-03-10 12:52:43 +01:00
return FALSE;
#endif
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
// Check if trainer already mega evolved a pokemon.
link battles mega evo fix hopefully?????
2018-09-20 17:59:17 +02:00
if (mega->alreadyEvolved[battlerPosition])
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
return FALSE;
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
Fix mega evolution allowing to evolve two mons in doubles
2018-09-20 12:55:12 +02:00
if (IsPartnerMonFromSameTrainer(battlerId)
link battles mega evo fix hopefully?????
2018-09-20 17:59:17 +02:00
&& (mega->alreadyEvolved[partnerPosition] || (mega->toEvolve & gBitTable[BATTLE_PARTNER(battlerId)])))
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
return FALSE;
}
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
// Gets mon data.
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT)
mon = &gEnemyParty[gBattlerPartyIndexes[battlerId]];
else
mon = &gPlayerParty[gBattlerPartyIndexes[battlerId]];
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
species = GetMonData(mon, MON_DATA_SPECIES);
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
itemId = GetMonData(mon, MON_DATA_HELD_ITEM);
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
// Check if there is an entry in the evolution table for regular Mega Evolution.
if (GetMegaEvolutionSpecies(species, itemId) != SPECIES_NONE)
{
USE_BATTLE_DEBUG -> B_ENABLE_DEBUG
2020-12-23 18:04:14 +01:00
if (B_ENABLE_DEBUG && gBattleStruct->debugHoldEffects[battlerId])
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
holdEffect = gBattleStruct->debugHoldEffects[battlerId];
else if (itemId == ITEM_ENIGMA_BERRY)
holdEffect = gEnigmaBerries[battlerId].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(itemId);
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
Implemented Primal Reversion
2021-08-25 08:35:21 +02:00
// Can Mega Evolve via Mega Stone.
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
if (holdEffect == HOLD_EFFECT_MEGA_STONE)
{
gBattleStruct->mega.isWishMegaEvo = FALSE;
return TRUE;
}
Implemented Primal Reversion
2021-08-25 08:35:21 +02:00
// Can undergo Primal Reversion.
if (holdEffect == HOLD_EFFECT_PRIMAL_ORB)
{
gBattleStruct->mega.isWishMegaEvo = FALSE;
gBattleStruct->mega.isPrimalReversion = TRUE;
return TRUE;
}
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
}
// Check if there is an entry in the evolution table for Wish Mega Evolution.
if (GetWishMegaEvolutionSpecies(species, GetMonData(mon, MON_DATA_MOVE1), GetMonData(mon, MON_DATA_MOVE2), GetMonData(mon, MON_DATA_MOVE3), GetMonData(mon, MON_DATA_MOVE4)))
{
gBattleStruct->mega.isWishMegaEvo = TRUE;
return TRUE;
}
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
Implemented Wish Mega Evolution
2020-11-07 13:53:34 +01:00
// No checks passed, the mon CAN'T mega evolve.
return FALSE;
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
}
Mega Evolution done except sprites.
2018-09-16 21:08:49 +02:00
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
void UndoMegaEvolution(u32 monId)
Mega Evolution done except sprites.
2018-09-16 21:08:49 +02:00
{
Implemented Primal Reversion
2021-08-25 08:35:21 +02:00
u16 baseSpecies = GET_BASE_SPECIES_ID(GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES));
Convert mega related struct fields to a seperate struct
2018-09-20 17:33:27 +02:00
if (gBattleStruct->mega.evolvedPartyIds[B_SIDE_PLAYER] & gBitTable[monId])
Mega Evolution done except sprites.
2018-09-16 21:08:49 +02:00
{
Convert mega related struct fields to a seperate struct
2018-09-20 17:33:27 +02:00
gBattleStruct->mega.evolvedPartyIds[B_SIDE_PLAYER] &= ~(gBitTable[monId]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleStruct->mega.playerEvolvedSpecies);
Mega Evolution done except sprites.
2018-09-16 21:08:49 +02:00
CalculateMonStats(&gPlayerParty[monId]);
}
Implemented Primal Reversion
2021-08-25 08:35:21 +02:00
else if (gBattleStruct->mega.primalRevertedPartyIds[B_SIDE_PLAYER] & gBitTable[monId])
{
gBattleStruct->mega.primalRevertedPartyIds[B_SIDE_PLAYER] &= ~(gBitTable[monId]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &baseSpecies);
CalculateMonStats(&gPlayerParty[monId]);
}
Power Construct
2020-07-16 15:40:56 +02:00
// While not exactly a mega evolution, Zygarde follows the same rules.
else if (GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, NULL) == SPECIES_ZYGARDE_COMPLETE)
{
SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleStruct->changedSpecies[monId]);
gBattleStruct->changedSpecies[monId] = 0;
CalculateMonStats(&gPlayerParty[monId]);
}
Mega Evolution done except sprites.
2018-09-16 21:08:49 +02:00
}
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
Remove UndoFormChangeOnSwitch Handle switching out Mimikyu Busted in UndoFormChange.
2021-07-16 07:56:53 +02:00
void UndoFormChange(u32 monId, u32 side, bool32 isSwitchingOut)
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
{
u32 i, currSpecies;
struct Pokemon *party = (side == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
Refactored UndoFormChange to make it more user friendly
2021-11-04 02:05:02 +01:00
static const u16 species[][3] =
{
// Changed Form ID Default Form ID Should change on switch
{SPECIES_MIMIKYU_BUSTED, SPECIES_MIMIKYU, FALSE},
{SPECIES_GRENINJA_ASH, SPECIES_GRENINJA_BATTLE_BOND, FALSE},
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song
2021-11-05 23:52:51 +01:00
{SPECIES_MELOETTA_PIROUETTE, SPECIES_MELOETTA, FALSE},
Refactored UndoFormChange to make it more user friendly
2021-11-04 02:05:02 +01:00
{SPECIES_AEGISLASH_BLADE, SPECIES_AEGISLASH, TRUE},
{SPECIES_DARMANITAN_ZEN_MODE, SPECIES_DARMANITAN, TRUE},
{SPECIES_MINIOR, SPECIES_MINIOR_CORE_RED, TRUE},
{SPECIES_MINIOR_METEOR_BLUE, SPECIES_MINIOR_CORE_BLUE, TRUE},
{SPECIES_MINIOR_METEOR_GREEN, SPECIES_MINIOR_CORE_GREEN, TRUE},
{SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO, TRUE},
{SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE, TRUE},
{SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET, TRUE},
{SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW, TRUE},
{SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI, TRUE},
{SPECIES_CRAMORANT_GORGING, SPECIES_CRAMORANT, TRUE},
{SPECIES_CRAMORANT_GULPING, SPECIES_CRAMORANT, TRUE},
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-05 02:32:33 +01:00
{SPECIES_MORPEKO_HANGRY, SPECIES_MORPEKO, TRUE},
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
};
currSpecies = GetMonData(&party[monId], MON_DATA_SPECIES, NULL);
for (i = 0; i < ARRAY_COUNT(species); i++)
{
Refactored UndoFormChange to make it more user friendly
2021-11-04 02:05:02 +01:00
if (currSpecies == species[i][0] && (!isSwitchingOut || species[i][2] == TRUE))
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
{
SetMonData(&party[monId], MON_DATA_SPECIES, &species[i][1]);
CalculateMonStats(&party[monId]);
break;
}
}
}
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
bool32 DoBattlersShareType(u32 battler1, u32 battler2)
{
Synchronoise third type support
2019-03-08 10:30:23 +01:00
s32 i;
u8 types1[3] = {gBattleMons[battler1].type1, gBattleMons[battler1].type2, gBattleMons[battler1].type3};
u8 types2[3] = {gBattleMons[battler2].type1, gBattleMons[battler2].type2, gBattleMons[battler2].type3};
if (types1[2] == TYPE_MYSTERY)
types1[2] = types1[0];
if (types2[2] == TYPE_MYSTERY)
types2[2] = types2[0];
for (i = 0; i < 3; i++)
{
if (types1[i] == types2[0] || types1[i] == types2[1] || types1[i] == types2[2])
return TRUE;
}
return FALSE;
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
}
Bestow
2018-09-30 12:27:51 +02:00
bool32 CanBattlerGetOrLoseItem(u8 battlerId, u16 itemId)
{
u16 species = gBattleMons[battlerId].species;
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
u16 holdEffect = ItemId_GetHoldEffect(itemId);
// Mail can be stolen now
if (itemId == ITEM_ENIGMA_BERRY)
Bestow
2018-09-30 12:27:51 +02:00
return FALSE;
fix orb check
2021-01-22 05:28:19 +01:00
else if (GET_BASE_SPECIES_ID(species) == SPECIES_KYOGRE && itemId == ITEM_BLUE_ORB) // includes primal
Bestow
2018-09-30 12:27:51 +02:00
return FALSE;
fix orb check
2021-01-22 05:28:19 +01:00
else if (GET_BASE_SPECIES_ID(species) == SPECIES_GROUDON && itemId == ITEM_RED_ORB) // includes primal
Bestow
2018-09-30 12:27:51 +02:00
return FALSE;
some tweaks
2021-08-12 20:44:53 +02:00
// Mega stone cannot be lost if pokemon's base species can mega evolve with it.
else if (holdEffect == HOLD_EFFECT_MEGA_STONE && (GetMegaEvolutionSpecies(GET_BASE_SPECIES_ID(species), itemId) != SPECIES_NONE))
Bestow
2018-09-30 12:27:51 +02:00
return FALSE;
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 22:28:03 +01:00
else if (GET_BASE_SPECIES_ID(species) == SPECIES_GIRATINA && itemId == ITEM_GRISEOUS_ORB)
Bestow
2018-09-30 12:27:51 +02:00
return FALSE;
some tweaks
2021-08-12 20:44:53 +02:00
else if (GET_BASE_SPECIES_ID(species) == SPECIES_GENESECT && holdEffect == HOLD_EFFECT_DRIVE)
Bestow
2018-09-30 12:27:51 +02:00
return FALSE;
some tweaks
2021-08-12 20:44:53 +02:00
else if (GET_BASE_SPECIES_ID(species) == SPECIES_SILVALLY && holdEffect == HOLD_EFFECT_MEMORY)
Can't Knock Griseous Orb Off Giratina I'll do Plates Drives and Memories later
2019-03-25 03:33:54 +01:00
return FALSE;
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 22:28:03 +01:00
else if (GET_BASE_SPECIES_ID(species) == SPECIES_ARCEUS && holdEffect == HOLD_EFFECT_PLATE)
Move new species to battle_config.h
2019-05-17 10:38:48 +02:00
return FALSE;
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
#ifdef HOLD_EFFECT_Z_CRYSTAL
else if (holdEffect == HOLD_EFFECT_Z_CRYSTAL)
Move new species to battle_config.h
2019-05-17 10:38:48 +02:00
return FALSE;
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
#endif
Bestow
2018-09-30 12:27:51 +02:00
else
return TRUE;
}
Illusion
2019-08-08 13:06:55 +02:00
struct Pokemon *GetIllusionMonPtr(u32 battlerId)
{
Hopefully illusion works as intended now
2020-06-28 19:45:48 +02:00
if (gBattleStruct->illusion[battlerId].broken)
return NULL;
if (!gBattleStruct->illusion[battlerId].set)
{
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
SetIllusionMon(&gPlayerParty[gBattlerPartyIndexes[battlerId]], battlerId);
else
SetIllusionMon(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId);
}
if (!gBattleStruct->illusion[battlerId].on)
Illusion
2019-08-08 13:06:55 +02:00
return NULL;
return gBattleStruct->illusion[battlerId].mon;
}
void ClearIllusionMon(u32 battlerId)
{
Hopefully illusion works as intended now
2020-06-28 19:45:48 +02:00
memset(&gBattleStruct->illusion[battlerId], 0, sizeof(gBattleStruct->illusion[battlerId]));
Illusion
2019-08-08 13:06:55 +02:00
}
bool32 SetIllusionMon(struct Pokemon *mon, u32 battlerId)
{
struct Pokemon *party, *partnerMon;
s32 i, id;
Hopefully illusion works as intended now
2020-06-28 19:45:48 +02:00
gBattleStruct->illusion[battlerId].set = 1;
Illusion
2019-08-08 13:06:55 +02:00
if (GetMonAbility(mon) != ABILITY_ILLUSION)
return FALSE;
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
party = gPlayerParty;
else
party = gEnemyParty;
if (IsBattlerAlive(BATTLE_PARTNER(battlerId)))
partnerMon = &party[gBattlerPartyIndexes[BATTLE_PARTNER(battlerId)]];
else
partnerMon = mon;
// Find last alive non-egg pokemon.
for (i = PARTY_SIZE - 1; i >= 0; i--)
{
Hopefully illusion works as intended now
2020-06-28 19:45:48 +02:00
id = i;
Illusion
2019-08-08 13:06:55 +02:00
if (GetMonData(&party[id], MON_DATA_SANITY_HAS_SPECIES)
&& GetMonData(&party[id], MON_DATA_HP)
Adds missing check for Egg in Illusion
2021-09-22 05:20:34 +02:00
&& !GetMonData(&party[id], MON_DATA_IS_EGG)
Illusion
2019-08-08 13:06:55 +02:00
&& &party[id] != mon
&& &party[id] != partnerMon)
{
gBattleStruct->illusion[battlerId].on = 1;
gBattleStruct->illusion[battlerId].broken = 0;
gBattleStruct->illusion[battlerId].partyId = id;
gBattleStruct->illusion[battlerId].mon = &party[id];
return TRUE;
}
}
return FALSE;
}
Option to use Gen 3 Physical/Special split.
2020-10-15 05:16:50 +02:00
Removed the static variable from the ShouldGetStatBadgeBoost function
2020-10-21 20:30:20 +02:00
bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 battlerId)
Reincorporated badge based stat boosts
2020-10-21 16:44:03 +02:00
{
Review corrections
2020-10-21 20:01:53 +02:00
if (B_BADGE_BOOST != GEN_3)
return FALSE;
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-01-29 07:45:58 +01:00
else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_FRONTIER))
Reincorporated badge based stat boosts
2020-10-21 16:44:03 +02:00
return FALSE;
else if (GetBattlerSide(battlerId) != B_SIDE_PLAYER)
return FALSE;
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == TRAINER_SECRET_BASE)
return FALSE;
else if (FlagGet(badgeFlag))
return TRUE;
else
return FALSE;
}
Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption # Conflicts: # include/battle_util.h # include/constants/battle_config.h # src/battle_util.c
2020-10-24 02:49:59 +02:00
Option to use Gen 3 Physical/Special split.
2020-10-15 05:16:50 +02:00
u8 GetBattleMoveSplit(u32 moveId)
{
Quick syntax tweaks
2021-10-27 16:19:39 +02:00
if (gSwapDamageCategory) // Photon Geyser, Shell Side Arm, Light That Burns the Sky
Fixes and added Poison chance to Shell Side Arm (needs contact on physical)
2021-05-28 20:11:03 +02:00
return SPLIT_PHYSICAL;
Update src/battle_util.c Changed an `if` to `else if` Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-06-06 01:38:37 +02:00
else if (IS_MOVE_STATUS(moveId) || B_PHYSICAL_SPECIAL_SPLIT >= GEN_4)
Option to use Gen 3 Physical/Special split.
2020-10-15 05:16:50 +02:00
return gBattleMoves[moveId].split;
else if (gBattleMoves[moveId].type < TYPE_MYSTERY)
return SPLIT_PHYSICAL;
else
return SPLIT_SPECIAL;
}
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
static bool32 TryRemoveScreens(u8 battler)
{
bool32 removed = FALSE;
u8 battlerSide = GetBattlerSide(battler);
u8 enemySide = GetBattlerSide(BATTLE_OPPOSITE(battler));
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
// try to remove from battler's side
if (gSideStatuses[battlerSide] & (SIDE_STATUS_REFLECT | SIDE_STATUS_LIGHTSCREEN | SIDE_STATUS_AURORA_VEIL))
{
gSideStatuses[battlerSide] &= ~(SIDE_STATUS_REFLECT | SIDE_STATUS_LIGHTSCREEN | SIDE_STATUS_AURORA_VEIL);
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
gSideTimers[battlerSide].reflectTimer = 0;
gSideTimers[battlerSide].lightscreenTimer = 0;
gSideTimers[battlerSide].auroraVeilTimer = 0;
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
removed = TRUE;
}
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
// try to remove from battler opponent's side
if (gSideStatuses[enemySide] & (SIDE_STATUS_REFLECT | SIDE_STATUS_LIGHTSCREEN | SIDE_STATUS_AURORA_VEIL))
{
gSideStatuses[enemySide] &= ~(SIDE_STATUS_REFLECT | SIDE_STATUS_LIGHTSCREEN | SIDE_STATUS_AURORA_VEIL);
fix screen cleaner, curious medicine, as one
2021-02-02 17:00:07 +01:00
gSideTimers[enemySide].reflectTimer = 0;
gSideTimers[enemySide].lightscreenTimer = 0;
gSideTimers[enemySide].auroraVeilTimer = 0;
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
removed = TRUE;
}
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 23:44:12 +01:00
return removed;
}
add neigh and as one abilities
2021-01-06 03:37:23 +01:00
static bool32 IsUnnerveAbilityOnOpposingSide(u8 battlerId)
{
if (IsAbilityOnOpposingSide(battlerId, ABILITY_UNNERVE)
|| IsAbilityOnOpposingSide(battlerId, ABILITY_AS_ONE_ICE_RIDER)
|| IsAbilityOnOpposingSide(battlerId, ABILITY_AS_ONE_SHADOW_RIDER))
return TRUE;
return FALSE;
}
merge with be
2021-03-29 01:29:22 +02:00
check bad move
2020-12-13 23:02:21 +01:00
bool32 TestMoveFlags(u16 move, u32 flag)
{
if (gBattleMoves[move].flags & flag)
return TRUE;
return FALSE;
}
struct Pokemon *GetBattlerPartyData(u8 battlerId)
{
struct Pokemon *mon;
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
mon = &gPlayerParty[gBattlerPartyIndexes[battlerId]];
else
mon = &gEnemyParty[gBattlerPartyIndexes[battlerId]];
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
check bad move
2020-12-13 23:02:21 +01:00
return mon;
}
//Make sure the input bank is any bank on the specific mon's side
bool32 CanFling(u8 battlerId)
{
u16 item = gBattleMons[battlerId].item;
u16 itemEffect = ItemId_GetHoldEffect(item);
if (item == ITEM_NONE
|| GetBattlerAbility(battlerId) == ABILITY_KLUTZ
|| gFieldStatuses & STATUS_FIELD_MAGIC_ROOM
|| gDisableStructs[battlerId].embargoTimer != 0
|| !CanBattlerGetOrLoseItem(battlerId, item)
//|| itemEffect == HOLD_EFFECT_PRIMAL_ORB
|| itemEffect == HOLD_EFFECT_GEMS
#ifdef ITEM_ABILITY_CAPSULE
|| item == ITEM_ABILITY_CAPSULE
#endif
|| (ItemId_GetPocket(item) == POCKET_BERRIES && IsAbilityOnSide(battlerId, ABILITY_UNNERVE))
|| GetPocketByItemId(item) == POCKET_POKE_BALLS)
return FALSE;
return TRUE;
}
// ability checks
bool32 IsRolePlayBannedAbilityAtk(u16 ability)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(sRolePlayBannedAttackerAbilities); i++)
{
if (ability == sRolePlayBannedAttackerAbilities[i])
return TRUE;
}
return FALSE;
}
bool32 IsRolePlayBannedAbility(u16 ability)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(sRolePlayBannedAbilities); i++)
{
if (ability == sRolePlayBannedAbilities[i])
return TRUE;
}
return FALSE;
}
bool32 IsSkillSwapBannedAbility(u16 ability)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(sSkillSwapBannedAbilities); i++)
{
if (ability == sSkillSwapBannedAbilities[i])
return TRUE;
}
return FALSE;
}
bool32 IsWorrySeedBannedAbility(u16 ability)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(sWorrySeedBannedAbilities); i++)
{
if (ability == sWorrySeedBannedAbilities[i])
return TRUE;
}
return FALSE;
}
bool32 IsGastroAcidBannedAbility(u16 ability)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(sGastroAcidBannedAbilities); i++)
{
if (ability == sGastroAcidBannedAbilities[i])
return TRUE;
}
return FALSE;
}
bool32 IsEntrainmentBannedAbilityAttacker(u16 ability)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(sEntrainmentBannedAttackerAbilities); i++)
{
if (ability == sEntrainmentBannedAttackerAbilities[i])
return TRUE;
}
return FALSE;
}
bool32 IsEntrainmentTargetOrSimpleBeamBannedAbility(u16 ability)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(sEntrainmentTargetSimpleBeamBannedAbilities); i++)
{
if (ability == sEntrainmentTargetSimpleBeamBannedAbilities[i])
return TRUE;
}
return FALSE;
}
merge with be
2021-08-12 07:26:13 +02:00
add additional item theft check
2020-12-21 03:06:50 +01:00
// Sort an array of battlers by speed
// Useful for effects like pickpocket, eject button, red card, dancer
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
void SortBattlersBySpeed(u8 *battlers, bool8 slowToFast)
{
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
int i, j, currSpeed, currBattler;
u16 speeds[4] = {0};
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
for (i = 0; i < gBattlersCount; i++)
speeds[i] = GetBattlerTotalSpeedStat(battlers[i]);
for (i = 1; i < gBattlersCount; i++)
{
currBattler = battlers[i];
currSpeed = speeds[i];
j = i - 1;
if (slowToFast)
{
while (j >= 0 && speeds[j] > currSpeed)
{
battlers[j + 1] = battlers[j];
speeds[j + 1] = speeds[j];
j = j - 1;
}
}
else
{
while (j >= 0 && speeds[j] < currSpeed)
{
battlers[j + 1] = battlers[j];
speeds[j + 1] = speeds[j];
j = j - 1;
}
}
battlers[j + 1] = currBattler;
speeds[j + 1] = currSpeed;
}
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
}
opponent trainer theft config option. Clean up code a bit
2020-11-13 19:00:44 +01:00
void TryRestoreStolenItems(void)
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
{
opponent trainer theft config option. Clean up code a bit
2020-11-13 19:00:44 +01:00
u32 i;
u16 stolenItem = ITEM_NONE;
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
opponent trainer theft config option. Clean up code a bit
2020-11-13 19:00:44 +01:00
for (i = 0; i < PARTY_SIZE; i++)
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
{
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
if (gBattleStruct->itemStolen[i].stolen)
{
stolenItem = gBattleStruct->itemStolen[i].originalItem;
if (stolenItem != ITEM_NONE && ItemId_GetPocket(stolenItem) != POCKET_BERRIES)
add additional item theft check
2020-12-21 03:06:50 +01:00
SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &stolenItem); // Restore stolen non-berry items
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
}
move pickpocket to back of moveend sequence
2020-11-13 07:30:00 +01:00
}
}
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
bool32 CanStealItem(u8 battlerStealing, u8 battlerItem, u16 item)
add back accidentally deleted item theft battle type checks
2020-11-13 21:42:49 +01:00
{
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
u8 stealerSide = GetBattlerSide(battlerStealing);
add back accidentally deleted item theft battle type checks
2020-11-13 21:42:49 +01:00
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
return FALSE;
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
add additional item theft check
2020-12-21 03:06:50 +01:00
// Check if the battler trying to steal should be able to
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
if (stealerSide == B_SIDE_OPPONENT
add back accidentally deleted item theft battle type checks
2020-11-13 21:42:49 +01:00
&& !(gBattleTypeFlags &
(BATTLE_TYPE_EREADER_TRAINER
| BATTLE_TYPE_FRONTIER
| BATTLE_TYPE_LINK
merge with be
2021-08-12 07:26:13 +02:00
| BATTLE_TYPE_RECORDED_LINK
add back accidentally deleted item theft battle type checks
2020-11-13 21:42:49 +01:00
| BATTLE_TYPE_SECRET_BASE
fix trainer theft, update config option
2020-12-03 14:42:12 +01:00
#if B_TRAINERS_KNOCK_OFF_ITEMS
add back accidentally deleted item theft battle type checks
2020-11-13 21:42:49 +01:00
| BATTLE_TYPE_TRAINER
#endif
)))
{
return FALSE;
}
else if (!(gBattleTypeFlags &
(BATTLE_TYPE_EREADER_TRAINER
| BATTLE_TYPE_FRONTIER
| BATTLE_TYPE_LINK
merge with be
2021-08-12 07:26:13 +02:00
| BATTLE_TYPE_RECORDED_LINK
add back accidentally deleted item theft battle type checks
2020-11-13 21:42:49 +01:00
| BATTLE_TYPE_SECRET_BASE))
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
&& (gWishFutureKnock.knockedOffMons[stealerSide] & gBitTable[gBattlerPartyIndexes[battlerStealing]]))
add back accidentally deleted item theft battle type checks
2020-11-13 21:42:49 +01:00
{
return FALSE;
}
fix trainer theft, update config option
2020-12-03 14:42:12 +01:00
add additional item theft check
2020-12-21 03:06:50 +01:00
if (!CanBattlerGetOrLoseItem(battlerItem, item) // Battler with item cannot have it stolen
||!CanBattlerGetOrLoseItem(battlerStealing, item)) // Stealer cannot take the item
return FALSE;
return TRUE;
add back accidentally deleted item theft battle type checks
2020-11-13 21:42:49 +01:00
}
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
void TrySaveExchangedItem(u8 battlerId, u16 stolenItem)
{
add additional item theft check
2020-12-21 03:06:50 +01:00
// Because BtlController_EmitSetMonData does SetMonData, we need to save the stolen item only if it matches the battler's original
// So, if the player steals an item during battle and has it stolen from it, it will not end the battle with it (naturally)
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 18:28:18 +01:00
#if B_TRAINERS_KNOCK_OFF_ITEMS == TRUE
// If regular trainer battle and mon's original item matches what is being stolen, save it to be restored at end of battle
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
&& !(gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
&& GetBattlerSide(battlerId) == B_SIDE_PLAYER
&& stolenItem == gBattleStruct->itemStolen[gBattlerPartyIndexes[battlerId]].originalItem)
gBattleStruct->itemStolen[gBattlerPartyIndexes[battlerId]].stolen = TRUE;
#endif
}
merge with be
2021-08-12 07:26:13 +02:00
merge with be
2021-09-02 21:33:42 +02:00
bool32 IsBattlerAffectedByHazards(u8 battlerId, bool32 toxicSpikes)
{
bool32 ret = TRUE;
u32 holdEffect = GetBattlerHoldEffect(gActiveBattler, TRUE);
if (toxicSpikes && holdEffect == HOLD_EFFECT_HEAVY_DUTY_BOOTS && !IS_BATTLER_OF_TYPE(battlerId, TYPE_POISON))
{
ret = FALSE;
RecordItemEffectBattle(battlerId, holdEffect);
}
else if (holdEffect == HOLD_EFFECT_HEAVY_DUTY_BOOTS)
{
ret = FALSE;
RecordItemEffectBattle(battlerId, holdEffect);
}
return ret;
}
bool32 TestSheerForceFlag(u8 battler, u16 move)
{
if (GetBattlerAbility(battler) == ABILITY_SHEER_FORCE && gBattleMoves[move].flags & FLAG_SHEER_FORCE_BOOST)
return TRUE;
else
return FALSE;
}
fix terrain seeds. create generic CompareStat function
2021-09-03 18:17:38 +02:00
// This function is the body of "jumpifstat", but can be used dynamically in a function
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
bool32 CompareStat(u8 battlerId, u8 statId, u8 cmpTo, u8 cmpKind)
fix terrain seeds. create generic CompareStat function
2021-09-03 18:17:38 +02:00
{
bool8 ret = FALSE;
u8 statValue = gBattleMons[battlerId].statStages[statId];
// Because this command is used as a way of checking if a stat can be lowered/raised,
// we need to do some modification at run-time.
replace statStages checks with CompareStat
2021-09-03 19:13:02 +02:00
if (GetBattlerAbility(battlerId) == ABILITY_CONTRARY)
fix terrain seeds. create generic CompareStat function
2021-09-03 18:17:38 +02:00
{
if (cmpKind == CMP_GREATER_THAN)
cmpKind = CMP_LESS_THAN;
else if (cmpKind == CMP_LESS_THAN)
cmpKind = CMP_GREATER_THAN;
if (cmpTo == MIN_STAT_STAGE)
cmpTo = MAX_STAT_STAGE;
else if (cmpTo == MAX_STAT_STAGE)
cmpTo = MIN_STAT_STAGE;
}
switch (cmpKind)
{
case CMP_EQUAL:
if (statValue == cmpTo)
ret = TRUE;
break;
case CMP_NOT_EQUAL:
if (statValue != cmpTo)
ret = TRUE;
break;
case CMP_GREATER_THAN:
if (statValue > cmpTo)
ret = TRUE;
break;
case CMP_LESS_THAN:
if (statValue < cmpTo)
ret = TRUE;
break;
case CMP_COMMON_BITS:
if (statValue & cmpTo)
ret = TRUE;
break;
case CMP_NO_COMMON_BITS:
if (!(statValue & cmpTo))
ret = TRUE;
break;
}
return ret;
}
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
void BufferStatChange(u8 battlerId, u8 statId, u8 stringId)
{
bool8 hasContrary = (GetBattlerAbility(battlerId) == ABILITY_CONTRARY);
format fixes
2021-09-16 23:10:41 +02:00
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
PREPARE_STAT_BUFFER(gBattleTextBuff1, statId);
if (stringId == STRINGID_STATFELL)
{
if (hasContrary)
format fixes
2021-09-16 23:10:41 +02:00
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE)
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
else
format fixes
2021-09-16 23:10:41 +02:00
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATFELL)
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
}
else if (stringId == STRINGID_STATROSE)
{
if (hasContrary)
format fixes
2021-09-16 23:10:41 +02:00
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATFELL)
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
else
format fixes
2021-09-16 23:10:41 +02:00
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE)
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
}
else
{
format fixes
2021-09-16 23:10:41 +02:00
PREPARE_STRING_BUFFER(gBattleTextBuff2, stringId)
fix room service activation msg, stat target
2021-09-14 18:50:36 +02:00
}
}
bool32 TryRoomService(u8 battlerId)
{
if (gFieldStatuses & STATUS_FIELD_TRICK_ROOM && CompareStat(battlerId, STAT_SPEED, MIN_STAT_STAGE, CMP_GREATER_THAN))
{
BufferStatChange(battlerId, STAT_SPEED, STRINGID_STATFELL);
gEffectBattler = gBattleScripting.battler = battlerId;
SET_STATCHANGER(STAT_SPEED, 1, TRUE);
gBattleScripting.animArg1 = 0xE + STAT_SPEED;
gBattleScripting.animArg2 = 0;
gLastUsedItem = gBattleMons[battlerId].item;
return TRUE;
}
else
{
return FALSE;
}
}
fix prankster + magic coat
2021-09-22 22:09:23 +02:00
Update src/battle_util.c Fix copy/paste typo Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-08-07 14:52:27 +02:00
void DoBurmyFormChange(u32 monId)
Implement Burmy form change Burmy changes form based on where it last battled.
2021-08-07 10:56:10 +02:00
{
u16 newSpecies, currSpecies;
s32 sentIn;
struct Pokemon *party = gPlayerParty;
sentIn = gSentPokesToOpponent[(gBattlerFainted & 2) >> 1];
currSpecies = GetMonData(&party[monId], MON_DATA_SPECIES, NULL);
Use form table in species check
2021-08-07 10:59:04 +02:00
if ((GET_BASE_SPECIES_ID(currSpecies) == SPECIES_BURMY) && (gBitTable[monId] & sentIn))
Implement Burmy form change Burmy changes form based on where it last battled.
2021-08-07 10:56:10 +02:00
{
switch (gBattleTerrain)
{
case BATTLE_TERRAIN_GRASS:
case BATTLE_TERRAIN_LONG_GRASS:
case BATTLE_TERRAIN_POND:
case BATTLE_TERRAIN_MOUNTAIN:
case BATTLE_TERRAIN_PLAIN:
newSpecies = SPECIES_BURMY;
break;
case BATTLE_TERRAIN_CAVE:
case BATTLE_TERRAIN_SAND:
newSpecies = SPECIES_BURMY_SANDY_CLOAK;
break;
case BATTLE_TERRAIN_BUILDING:
newSpecies = SPECIES_BURMY_TRASH_CLOAK;
break;
default: // Don't change form if last battle was water-related
newSpecies = SPECIES_NONE;
break;
}
if (newSpecies != SPECIES_NONE)
{
SetMonData(&party[monId], MON_DATA_SPECIES, &newSpecies);
CalculateMonStats(&party[monId]);
}
}
}
merge with be
2021-09-22 22:26:09 +02:00
handle rototiller + prankster
2021-10-11 01:54:17 +02:00
bool32 BlocksPrankster(u16 move, u8 battlerPrankster, u8 battlerDef, bool32 checkTarget)
fix prankster + magic coat
2021-09-22 22:09:23 +02:00
{
syntax fixes. Use BlocksPrankster for perish song battle script
2021-09-23 20:35:37 +02:00
#if B_PRANKSTER_DARK_TYPES >= GEN_7
handle rototiller + prankster
2021-10-11 01:54:17 +02:00
if (!gProtectStructs[battlerPrankster].pranksterElevated)
fix prankster + magic coat
2021-09-22 22:09:23 +02:00
return FALSE;
handle rototiller + prankster
2021-10-11 01:54:17 +02:00
if (GetBattlerSide(battlerPrankster) == GetBattlerSide(battlerDef))
return FALSE;
Fix and rename GetMoveTargetType Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 00:09:54 +01:00
if (checkTarget && (GetBattlerMoveTargetType(battlerPrankster, move) & (MOVE_TARGET_OPPONENTS_FIELD | MOVE_TARGET_DEPENDS)))
handle rototiller + prankster
2021-10-11 01:54:17 +02:00
return FALSE;
if (!IS_BATTLER_OF_TYPE(battlerDef, TYPE_DARK))
fix prankster + magic coat
2021-09-22 22:09:23 +02:00
return FALSE;
handle rototiller + prankster
2021-10-11 01:54:17 +02:00
if (gStatuses3[battlerDef] & STATUS3_SEMI_INVULNERABLE)
return FALSE;
return TRUE;
#endif
return FALSE;
fix prankster + magic coat
2021-09-22 22:09:23 +02:00
}
fix recycle and harvest
2021-10-28 23:52:52 +02:00
u16 GetUsedHeldItem(u8 battler)
{
return gBattleStruct->usedHeldItems[gBattlerPartyIndexes[battler]][GetBattlerSide(battler)];
}
merge w be
2021-10-30 04:33:50 +02:00
utility umbrella effect
2021-05-24 17:52:45 +02:00
bool32 IsBattlerWeatherAffected(u8 battlerId, u32 weatherFlags)
{
if (!WEATHER_HAS_EFFECT)
return FALSE;
if (gBattleWeather & weatherFlags)
{
// given weather is active -> check if its sun, rain against utility umbrella ( since only 1 weather can be active at once)
if (gBattleWeather & (WEATHER_SUN_ANY | WEATHER_RAIN_ANY) && GetBattlerHoldEffect(battlerId, TRUE) == HOLD_EFFECT_UTILITY_UMBRELLA)
return FALSE; // utility umbrella blocks sun, rain effects
return TRUE;
}
return FALSE;
}
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
// Gets move target before redirection effects etc. are applied
// Possible return values are defined in battle.h following MOVE_TARGET_SELECTED
Fix and rename GetMoveTargetType Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 00:09:54 +01:00
u32 GetBattlerMoveTargetType(u8 battlerId, u16 move)
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
{
u32 target;
if (gBattleMoves[move].effect == EFFECT_EXPANDING_FORCE
Fix and rename GetMoveTargetType Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 00:09:54 +01:00
&& IsBattlerTerrainAffected(battlerId, STATUS_FIELD_PSYCHIC_TERRAIN))
Dynamic move targeting Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 04:56:11 +01:00
return MOVE_TARGET_BOTH;
else
return gBattleMoves[move].target;
}
Copy Permalink