ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 15:38:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

add config option

Browse Source
This commit is contained in:
Evan 2021-01-15 18:28:10 -07:00
parent 0d8f804194
commit 449c2bcc34
2 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/battle_config.h
View File

@ -127,6 +127,7 @@
#define B_HP_BERRIES GEN_6 // In Gen4+, berries which restore hp activate immediately after hp drops to half. In gen3, the effect occurs at the end of the turn. #define B_HP_BERRIES GEN_6 // In Gen4+, berries which restore hp activate immediately after hp drops to half. In gen3, the effect occurs at the end of the turn.
#define B_BERRIES_INSTANT GEN_6 // In Gen4+, most berries activate on battle start/switch-in if applicable. In gen3, they only activate either at the move end or turn end. #define B_BERRIES_INSTANT GEN_6 // In Gen4+, most berries activate on battle start/switch-in if applicable. In gen3, they only activate either at the move end or turn end.
#define B_X_ITEMS_BUFF GEN_7 // In Gen7+, the X Items raise a stat by 2 stages instead of 1. #define B_X_ITEMS_BUFF GEN_7 // In Gen7+, the X Items raise a stat by 2 stages instead of 1.
#define B_MENTAL_HERB GEN_5 // In Gen5+, the Mental Herb cures Infatuation, Taunt, Encore, Torment, Heal Block, and Disable
// Flag settings // Flag settings
// To use the following features in scripting, replace the 0s with the flag ID you're assigning it to. // To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.

2
src/battle_util.c
View File

@ -5213,6 +5213,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId)
StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
ret = TRUE; ret = TRUE;
} }
#if B_MENTAL_HERB >= GEN_5
// check taunt // check taunt
if (gDisableStructs[gBattlerTarget].tauntTimer != 0) if (gDisableStructs[gBattlerTarget].tauntTimer != 0)
{ {
@ -5251,6 +5252,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId)
gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREDISABLE; gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREDISABLE;
ret = TRUE; ret = TRUE;
} }
#endif
return ret; return ret;
} }