Cleaning up checks if battler benefits from status. Better logic for …

data/battle_anim_scripts.s

@@ -31084,6 +31084,17 @@ gBattleAnimStatus_Nightmare::
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
+gBattleAnimStatus_Frostbite::
+	playsewithpan SE_M_ICY_WIND, 0
+	loadspritegfx ANIM_TAG_ICE_CRYSTALS
+	monbg ANIM_DEF_PARTNER
+	splitbgprio ANIM_TARGET
+	call IceCrystalEffectShort
+	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_TARGET, 5, 7, 0, RGB(0, 20, 31)
+	waitforvisualfinish
+	clearmonbg ANIM_DEF_PARTNER
+	end
+
 gBattleAnimGeneral_StatsChange::
 	createvisualtask AnimTask_StatsChange, 5
 	waitforvisualfinish

data/battle_scripts_1.s

@@ -207,10 +207,8 @@ BattleScript_EffectDoodle::
 BattleScript_EffectDoodle_CopyAbility:
 	trycopyability BS_ATTACKER, BattleScript_EffectDoodleMoveEnd
 BattleScript_EffectDoodle_AfterCopy:
-.if B_ABILITY_POP_UP == TRUE
 	copybyte gBattlerAbility, gBattlerAttacker
 	call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
 	recordability BS_ATTACKER
 	printstring STRINGID_PKMNCOPIEDFOE
 	waitmessage B_WAIT_TIME_LONG
@@ -2226,10 +2224,8 @@ BattleScript_EffectSimpleBeam::
 	setsimplebeam BattleScript_ButItFailed
 	attackanimation
 	waitanimation
-.if B_ABILITY_POP_UP == TRUE
 	copybyte gBattlerAbility, gBattlerTarget
 	call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
 	recordability BS_TARGET
 	printstring STRINGID_PKMNACQUIREDSIMPLE
 	waitmessage B_WAIT_TIME_LONG
@@ -2328,10 +2324,8 @@ BattleScript_EffectWorrySeed::
 	tryworryseed BattleScript_ButItFailed
 	attackanimation
 	waitanimation
-.if B_ABILITY_POP_UP == TRUE
 	copybyte gBattlerAbility, gBattlerTarget
 	call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
 	recordability BS_TARGET
 	printstring STRINGID_PKMNACQUIREDABILITY
 	waitmessage B_WAIT_TIME_LONG
@@ -2804,14 +2798,6 @@ BattleScript_AromaVeilProtects:
 	setmoveresultflags MOVE_RESULT_FAILED
 	goto BattleScript_MoveEnd
 
-BattleScript_PastelVeilProtects:
-	pause B_WAIT_TIME_SHORT
-	call BattleScript_AbilityPopUp
-	printstring STRINGID_PASTELVEILPROTECTED
-	waitmessage B_WAIT_TIME_LONG
-	setmoveresultflags MOVE_RESULT_FAILED
-	goto BattleScript_MoveEnd
-
 BattleScript_AbilityProtectsDoesntAffectRet::
 	pause B_WAIT_TIME_SHORT
 	call BattleScript_AbilityPopUp
@@ -3127,10 +3113,7 @@ BattleScript_AlreadyPoisoned::
 
 BattleScript_ImmunityProtected::
 	call BattleScript_AbilityPopUp
-	pause B_WAIT_TIME_SHORT
-	printfromtable gStatusPreventionStringIds
-	waitmessage B_WAIT_TIME_LONG
-	goto BattleScript_MoveEnd
+	goto BattleScript_DoesntAffectTargetAtkString
 
 BattleScript_EffectAuroraVeil::
 	attackcanceler
@@ -4671,10 +4654,8 @@ BattleScript_EffectRolePlay::
 	trycopyability BS_ATTACKER, BattleScript_ButItFailed
 	attackanimation
 	waitanimation
-.if B_ABILITY_POP_UP == TRUE
 	copybyte gBattlerAbility, gBattlerAttacker
 	call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
 	recordability BS_ATTACKER
 	printstring STRINGID_PKMNCOPIEDFOE
 	waitmessage B_WAIT_TIME_LONG
@@ -4806,13 +4787,11 @@ BattleScript_EffectSkillSwap::
 	attackanimation
 	waitanimation
 	jumpiftargetally BattleScript_EffectSkillSwap_AfterAbilityPopUp
