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

Update battle_script_commands.c

Browse Source 
Included src/battle_util.c to call IsMoveMakingContact
This commit is contained in:
MissingNoL 2021-06-05 16:43:19 -07:00 committed by GitHub
parent 921b80de7c
commit d69cfcff70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_script_commands.c
View File

@ -53,6 +53,7 @@
#include "constants/rgb.h"
#include "data.h"
#include "constants/party_menu.h"
#include "src/battle_util.c"
extern struct MusicPlayerInfo gMPlayInfo_BGM;
@ -4708,7 +4709,7 @@ static void Cmd_moveend(void)
switch (gBattleScripting.moveendState)
{
case MOVEEND_PROTECT_LIKE_EFFECT:
if (gBattleMoves[gCurrentMove].flags & FLAG_MAKES_CONTACT) // needs to be IsMoveMakingContact, but this file does not reference include/battle_util.h or src/battle_util.c
if (IsMoveMakingContact(move, gBattlerAttacker))
{
if (gProtectStructs[gBattlerTarget].spikyShielded && GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
{