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

Add Contrary

Browse Source
This commit is contained in:
DizzyEggg 2018-12-26 19:12:07 +01:00
parent 6411d1d693
commit 97b246368d
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/battle_script_commands.c
View File

@ -3013,34 +3013,51 @@ static void atk1F_jumpifsideaffecting(void)
static void atk20_jumpifstat(void) static void atk20_jumpifstat(void)
{ {
u8 ret = 0; bool32 ret = 0;
u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
u8 value = gBattleMons[battlerId].statStages[gBattlescriptCurrInstr[3]]; u8 statValue = gBattleMons[battlerId].statStages[gBattlescriptCurrInstr[3]];
u8 cmpTo = gBattlescriptCurrInstr[4];
u8 cmpKind = gBattlescriptCurrInstr[2];
switch (gBattlescriptCurrInstr[2]) // 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.
if (GetBattlerAbility(battlerId) == ABILITY_CONTRARY)
{
if (cmpKind == CMP_GREATER_THAN)
cmpKind = CMP_LESS_THAN;
else if (cmpKind == CMP_LESS_THAN)
cmpKind = CMP_GREATER_THAN;
if (cmpTo == 0)
cmpTo = 0xC;
else if (cmpTo == 0xC)
cmpTo = 0;
}
switch (cmpKind)
{ {
case CMP_EQUAL: case CMP_EQUAL:
if (value == gBattlescriptCurrInstr[4]) if (statValue == cmpTo)
ret++; ret++;
break; break;
case CMP_NOT_EQUAL: case CMP_NOT_EQUAL:
if (value != gBattlescriptCurrInstr[4]) if (statValue != cmpTo)
ret++; ret++;
break; break;
case CMP_GREATER_THAN: case CMP_GREATER_THAN:
if (value > gBattlescriptCurrInstr[4]) if (statValue > cmpTo)
ret++; ret++;
break; break;
case CMP_LESS_THAN: case CMP_LESS_THAN:
if (value < gBattlescriptCurrInstr[4]) if (statValue < cmpTo)
ret++; ret++;
break; break;
case CMP_COMMON_BITS: case CMP_COMMON_BITS:
if (value & gBattlescriptCurrInstr[4]) if (statValue & cmpTo)
ret++; ret++;
break; break;
case CMP_NO_COMMON_BITS: case CMP_NO_COMMON_BITS:
if (!(value & gBattlescriptCurrInstr[4])) if (!(statValue & cmpTo))
ret++; ret++;
break; break;
} }
@ -7690,7 +7707,13 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
notProtectAffected++; notProtectAffected++;
flags &= ~(STAT_CHANGE_NOT_PROTECT_AFFECTED); flags &= ~(STAT_CHANGE_NOT_PROTECT_AFFECTED);
PREPARE_STAT_BUFFER(gBattleTextBuff1, statId) if (GetBattlerAbility(gActiveBattler) == ABILITY_CONTRARY)
{
statValue ^= STAT_BUFF_NEGATIVE;
gBattleScripting.statChanger ^= STAT_BUFF_NEGATIVE;
}
PREPARE_STAT_BUFFER(gBattleTextBuff1, statId);
if (statValue <= -1) // Stat decrease. if (statValue <= -1) // Stat decrease.
{ {

13
src/battle_util.c
View File

@ -500,6 +500,19 @@ bool8 WasUnableToUseMove(u8 battler)
void PrepareStringBattle(u16 stringId, u8 battler) void PrepareStringBattle(u16 stringId, u8 battler)
{ {
// 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;
if (stringId == STRINGID_STATSWONTDECREASE2 && GetBattlerAbility(battler) == ABILITY_CONTRARY)
stringId = STRINGID_STATSWONTINCREASE2;
else if (stringId == STRINGID_STATSWONTINCREASE2 && GetBattlerAbility(battler) == ABILITY_CONTRARY)
stringId = STRINGID_STATSWONTDECREASE2;
gActiveBattler = battler; gActiveBattler = battler;
BtlController_EmitPrintString(0, stringId); BtlController_EmitPrintString(0, stringId);
MarkBattlerForControllerExec(gActiveBattler); MarkBattlerForControllerExec(gActiveBattler);