-.if B_ABILITY_POP_UP == TRUE
 	copybyte gBattlerAbility, gBattlerAttacker
 	call BattleScript_AbilityPopUpOverwriteThenNormal
 	copybyte gBattlerAbility, gBattlerTarget
 	copyhword sABILITY_OVERWRITE, gLastUsedAbility
 	call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
 BattleScript_EffectSkillSwap_AfterAbilityPopUp:
 	recordability BS_ATTACKER
 	recordability BS_TARGET
@@ -7102,10 +7081,8 @@ BattleScript_AbilityPopUpTarget::
 	copybyte gBattlerAbility, gBattlerTarget
 BattleScript_AbilityPopUp::
 	tryactivateabilityshield BS_ABILITY_BATTLER
-	.if B_ABILITY_POP_UP == TRUE
 	showabilitypopup
 	pause B_WAIT_TIME_SHORT
-	.endif
 	recordability BS_ABILITY_BATTLER
 	sethword sABILITY_OVERWRITE, 0
 	return
@@ -7156,11 +7133,9 @@ BattleScript_MoodyEnd:
 	end3
 
 BattleScript_EmergencyExit::
-	.if B_ABILITY_POP_UP == TRUE
 	pause 5
 	call BattleScript_AbilityPopUpScripting
 	pause B_WAIT_TIME_LONG
-	.endif
 	playanimation BS_SCRIPTING, B_ANIM_SLIDE_OFFSCREEN
 	waitanimation
 	openpartyscreen BS_SCRIPTING, BattleScript_EmergencyExitRet
@@ -7179,11 +7154,9 @@ BattleScript_EmergencyExitRet:
 	return
 
 BattleScript_EmergencyExitWild::
-	.if B_ABILITY_POP_UP == TRUE
 	pause 5
 	call BattleScript_AbilityPopUpScripting
 	pause B_WAIT_TIME_LONG
-	.endif
 	playanimation BS_SCRIPTING, B_ANIM_SLIDE_OFFSCREEN
 	waitanimation
 	setteleportoutcome BS_SCRIPTING
@@ -7914,13 +7887,11 @@ BattleScript_CursedBodyActivates::
 	return
 
 BattleScript_MummyActivates::
-.if B_ABILITY_POP_UP == TRUE
 	setbyte sFIXED_ABILITY_POPUP, TRUE
 	call BattleScript_AbilityPopUpTarget
 	copybyte gBattlerAbility, gBattlerAttacker
 	copyhword sABILITY_OVERWRITE, gLastUsedAbility
 	call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
 	recordability BS_TARGET
 	recordability BS_ATTACKER
 	printstring STRINGID_ATTACKERACQUIREDABILITY
@@ -7930,14 +7901,12 @@ BattleScript_MummyActivates::
 BattleScript_WanderingSpiritActivates::
 	saveattacker
 	savetarget
-.if B_ABILITY_POP_UP == TRUE
 	copybyte gBattlerAbility, gBattlerTarget
 	sethword sABILITY_OVERWRITE, ABILITY_WANDERING_SPIRIT
 	call BattleScript_AbilityPopUpOverwriteThenNormal
 	copybyte gBattlerAbility, gBattlerAttacker
 	copyhword sABILITY_OVERWRITE, gLastUsedAbility
 	call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
 	recordability BS_TARGET
 	recordability BS_ATTACKER
 	printstring STRINGID_SWAPPEDABILITIES

include/battle_ai_main.h

@@ -23,6 +23,11 @@ enum StatChange
     STAT_CHANGE_SPEED_2,
     STAT_CHANGE_SPATK_2,
     STAT_CHANGE_SPDEF_2,
+    STAT_CHANGE_ATK_3,
+    STAT_CHANGE_DEF_3,
+    STAT_CHANGE_SPEED_3,
+    STAT_CHANGE_SPATK_3,
+    STAT_CHANGE_SPDEF_3,
     STAT_CHANGE_ACC,
     STAT_CHANGE_EVASION
 };

include/battle_ai_util.h

