From b74a0c3122113b5ebef469739745e2b8fd420c50 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 31 Jul 2019 00:13:42 -0500 Subject: resolve more battle system differences --- include/battle_util.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/battle_util.h') diff --git a/include/battle_util.h b/include/battle_util.h index 3d178b487..e116eab16 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -1,7 +1,7 @@ #ifndef GUARD_BATTLE_UTIL_H #define GUARD_BATTLE_UTIL_H -#define BS_GET_TARGET 0 +#define BS_TARGET 0 #define BS_GET_ATTACKER 1 #define BS_GET_EFFECT_BANK 2 #define BS_GET_SCRIPTING_BANK 10 @@ -47,6 +47,9 @@ #define ITEMEFFECT_MOVE_END 0x3 #define ITEMEFFECT_KINGSROCK_SHELLBELL 0x4 +#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0))) +#define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK))) + void TryClearRageStatuses(void); void BattleScriptPush(const u8* BS_ptr); void PressurePPLoseOnUsingImprision(u8 bankAtk); -- cgit v1.2.3 From bbd177fa20a3f53a4815061c524a14e959de6783 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 31 Jul 2019 18:29:13 -0500 Subject: fix more emerald differences --- include/battle_util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_util.h') diff --git a/include/battle_util.h b/include/battle_util.h index e116eab16..385490438 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -15,7 +15,7 @@ #define MOVE_LIMITATION_DISABLED (1 << 2) #define MOVE_LIMITATION_TORMENTED (1 << 3) #define MOVE_LIMITATION_TAUNT (1 << 4) -#define MOVE_LIMITATION_IMPRISON (1 << 5) +#define MOVE_LIMITATION_IMPRISON (1 << 5) #define ABILITYEFFECT_ON_SWITCHIN 0x0 #define ABILITYEFFECT_ENDTURN 0x1 -- cgit v1.2.3