Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-27 12:26:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Adds move Spicy Extract (#4211)

Browse Source 
* Adds move Spicy Extract

* remove uneeded line

* anim, new tests, acc change

* Clear Amulet, Contrary interaction

* ai

* correction

* simplify script a bit

* clean up

* Spicy Extract script overhaul

* merge rhh/upcoming

* alignment

* AI changes/additions

* add Foul Play check

* Remove useless ai checks

* remove wrong test

* review issues
This commit is contained in:
Alex
2024-05-16 11:03:50 +02:00
committed by GitHub
parent 7d84cd62ef
commit faf61e62fb
12 changed files with 367 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/battle_ai_util.h
View File

@@ -193,5 +193,6 @@ s32 AI_TryToClearStats(u32 battlerAtk, u32 battlerDef, bool32 isDoubleBattle);
bool32 AI_ShouldCopyStatChanges(u32 battlerAtk, u32 battlerDef);
bool32 AI_ShouldSetUpHazards(u32 battlerAtk, u32 battlerDef, struct AiLogicData *aiData);
void IncreaseTidyUpScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score);
bool32 AI_ShouldSpicyExtract(u32 battlerAtk, u32 battlerAtkPartner, u32 move, struct AiLogicData *aiData);
#endif //GUARD_BATTLE_AI_UTIL_H

2
include/battle_scripts.h
View File

@@ -179,6 +179,7 @@ extern const u8 BattleScript_FlashFireBoost_PPLoss[];
extern const u8 BattleScript_FlashFireBoost[];
extern const u8 BattleScript_AbilityNoStatLoss[];
extern const u8 BattleScript_ItemNoStatLoss[];
extern const u8 BattleScript_ItemNoStatLossSpicyExtract[];
extern const u8 BattleScript_BRNPrevention[];
extern const u8 BattleScript_PRLZPrevention[];
extern const u8 BattleScript_PSNPrevention[];
@@ -836,5 +837,6 @@ extern const u8 BattleScript_EffectFilletAway[];
extern const u8 BattleScript_EffectShedTail[];
extern const u8 BattleScript_EffectUpperHand[];
extern const u8 BattleScript_EffectTidyUp[];
extern const u8 BattleScript_EffectSpicyExtract[];
#endif // GUARD_BATTLE_SCRIPTS_H

1
include/constants/battle_move_effects.h
View File

@@ -350,6 +350,7 @@ enum {
EFFECT_DRAGON_CHEER,
EFFECT_LAST_RESPECTS,
EFFECT_TIDY_UP,
EFFECT_SPICY_EXTRACT,
EFFECT_TERA_BLAST,
EFFECT_TERA_STARSTORM,
NUM_BATTLE_MOVE_EFFECTS,