@@ -113,6 +113,7 @@ bool32 CanTargetFaintAiWithMod(u32 battlerDef, u32 battlerAtk, s32 hpMod, s32 dm
 s32 AI_DecideKnownAbilityForTurn(u32 battlerId);
 enum ItemHoldEffect AI_DecideHoldEffectForTurn(u32 battlerId);
 bool32 DoesBattlerIgnoreAbilityChecks(u32 battlerAtk, u32 atkAbility, u32 move);
+bool32 DoesBattlerBenefitFromNonvolatileStatus(u32 battler, u32 ability, u32 status);
 u32 AI_GetWeather(void);
 u32 AI_GetSwitchinWeather(struct BattlePokemon battleMon);
 enum WeatherState IsWeatherActive(u32 flags);

include/battle_anim_scripts.h

@@ -948,6 +948,7 @@ extern const u8 gBattleAnimStatus_Paralysis[];
 extern const u8 gBattleAnimStatus_Freeze[];
 extern const u8 gBattleAnimStatus_Curse[];
 extern const u8 gBattleAnimStatus_Nightmare[];
+extern const u8 gBattleAnimStatus_Frostbite[];
 
 // general animations
 extern const u8 gBattleAnimGeneral_StatsChange[];

include/config/battle.h

@@ -268,7 +268,6 @@
 #define B_NEW_TERRAIN_BACKGROUNDS   FALSE      // If set to TRUE, uses new terrain backgrounds for Electric, Misty, Grassy and Psychic Terrain.
 
 // Interface settings
-#define B_ABILITY_POP_UP                    TRUE  // In Gen5+, the Pokémon abilities are displayed in a pop-up, when they activate in battle.
 #define B_FAST_INTRO_PKMN_TEXT              TRUE  // If set to TRUE, battle intro texts print at the same time as animation of a Pokémon, as opposing to waiting for the animation to end.
 #define B_FAST_INTRO_NO_SLIDE               FALSE // If set to TRUE, the slide animation that happens at the beginning of the battle is skipped.
 #define B_FAST_HP_DRAIN                     TRUE  // If set to TRUE, HP bars will move faster.

include/constants/battle_anim.h

@@ -616,8 +616,9 @@
 #define B_ANIM_STATUS_FRZ               6
 #define B_ANIM_STATUS_CURSED            7
 #define B_ANIM_STATUS_NIGHTMARE         8
+#define B_ANIM_STATUS_FRB               9
 
-#define NUM_B_ANIMS_STATUS              9
+#define NUM_B_ANIMS_STATUS              10
 
 // Tasks with return values often assign them to gBattleAnimArgs[7].
 #define ARG_RET_ID 7

include/constants/battle_string_ids.h

@@ -61,19 +61,15 @@ enum StringID
     STRINGID_PKMNISPARALYZED,
     STRINGID_PKMNISALREADYPARALYZED,
     STRINGID_PKMNHEALEDPARALYSIS,
-    STRINGID_PKMNDREAMEATEN,
     STRINGID_STATSWONTINCREASE,
     STRINGID_STATSWONTDECREASE,
-    STRINGID_TEAMSTOPPEDWORKING,
-    STRINGID_FOESTOPPEDWORKING,
     STRINGID_PKMNISCONFUSED,
     STRINGID_PKMNHEALEDCONFUSION,
     STRINGID_PKMNWASCONFUSED,
     STRINGID_PKMNALREADYCONFUSED,
     STRINGID_PKMNFELLINLOVE,
     STRINGID_PKMNINLOVE,
     STRINGID_PKMNIMMOBILIZEDBYLOVE,
-    STRINGID_PKMNBLOWNAWAY,
     STRINGID_PKMNCHANGEDTYPE,
     STRINGID_PKMNFLINCHED,
     STRINGID_PKMNREGAINEDHEALTH,
@@ -179,7 +175,6 @@ enum StringID
     STRINGID_PKMNREADYTOHELP,
     STRINGID_PKMNSWITCHEDITEMS,
     STRINGID_PKMNCOPIEDFOE,
-    STRINGID_PKMNMADEWISH,
     STRINGID_PKMNWISHCAMETRUE,
     STRINGID_PKMNPLANTEDROOTS,
     STRINGID_PKMNABSORBEDNUTRIENTS,
@@ -201,9 +196,7 @@ enum StringID
     STRINGID_PKMNPREVENTSUSAGE,
     STRINGID_PKMNRESTOREDHPUSING,
     STRINGID_PKMNCHANGEDTYPEWITH,
-    STRINGID_PKMNPREVENTSPARALYSISWITH,
     STRINGID_PKMNPREVENTSROMANCEWITH,
-    STRINGID_PKMNPREVENTSPOISONINGWITH,
     STRINGID_PKMNPREVENTSCONFUSIONWITH,
     STRINGID_PKMNRAISEDFIREPOWERWITH,
     STRINGID_PKMNANCHORSITSELFWITH,
@@ -250,7 +243,6 @@ enum StringID
     STRINGID_HAILSTOPPED,
     STRINGID_FAILEDTOSPITUP,
     STRINGID_FAILEDTOSWALLOW,
-    STRINGID_WINDBECAMEHEATWAVE,
     STRINGID_STATCHANGESGONE,
     STRINGID_COINSSCATTERED,
     STRINGID_TOOWEAKFORSUBSTITUTE,
@@ -307,7 +299,6 @@ enum StringID
     STRINGID_ITEMALLOWSONLYYMOVE,
     STRINGID_PKMNHUNGONWITHX,
     STRINGID_EMPTYSTRING3,
-    STRINGID_PKMNSXPREVENTSBURNS,
     STRINGID_PKMNSXBLOCKSY,
     STRINGID_PKMNSXRESTOREDHPALITTLE2,
     STRINGID_PKMNSXWHIPPEDUPSANDSTORM,
@@ -326,7 +317,6 @@ enum StringID
     STRINGID_PLAYERDEFEATEDTRAINER1,
     STRINGID_SOOTHINGAROMA,
     STRINGID_ITEMSCANTBEUSEDNOW,
-    STRINGID_FORXCOMMAYZ,
     STRINGID_USINGITEMSTATOFPKMNROSE,
     STRINGID_PKMNUSEDXTOGETPUMPED,
     STRINGID_PKMNSXMADEYUSELESS,
@@ -343,7 +333,6 @@ enum StringID
     STRINGID_PKMNFLEDUSINGITS,
     STRINGID_PKMNFLEDUSING,
     STRINGID_PKMNWASDRAGGEDOUT,
-    STRINGID_PREVENTEDFROMWORKING,
     STRINGID_PKMNSITEMNORMALIZEDSTATUS,
     STRINGID_TRAINER1USEDITEM,
     STRINGID_BOXISFULL,
@@ -354,17 +343,13 @@ enum StringID
     STRINGID_STATSWONTDECREASE2,
     STRINGID_PKMNSXBLOCKSY2,
     STRINGID_PKMNSXWOREOFF,
-    STRINGID_PKMNRAISEDDEFALITTLE,
-    STRINGID_PKMNRAISEDSPDEFALITTLE,
     STRINGID_THEWALLSHATTERED,
-    STRINGID_PKMNSXPREVENTSYSZ,
     STRINGID_PKMNSXCUREDITSYPROBLEM,
     STRINGID_ATTACKERCANTESCAPE,
     STRINGID_PKMNOBTAINEDX,
     STRINGID_PKMNOBTAINEDX2,
     STRINGID_PKMNOBTAINEDXYOBTAINEDZ,
     STRINGID_BUTNOEFFECT,
-    STRINGID_PKMNSXHADNOEFFECTONY,
     STRINGID_TWOENEMIESDEFEATED,
     STRINGID_TRAINER2LOSETEXT,
     STRINGID_PKMNINCAPABLEOFPOWER,
@@ -597,7 +582,6 @@ enum StringID
     STRINGID_BROKETHROUGHPROTECTION,
     STRINGID_ABILITYALLOWSONLYMOVE,
     STRINGID_SWAPPEDABILITIES,
-    STRINGID_PASTELVEILPROTECTED,
     STRINGID_PASTELVEILENTERS,
     STRINGID_BATTLERTYPECHANGEDTO,
     STRINGID_BOTHCANNOLONGERESCAPE,
@@ -1049,17 +1033,6 @@ enum GotStatusedStringID
     B_MSG_STATUSED_BY_ABILITY,
 };
 
-// gStatusPreventionStringIds
-enum StatusPreventionStringID
-{
-    B_MSG_ABILITY_PREVENTS_MOVE_BURN,
-    B_MSG_ABILITY_PREVENTS_MOVE_PARALYSIS,
-    B_MSG_ABILITY_PREVENTS_MOVE_POISON,
-    B_MSG_ABILITY_PREVENTS_ABILITY_STATUS,
-    B_MSG_STATUS_HAD_NO_EFFECT,
-    B_MSG_ABILITY_PASTEL_VEIL,
-};
-
 // gGotDefrostedStringIds
 enum GotDefrostedStringID
 {

include/constants/expansion.h

@@ -3,8 +3,8 @@
 
 // Last version: 1.13.0
 #define EXPANSION_VERSION_MAJOR 1
-#define EXPANSION_VERSION_MINOR 13
-#define EXPANSION_VERSION_PATCH 1
+#define EXPANSION_VERSION_MINOR 14
+#define EXPANSION_VERSION_PATCH 0
 
 // FALSE if this this version of Expansion is not a tagged commit, i.e.
 // it contains unreleased changes.

include/window.h

@@ -45,7 +45,7 @@ struct WindowTemplate
 struct Window
 {
     struct WindowTemplate window;
-    u8 *tileData;
+    ALIGNED(4) u8 *tileData;
 };
 
 bool32 InitWindows(const struct WindowTemplate *templates);